From patchwork Tue Mar 22 12:32:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34885 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp670963uaj; Tue, 22 Mar 2022 05:33:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQYB0cha2gogjU9ROm5oMbVNAAT5d3YgbOoWMoVBdg1UYrmBRDMDBckYGet4mAh1EjAGU2 X-Received: by 2002:a17:907:8a1c:b0:6df:ecd6:b6ea with SMTP id sc28-20020a1709078a1c00b006dfecd6b6eamr12882842ejc.530.1647952389045; Tue, 22 Mar 2022 05:33:09 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hq4-20020a1709073f0400b006df76385f1csi9919156ejc.956.2022.03.22.05.33.08; Tue, 22 Mar 2022 05:33:09 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=dhbduNxe; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2716A68B092; Tue, 22 Mar 2022 14:33:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074046.outbound.protection.outlook.com [40.92.74.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D2B9680588 for ; Tue, 22 Mar 2022 14:32:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kgiXXRl8nCMSnTZwvDg+CPM6eW13kFR54ys+NOmNFU4YWB/vQlsfo9Bx56kRKhWjfkxD8KT2MvjFa3aE6vz4GHc/dOGHCoiUGW6KU9aoYSlpvrygHQyIazHeeWehkSOe9DosnfjIOYZZ22EkbJqjVQlMhSe2fVJu8rZ/q+FZUDm2BenJfJazw6S/GxK71wieOnIsTVq4iIu3Tvh6QM7Gf066BGW6m7p9o3pbertDkUhbHzJLvAzGcjkrDTuzf0iuujcBiElGW/W/vwTQyJDwtWaJmW4y+wHbYb7XkIRjRfjlgzqibl9Bci/9C1kGab5az9JOnauTd7RqaRmGD3FmKw== 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=ihe0d3asWYPU8jJh4z9s8RIfneB4dEfvtfNPeEnsFLM=; b=kyogH0FFMKuGCm6/4LrRJSq1XMBeBUpz/4AfwCRIS0d/UFs/r/wUzyhJD+SvFBNKosNXvLTX+EUyNLJ43mWi8ITY+8nm2CTykm4e9YOypuU0QWTo+gwGmlVYviIjDZfqPzvQtGrg7baT5mqhQgGx9bjK4VwM0nIANQiNiFDOKmL1RysUSfK8RxctflhCBNV4GTJeIvd0wLN6JzO89u5v0LuJw6rfJM6e33tmcMz+MdUlrJ7YFlaK6I5yujY0lLzCYqOWH8b143dFRZBd31izryKg4FEWy3wo9KF9N7+2Ly1PSzgmsjTswj3V+xj7AfefNZ1wbBTRThVG8AmA94qRMw== 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=ihe0d3asWYPU8jJh4z9s8RIfneB4dEfvtfNPeEnsFLM=; b=dhbduNxerGIqBgTDAFH91sR+nxhjS1gdQoHmzLdS36lXBCePoO4MI1T9bYBbKrDrZz7riBp6WT8d49E31CiRMAfKifGWYPOFGsGAZKN29g7GUMrVsOzAnLvi/yBcYI9Xpfb7HgeAjaIzCqfwvVOegaUj2Q/x0ziKYWTarLopIHQkGsJl3ZaGhJpl80bpzTjNLa6oR+TsVnZ5FsqeTvEXqdDEaeRGqHrcg59BAfwAlTHitSJ3vFnFE+Sw7yKB6zuzUBWAciABnWVleN4yD4DtDNQRI3TX8haRYpZRn0uRsZ52SOiZXLu0S2ZOSwyDcJ2JWUFnXwRDJBff16ijbEJNFA== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by DB7PR01MB4888.eurprd01.prod.exchangelabs.com (2603:10a6:10:28::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.16; Tue, 22 Mar 2022 12:32:57 +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; Tue, 22 Mar 2022 12:32:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Mar 2022 13:32:43 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [ZTjGim16RWMY+AWSuwWXt1AkcQECiBc8] X-ClientProxiedBy: AS8P189CA0014.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:31f::34) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220322123248.348245-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e3e2180b-fb0a-421c-1be3-08da0c001799 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuR8JRu/bs3HbiLUZ4BkXFvAJxYTPHL3jgCqy07uWvvJAR2neE3pd3tbM6n/U0hpbqqxpDZRSGMrBoCsMt+/tcx+kFE9Q5zeVxs1JniMs6lrAA7tRZ/uOFMeFHF9MeVkABi/1JFzQVc6LYijDlIlaXlUAjIqwi1lpymVdYGagBVEh3VHhPM+qEIdIC5vTszI5fhZQM7kBi//SbMuxzJOFO+8vMlsPiQ09acDn8Ym6dAseIK01K0ZVCqj+Y+OerpoTSZifX49YmmiDledS9i/A9LYL8xiVNmibDCKkIIOpaLW/goz9bF1+3J6XOouXQ59ESZSlqt/LltsTaMGdsI/swqaifna0BxrlzkzXALV/pJmZ6O+KMGFPuwn8tEZnQeXdbuzWAnosh+kcbZB1LPXh6bLNZIh/VHUB85jP6BSN6OkNSM1SYwxjyL8eWt7p7I6eXsdM6PK+rxqT5VHv6q82Wu7a7RU4C+EnL8BLAQMtiikYD3BrwMYb+Hez5csRXAQTLd4jEbnKWJodfhFIXQR7fKPtMkTckieQGalkQp0+IZ0ElMAgY18UfmEQiDelQpsHgBjsC80UCn1DNq/hMZnAAdauv+FxTb9bouAkO/4SvDPJgSgUR77Zen3Fl2moxeL1Yj1jgdpCWwUu2X3IewBJLJInilTvEyEC6RaGvcJ0ZpkeQdbT8IfYXOrmmB6hkUtVDJR0ugXLyELnuCAICpOuROwzIHsoEGR0lC3JDBA4e1T+VzpnRIMP/8KNis5IG8UOIKcio3+PbQHG+qjl44Tcgl X-MS-TrafficTypeDiagnostic: DB7PR01MB4888:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: REkK7AvK0GtcoHSXDTs/ChWQ66LAjKnXzZyzEmPqRwkgHY0rZDX5WUGuEdDTbYU4hvaOi5YFq7YmfD5yzTa39Uy/B3FQRGoZK2uqAkSEgMq2XUYkyuYei9pdjpXtvkdqvNTRFjHuX2lZem2ndq8wa0vnzepGeD2gaP9IB/2rpaDy8YxfikHpvPR40RhVvNiPnsZan2dT5yCni0ZdCNomccDmiFWrKCJwrFwJ/ldREFDJsmkgsmd4sBcMh8ZmUpxMHCgAODcBR3UX2xEJcerskr6dSImsPeNKatqGOUfSIe3yaWtJgR2a88YxGUloE0fIVdVx7gCqkExXp8pxr9B2x3JewkRRHGHSud8vjFzn+9NCdYl4QLyTNqwhEvrngw5kR13cZrSlu1JPQPGFGbWbuDOpxg/wqUMXqpi0FoBstw7Wj++J12yqAknFBfL2TQ9idC59SJgaeH6nTuuowKI8s/4mf+hknxeY6darq3qsbasS5Ws4GpLksvwkvB0BAD346RqcQ4YkF7SGy6+PYgCEJ2aV3pLzTQczLci4B8k3wIWzAt0ArDC5QTUly7+eIgWkwW+QZzvApGe2UJWmjsONIA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MCk8DA/1LJjpO7IZ3ca9Mqsf/uWn73DKIzuSyLcSvmpoljJdgH4mbf1ruSUEkMlXEbhOKiB7PrkybzYau6qMif1Tnl3K8WBI6RjFJvYbwyGxdco0Ke1Zn/DR0bQ/qpDfZN9Fl1pDVJkHNYzKTZ6U+8LYZnYy3biKIFBvOw8CVyWeD7BcR5fB2gpC2JdiAmFDXMnj6+FEpxltSVihaDSipv60B7bn9By9qj8jvi0XivzB+sRgZ8NJR57a77dQOpVfbo6Q4uzRnIIxDCCVREm2Ggr5pZKnK4Dd9eqW6AkET3UXJj7VVwvtJppFA5WgsXaQrKAhvAtHXleq2tPUY1MW87TOUYiUTvdMDT3KW0Yd1hBDp/5mvoSFOQZGb9a9mBhaR0rCz5moGnN9MmLfAxYO3iCjs3mlNKIFPTj+eMSIxTmAgW2koU3ySfF8CW76eqOAEb0AGwlSoQehDaBochHaoaw2/smkGBE5fFGk1wHlA/g2hvDCy4z/6HZhoOVhm9sAOlrEgKK2lpPDHUmlyV3ryfCxBb9OipuCu/kS69W4yAmR5DbqkuNOjpyEO4UbAq2JSq0bR/PpN6VWQhKKh9sXVzpJjnS3KwrKxCtzDbixR3B0dQG9+dUgLnRPdn174OJH9AW1IWARcLFBXvn52shWhtB5+WYkMrFyR6kVJwvYCgWvfzJb9+ND+T/hqFE501o8Iu4FRCJooRTy7NUM+NGdRhnd5qkvf9wKzApQpy53ColCkPbnAsPzGjD7vJ0oGoJAbKK252F6S9fj0KESFIlndJkUXu1yqoNUAerfirt2oLry+tc/MO03mgt97RHqL86Tcy+9G6J6VfdHxYE2zqgW3Bn+o9h7TKNx6QOK6o4DYFyPWYkfKUxEK1kR0JeuZKYhzizw840qXKKy/LGXXgehgVj1qXjWMwLXMMcPKFX0ADSocNZS46F/9bhwLyWZaXh/XdGLrTXl5ZnqTn6M+PgIUzCaGATQD0kEbYMPS8OCN/9wvLwdh9LTzpUEBjB7PtlBoamBewIp3W5tdMhAXjn/Bz1bn7ZGJ+BXypqO909lZ3egRYpfXW3ILTei4uENFY9/4ycUV4xqDkAgRzG3Cq7ytoNwbMuDmC6ZVLtkw3g4xQNv+y+0u//pnzq0ldelJO+KUJINo9OdYYrCUg/YIjdFsc9+4/5crvqzgUeuxbmrBKo= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3e2180b-fb0a-421c-1be3-08da0c001799 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 12:32:56.7413 (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: DB7PR01MB4888 Subject: [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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qxSSm7J74Zyc 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; }