From patchwork Tue Mar 22 12:34:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34888 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp671193uaj; Tue, 22 Mar 2022 05:35:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjzelj92c/sjdgKhiZe9HTGA9clvVyOjyc1Qzp/mi4dUD/FdQCSw0j9fODBNpC0PPEeKAW X-Received: by 2002:a17:906:9c82:b0:6df:baa2:9f75 with SMTP id fj2-20020a1709069c8200b006dfbaa29f75mr18619516ejc.762.1647952500349; Tue, 22 Mar 2022 05:35:00 -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 w9-20020a50c449000000b00418c2b5bd70si12724802edf.82.2022.03.22.05.34.59; Tue, 22 Mar 2022 05:35:00 -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="Rkn/+6Xq"; 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 7455568B19F; Tue, 22 Mar 2022 14:34:53 +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-oln040092074023.outbound.protection.outlook.com [40.92.74.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4427E68A351 for ; Tue, 22 Mar 2022 14:34:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TuuYj1f+e/y+VdbOuS+Z6vxgZZuU5mnTDL69sCd7y03yLWH58oSSkviiQtAlNItpk5Aauwybo/7Y4WN8nWJUQC1EO7WKIkWRQXWrS0gPgx94lLe8Zo5e2N0CqDcW2fFzh5WBt34eDtNWcFDOH5aBmslSBV3/7HqZwNHm+QnaDQIkCN7OOZ4Ig4WG5F/yhCHooicdf+NhKVn3KCWltAXD7TmqrPBh0pNgMdBQDSJTrcZmVc6eabHY1nPEzYCYf3fAOJ0R830MDVaKwuDE1LTvwAt1aDaESds++KhjmrbvhYeG376E6C565baRJdY4jqDhylb7XRAAJe2btEaA48gmrw== 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=9FniY9Cucp2k/a5KC+vwPOnu0EfKgUtmx8+PclbHSlI=; b=kTEIKhGUM+PyktI/nquH29z/OmQmZDVeiUTiRbMnyWxhBcop8QkwJ81sswO/mw1l2ppYg0tyZt0E45c+Qig1A4zPqCb77AVbB5WU4cUfxzfz6ZA3QvkmF/zB6G+zVjHrjvm+ZWPVfbDMowQc0NWYneysl/zGesNoQcsZuTtapLEhQSpI5/3FBEKEPnTwy3gVsovwZHnp2ZP+YJtw7P4NIJHWCwFKqidLea+uQ3Nb1GMrVDvikXE1HLELcCoQ6TySrzIXT14ctxEXEAOCozoDZEWw65NtQC684/4RYkQEwwqjBuEHw51x6BQ01M5TyPzl9Jnvp9dB2TUX+lLoT+Pcxg== 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=9FniY9Cucp2k/a5KC+vwPOnu0EfKgUtmx8+PclbHSlI=; b=Rkn/+6XqHPqSO7Q+o1LRLwFehtbO0KhfWYMnf0PFfkq1sEgpecjScElWQX8tAZH1ju0eXrFdlVPuncHMfNPcINtpVMgBxm+baPCMQG0zJXg1aVODydQOguW18DzpdTpV7heipoVsh6sJfGofq/GEzpp1CM+dkTTMSO/j2UWHxjk00m7WGbLbZbbGpO+KsW/eOrIk8CoD+vJU+8v6KxrUb4bfsb8m7/Yygxcxgi+y0QyocUc0ohUykVdSIdxkkkXY2dN6YTuNANgtGrf1/VuTEkS/6eW4avdBK5e7d1oQPE73hvIfVkJFzy5ytk6G3KcbYPOb0paa8LdIHu5Rf+43FA== 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:34:44 +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:34:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Mar 2022 13:34:30 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220322123433.368717-1-andreas.rheinhardt@outlook.com> References: <20220322123433.368717-1-andreas.rheinhardt@outlook.com> X-TMN: [9/Zt1rROBbliZxGPKwBf4Mo9dla28TlO] X-ClientProxiedBy: AM7PR02CA0022.eurprd02.prod.outlook.com (2603:10a6:20b:100::32) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220322123433.368717-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59cf7c03-38c6-41a4-08f3-08da0c0057fc X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUXiI7VfCKpkhTERZyvrrRoDna7ea78sGEWgHooOCpa9HyxSE3FV2ndofKHvf8JevD/manq1aPB1Zu4GuQB7XtZKSn1iIiDRV8jC0E50TlOF6IuJFDSL36VxOwIrj2ana4VzHYXy6pJe28zLVqVWsJApUEIj1urulsvkJsDxzhGgJkJRt7sFwZc0GJyNPxH8H4enkrK5HJz9FlxlYq+TtvKixJ4ZS4LSrE268C5g7t3LPxHz19otxzQzqT8G2xMzLspa8vwiirxu09bbi0KAzce9sVYaLpDkDY5I5k38yNtIcfBXwNlJedHTGA5UAAMdZttotovupUcMEvUfSOQJAnRZepudD8kgbghYHMBQAF5rouTllpj6w3UEQ6XgmxWG1JrGS+VAhH/VR4HLDnGD64z7qbTyeP89P46sHyjFClPtPB7YRI1vSYKNA2oEPn139lvq6k3wDwXkHGKt5DVhCFD3JWLcqqMlsNfCOKg3wzNzYh4+52nLfHY0yV/zOcDTozCtrd+csA7wWjX11w4o+rcBBL0j0aNr+3pSS8tzRx6Mjs4bPRVbMFy5ysunvyQasGI4Y2aRbtq078jal1rGpmLqL0reEq16v81+xd4LmWedHgAMzd8a2ZvaBp4Ic3qJkJJlmsPZ6lb+fAt2sCGtJjFQT0UFaa6XUEpY50HViO7gZDD9LKSnICOKmuGkMRkAIAOhkFX9Z0RgjaYdJscXeEGJx7D9jONxpc= X-MS-TrafficTypeDiagnostic: DB7PR01MB4888:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FkSYufRR1yvPxm27a/oQLy3sTH0toI2Oak3J2dlSSMEmVt6BNn6tim4+BGAWPvO1N7n48VWCsj0VZ8CBsg/5D7qFP/V4u7NSAIGUP5ZtXlhIE5MQiTYCY4kFfb68ufL5aq3c2P/VU7Kxq2HZhmZvZsLQoCWc6y5+IxGChLhFx4pPO4VqFo3pmENXT34gKxNkdZmDkMbgxUZtlowAgK0EtLcIvL8E53FBAju8TK+1V9FYGVQZwptFC2PCtdbknjKj0L01k4yGWyXYO1Kf4XsD3ojbXVVZYG5WbdD4Hdg8m2nTvnG7FI3ezZ6KMYRRW7tqFgrMUO/2ShARezewf4fyFJryiVB7EDqhrZZkE1Q6hsrzS+rKd+LjRtbjNiqQZ8lEGV/2eE5b5JrS61fkgUzQTYXA90SG0oXS/31P6EcL78S0XD99SCwQYqh5f9SDpEgotl1TGosltFFagPFk8AQjtLo5wX5hWeJxodyLRXFs2SzGK+Mrf7SsZ8myUgMizI2xgNesvz6xj3J6Luer2nAn05NDSgGDf8nPuk3oH5bZ5QxQR0e2YF9KsH0OR8z+fAbHYEsSdR/Cwdo2GrrntQM+gw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SPE9QELv37GwZjcRLH51Otznz0PmJK6CxT69fsP6eqblZfq02TLBxvlUlbboX9PjqhKdvM9fcWTbjita82o3ahwqyUa/8kUDxe6vqvOPgu3RFaiYgDiIf/QT6cvwseoOgCJ55F5aInNLIFxe/yh4gyvTZWXw1WEVp6XN7+CUxnQKCyVlZV0k4bZHcAHhu7hn3zRFWtIgkKSe5lCFvIRRDcII3pfvJD7QTm7LlgLcsm/WuQhcS9hkKAxgLHS78becyBfKKTkPEzNQYQkvLxYejYmctg8vbZlSg3qVk2OTVNf1v8sT10I2JKeC0gJz/fXkBCKEZQf13xz3gtAG47q5AQ2yJYrpEd5haC3WVq5rPEjEjCZzBfmjIN4X+uUPD3GvZPH7LCSjtvnuUSX72/nlIoEJ6544NpHl1Co1DB5PXc00RRh/kuQjA/qXouwg/3WOMoS68QXowm6NNQIm7ChOdlY9P8a0tTdCzDtBlTOQDaiEZQNtguxnxIRhqt6aSGjAEZhViNm3Rf0gWk868EhcApL2IWJcAQzwFTn3cdoPSD0E0PnDBdQQ808sQJLnXjOgF2+s6Idu+4D8Plp55LCTacwcyYpbuiJ1uA8xCu5LNsdctMBD8fbN5ZKYVpQBknRyer2niw/+OcdXlgGPn9CcPyAa47Kfp6K7ELNl8sTmrU6wM3FvufrCVK2v2Rs8WbPccJ/c875imjs8hdmtmkHRJi+PvUPfv5iUQA2+GulFI2ZMbS4JcYVrKVhhFWy/EOTMJcH1zc2ApvcQnBtNon1jI7fzcv9bnChUqY0i1hYBT2/+EZXmOfhlh4mSAWTPISz349Au3DZivzZKgLyzN2kr4JMkd+4FA1yknoplPe+lM4AH4r5KF6mLYseEfMW6nDImWx5ZgB/Vj8GxodVaBDrrIlCaVEA61zNa5GN04XyHM7uJGt/Wql2mkKAn2W49KjpC/d41iwH5syLmeLxdEYGJ6SFgH1axM4Wk+i/5xTLZwi6NNoDmtKai443bQjZLlfc6KFvGBU7zrE2GROplUD+HEF/5PqkjnZ0/CSnXgC75vUqbx1NNKQXTL2gVnx9Slymf8K8i1svuNzthA110oQ5rZ0+AHtoTN/coEv7E5l78yTATejhZnvRrIerP3ky1wSy4ytYp1ebdZw8RbRZYDqx/gXCZYwyQ32aasdlQw/hXO3w= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59cf7c03-38c6-41a4-08f3-08da0c0057fc 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:34:44.4983 (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 3/6] avcodec/internal: Move FF_QSCALE_TYPE_* to mpegvideodec.h 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: QHIX0+XhFSwl These values are only used by mpegvideo-based decoders. Signed-off-by: Andreas Rheinhardt --- libavcodec/h263dec.c | 4 ++-- libavcodec/internal.h | 3 --- libavcodec/mpeg12dec.c | 4 ++-- libavcodec/mpegvideo_dec.c | 2 +- libavcodec/mpegvideodec.h | 3 +++ libavcodec/rv10.c | 4 ++-- libavcodec/rv34.c | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 886fbee8c8..965a7d30c4 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -695,12 +695,12 @@ frame_end: if ((ret = av_frame_ref(pict, s->current_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->current_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1); + ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG1); } else if (s->last_picture_ptr) { if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->last_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_QSCALE_TYPE_MPEG1); + ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG1); } if (s->last_picture_ptr || s->low_delay) { diff --git a/libavcodec/internal.h b/libavcodec/internal.h index f9809926b8..f9d08fcb60 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -35,9 +35,6 @@ #include "bsf.h" #include "config.h" -#define FF_QSCALE_TYPE_MPEG1 0 -#define FF_QSCALE_TYPE_MPEG2 1 - #define FF_SANE_NB_CHANNELS 512U #if HAVE_SIMD_ALIGN_64 diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 6b6cadeb05..887b8036f8 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2040,7 +2040,7 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) if (ret < 0) return ret; ff_print_debug_info(s, s->current_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG2); + ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG2); } else { /* latency of 1 frame for I- and P-frames */ if (s->last_picture_ptr) { @@ -2048,7 +2048,7 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) if (ret < 0) return ret; ff_print_debug_info(s, s->last_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_QSCALE_TYPE_MPEG2); + ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG2); } } diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 28e4e5b781..7caaf0596d 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -513,7 +513,7 @@ void ff_print_debug_info(MpegEncContext *s, Picture *p, AVFrame *pict) int ff_mpv_export_qp_table(MpegEncContext *s, AVFrame *f, Picture *p, int qp_type) { AVVideoEncParams *par; - int mult = (qp_type == FF_QSCALE_TYPE_MPEG1) ? 2 : 1; + int mult = (qp_type == FF_MPV_QSCALE_TYPE_MPEG1) ? 2 : 1; unsigned int nb_mb = p->alloc_mb_height * p->alloc_mb_width; if (!(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_VIDEO_ENC_PARAMS)) diff --git a/libavcodec/mpegvideodec.h b/libavcodec/mpegvideodec.h index 0cda0af733..1af8ebac36 100644 --- a/libavcodec/mpegvideodec.h +++ b/libavcodec/mpegvideodec.h @@ -35,6 +35,9 @@ #include "mpegvideo.h" #include "mpegvideodata.h" +#define FF_MPV_QSCALE_TYPE_MPEG1 0 +#define FF_MPV_QSCALE_TYPE_MPEG2 1 + /** * Initialize the given MpegEncContext for decoding. * the changed fields will not depend upon diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index bd707a391b..23d0ea8516 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -663,12 +663,12 @@ static int rv10_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if ((ret = av_frame_ref(pict, s->current_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->current_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1); + ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG1); } else if (s->last_picture_ptr) { if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->last_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict,s->last_picture_ptr, FF_QSCALE_TYPE_MPEG1); + ff_mpv_export_qp_table(s, pict,s->last_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG1); } if (s->last_picture_ptr || s->low_delay) { diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 1fb17ddb90..fb5b19c913 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1573,13 +1573,13 @@ static int finish_frame(AVCodecContext *avctx, AVFrame *pict) if ((ret = av_frame_ref(pict, s->current_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->current_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1); + ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG1); got_picture = 1; } else if (s->last_picture_ptr) { if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->last_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_QSCALE_TYPE_MPEG1); + ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG1); got_picture = 1; }