From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6FE0440335 for ; Wed, 23 Mar 2022 12:05:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE1F868ADCC; Wed, 23 Mar 2022 14:05:01 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074019.outbound.protection.outlook.com [40.92.74.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 98D3D68A351 for ; Wed, 23 Mar 2022 14:04:54 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IdhOchmPfa+6YNxYsgs/OKRczQX1A3fM6/WzX+i3pDW37jp68k4SA6MzCSjtLPFzt3fQfBy8BoTDtx5pkRW/BKtQrwwyzuHCE8ucdQ3qM+mT78RiBv+ci9a7iud3wNjZRFU5FlvnQIowryJfRCXLXfKZJi2obac6lJ6VWdYIZmrVllJZ9C9cEV+ryzv5XyKQhv1hR5gKAzBSgn3DiCZDuNHILxyxkU86NKQZ8BSIKfONOhrc2F3NFJa2Hwlm2vOJfEFgHgVAAjyFPp81lRaWYRZy1APApHKRy0nq8UBLQpU2Q9Ke1s5o9siXE5DA7bravJWuGqdzKAeokJubwGFtbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WjAyyCsUIsIcSS4cF2dnt9FfINRswLppmnHUjK92hQs=; b=VnHL4S1UC8LaVmzkSc34x2qhDFVe+gcXMkXKj8jnJ+u1hoOvVqdzmro27RlWcMhqJWP36y+2v/4/vuonwz0enXthJ69T6eso+4+mL6nejMi2RyFjKnz8dcIb1btBu0Gft6DVSloLB1sj74x3a48w5RcLfISWExhFo+Wks/ZNX3AP+JsA1duihbElUSmyF0hgLd9l1llOOd5mK4ZPFhV+RBYqfWD9H7kkpZJY+N7izPhBjQ3Ql6TyQUzA6Y4QaCZiZ1PuAXGkEcL+ysIogq1QnxKFYja3dbb3C816+dN7nX4SnirwnXpOrlD0aSCPEVdnfpngYUxC6f6q02D25m9vEg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WjAyyCsUIsIcSS4cF2dnt9FfINRswLppmnHUjK92hQs=; b=C3kDM5xEePx7fQTFlRVGeHzZZPibGO8vYJ12VSfre5HETSnOvEcsYKicZ+kCG+CzhshkZxXobKg4czqQbCVCisnu9FeLgHk6LDM5xpg8fN/wIGuxnFFhFMZmrFlZq13LWGvOa2ewbB7qwnlRN4PVVfjdv8sOQnEcayUYvA5YJA8Lu+bBZK/Q2JcXxwoOWbuGCZl6T+ovo4tCQE3S2FP9D6Ah42vpfjKgUU/0XcN1XWnF8AVaOmzBzbe80UU67+5zj52MVady2BO53Dk9wRDNnjo8ssEXdyp3PJYLTJY8oGDR4g+IN6OqvF9e9in7ax3TPWfSxZ8lcgG+20x4T1XC6Q== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by PR3PR01MB6729.eurprd01.prod.exchangelabs.com (2603:10a6:102:63::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.17; Wed, 23 Mar 2022 12:04:52 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5081.022; Wed, 23 Mar 2022 12:04:52 +0000 Message-ID: Date: Wed, 23 Mar 2022 13:04:50 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [fR8KJpGtxuOhJkOx0S4YrH4n5hsIwpH8] X-ClientProxiedBy: AM6P192CA0074.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:8d::15) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ca67c708-8352-4cc9-1d23-08da0cc55645 X-MS-TrafficTypeDiagnostic: PR3PR01MB6729:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iCWZC8mEbL/FYCYDU7IN/F3j397BTuPE54aAYOXMTjMl/sZ8vpS4XC+hB5g2ZUvzc6/H3Hk8FZP/eDlbGkzuI2B8YBHsg02USYXMIOvuDV4Nse7k6JXRAM7mdwsUUkEHHsRmq+CauEVjXHHyfhAARK8CUNxK80JYWyJ+q1/sEDvPonwpzt8uTmqoifnTi+KseEtam+uYVO4+3zDXSWpHnnVQdK1D2pmXF0xVtKtwXNdrkn1ikVa/9LfVrG6PJrJXZBP+tq53f11FaxHe2Nmygx5BTF4Nm/pCgWMr5GN3zL9cLu+52xA2vJ+UcqERQVHIXhdLZf4X/D91RIp7L5ubmAD04Oj+7IhysEdNFd4DwsvDdg9KXu+VqesKTW+hgi22iSP5eps3ynDIqeS6S5z3HeCFK31zTpN00+cmLH27tl/8EWABD9BxvA9fnUtGt3lSaXT/8Qrn3azh5/h0yciT9QH02Uz5LPuC8swlkAlgdYLBboP3xRdwaCYZmf6o0QQGRskuch1gzLhr1aPLdXSvTWn72S33EEv4LEyZuH+4Muk0iPkrTueUaQKHll3/7FBSkE6eSp0lAXVPSqGJ/5YR6w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VUo4d3hETFpxRGZkK0RlK3hyZTdwSnZ0TUhUdEZRRXIvbEpRV3VLUFpCd2t1?= =?utf-8?B?VFpZcEVJOTVXWHM2UDFUbGpabFcvS1ByM3hyeG14bUVrSkhwZkk4N1MzcnVO?= =?utf-8?B?b0kzTFgrZGt4OHVKSW9xOWc0L3c2bFlIcTBNcWFxdkNmMEY5eDRBSlE4bEQ0?= =?utf-8?B?aFRwLytUYWE4UHNhb0l0OXlXMlFTSWlnNkJTcml2VXk4QjVoZkFjcmMvU0o0?= =?utf-8?B?alNnbGxQZVRGT3pTQzgvaS93bWF1andCeDBBdE9SV3VzZzRKMkdpYWxDU3Nj?= =?utf-8?B?RmxQb2pkaUdPa2J3Sytma0tRbEM0NythS2E4SHRoTzU3c1pIRlY2S25CVEEx?= =?utf-8?B?SWladzdrejJHYWdMdFBibjE0VTdBSmMzQW1RTUt4VExsYlFwZEtvdFFyMWF4?= =?utf-8?B?MTFYZkl1K3Y3bzROK1UycnRick9mY3BDVmI3WEUzck53a25yN2VwOVdNT0tD?= =?utf-8?B?bFQ3QUdKZ1RkeGs5Zytpd1kyWUpWODl6TE5idS93T1VVWFdoMW56K1lNWWVx?= =?utf-8?B?ZGhDdEs1Y3djQjBNRnE5cmwvTGI3QXNkRmlzcnJoRU9HcmpJNWtmMFk0Qjhi?= =?utf-8?B?enRPQTZvUXpmNEgzK2d1U3NDTVh3UUhEM2txUklQemlMdmZLdGNYK2xWMHBh?= =?utf-8?B?cEQ4K1J6TE0zSGVheVBhN01GU1JBdXB3M2tSNExBODVZZzhlc3d6UlAyWUgw?= =?utf-8?B?UnFVendGMmVpeHFUZnRPSjN4SkR3Zy83TzZ4LzFxU1Yzc0RZLzNpWEo2RTY1?= =?utf-8?B?S0hYWHI3dCtxVVVQMlB0ei90TGlNakloVm9ocjNwNitZbXk2aVplNENvQS9I?= =?utf-8?B?SW9EY1loKzNBZGxWYktWb2p4M0FTem1Lb0szTlNjNjc1S1VhZ0xEWkxyNFIr?= =?utf-8?B?TWZuVGtPK1JoWjV4aFlJVnZaSjd5YnlhNzJkY09rVEFlSVhEZWR2RDh1NmxY?= =?utf-8?B?MG9idWpiamZLVmt0d0VRRW12cXlJN05mVzI0MU53U1UreUN5NFlNZFNabXhU?= =?utf-8?B?ZEJNcDBGdzhWRFFxUXBvQm1XUXFZb3ErZHhia0Z3NUpDRk42Z1NPYlBzN0tN?= =?utf-8?B?VjdYVEJ4cDU1alZUSWJKZkZvNCsxRkxvVHlkQnhJWGpJZW83bU1XZHlXbjFn?= =?utf-8?B?SmpYUUVjaTZlTFczVDZZdnB3OUdudzA2ZlUwYWlLVkRZZXBYZHNYdFo5NG9r?= =?utf-8?B?N1lBSXA2Z3NUUkVTQ0tpN01wenpwQmI2OHM0cmRzd2lsbGRMTCt2RGFnbU1x?= =?utf-8?B?QmdvZTl1MG9EVjR5RkZsV0dFMFlMNlN6d0NPcmZZbDY2d0FLRE42bnVUdGZM?= =?utf-8?B?R0xVREFXckR5Mko5NExkZVVFQXVUVldzOHA0MWdteDczdjRjaXR4Y1pLOXlq?= =?utf-8?B?a1BTMWdhWitQM05RL0FzbGloUzhmanlhdm1JMDI1N1hQcUJ1cGFITDJROWpL?= =?utf-8?B?NTdDdmJIb3Q2aGQrU241Z09HRmlyNUkyaVJNb3lybXBIejN2ckRpU1I5TUs0?= =?utf-8?B?dEp5K1VSZW9ET0g5QnpsWTdPZGorL2ZxUzlvMXYwSHhGVm5DbVY1bmlNTWVz?= =?utf-8?Q?uJ5nmo3ZqtxZs1mbhHHODuEXWxjyNdTATZkLD8mCBC0pQp?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca67c708-8352-4cc9-1d23-08da0cc55645 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2022 12:04:52.7567 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR01MB6729 Subject: Re: [FFmpeg-devel] [PATCH 1/6] avcodec/internal, avfilter/qp_table: Remove unused FF_QSCALE_TYPEs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/internal.h | 2 -- > libavfilter/qp_table.h | 4 ---- > 2 files changed, 6 deletions(-) > > diff --git a/libavcodec/internal.h b/libavcodec/internal.h > index badca4c9dd..f9809926b8 100644 > --- a/libavcodec/internal.h > +++ b/libavcodec/internal.h > @@ -37,8 +37,6 @@ > > #define FF_QSCALE_TYPE_MPEG1 0 > #define FF_QSCALE_TYPE_MPEG2 1 > -#define FF_QSCALE_TYPE_H264 2 > -#define FF_QSCALE_TYPE_VP56 3 > > #define FF_SANE_NB_CHANNELS 512U > > diff --git a/libavfilter/qp_table.h b/libavfilter/qp_table.h > index 4758ee8538..169a7a7fea 100644 > --- a/libavfilter/qp_table.h > +++ b/libavfilter/qp_table.h > @@ -33,16 +33,12 @@ int ff_qp_table_extract(AVFrame *frame, int8_t **table, int *table_w, int *table > > /** > * Normalize the qscale factor > - * FIXME the H264 qscale is a log based scale, mpeg1/2 is not, the code below > - * cannot be optimal > */ > static inline int ff_norm_qscale(int qscale, int type) > { > switch (type) { > case FF_QSCALE_TYPE_MPEG1: return qscale; > case FF_QSCALE_TYPE_MPEG2: return qscale >> 1; > - case FF_QSCALE_TYPE_H264: return qscale >> 2; > - case FF_QSCALE_TYPE_VP56: return (63 - qscale + 2) >> 2; > } > return qscale; > } Will apply this patchset tomorrow unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".