From patchwork Mon Dec 13 01:15:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32368 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp6863924qvn; Sun, 12 Dec 2021 17:15:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpLLEmRUtd7aEmq22BG0Hhiij+mtclXzl5uORbXTpVEomgRz6ZXyKH9yc+6798IzJNZqei X-Received: by 2002:a05:6402:348b:: with SMTP id v11mr60010661edc.276.1639358148070; Sun, 12 Dec 2021 17:15:48 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sh40si19783260ejc.528.2021.12.12.17.15.47; Sun, 12 Dec 2021 17:15:48 -0800 (PST) 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=lDkPbpxO; 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 4DD1668AD8B; Mon, 13 Dec 2021 03:15:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2100.outbound.protection.outlook.com [40.92.90.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F6D368A133 for ; Mon, 13 Dec 2021 03:15:38 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BforjaDKQAjeIuJ+51WD+8DFam2rtqWVQgqtXI9w84VeAROSBpctz9e2cupJLIceHBfQj9Vp1QqXFQE7nchfGan/BvyfxPmWROWw1DnqtC/FYz08LbOhRypLqWyl96ZO8DPTWQUjQ+HeAeAIrRuB23SETpUDzvtfCOfQFt7/DsuAxTMtn11A8X5qgehQPAaZEne7vGcxk9IkBZKEDW+DjZ57QvnOV2i8E4CdYFwG/epzmCsxxIf7/WQx9RQTXpsUdljkyd66ZJZEoXw70ya/gn+JUhiggqIDn8RTCS2WmhqryWMNF20TreFkGMy7hS6MLLpwunpqkNYtNrQWLKtW/g== 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=sWHzmrwlEnQv00z4bjohMovke3W3APUno8oQZyOfTrA=; b=NhV97nSXuhEkRM/Gdc/2ydIcYePeej3X6X6f/IMg1oKX3gmK9PYq5KJboV6bY7Xo/TefBk0C588cEjtKQXYUB0djVBqGjO6LJF+KEkJfxGl8Af8ClMatFx8Q85Kbk4q0d0/KB5UALegyO/0BHOKyLFS0STjglSzmD+0MZJckp2OBhrDDQYAY73rOb70gShs9zoYkAUkcsc/wWaIXpSCuRWZqAIVP0nSEZm9qpII+jfWyCY5QQcxZ/7as78LCiGfQuXKzGtp9XKHj13EG00F6ABsiVtmZZcQuJWVchOhw+DY0BMHuGS/2+riprghMnSXyiFV92WDpWUYbAFgPxz8CZQ== 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=sWHzmrwlEnQv00z4bjohMovke3W3APUno8oQZyOfTrA=; b=lDkPbpxOX9R3KQ5ATOZQ64n9lLMwRcr8ywKR18+xIfYH49+W3TvevZpxhL7EqQYej9Ys3Trx9C+TMV24i6BSnSNmo/Ue2kjDZu0A6vpf5BHwEXVeG0mQiqooEjLGM+WBMAP9iHXYczUeuT2SKQxNILoubPczoFgNnzC0+/Vy6NYEvyh9ZsiBsZncTZZ2JEvBfD0WiEPlVq9kX3jMat9H08ZGSwMvUfEdpHbsEts+JZaogc/oKNXQm9VHaANETIcoUOFiB6C/PYMfoL5vglMF3T/jVE0cwsaTQKUI1LUViaAlTMoc0EM2SRpUHFeU1ZUqaQ6UQHF/9E5OZgxXy1qQxA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2433.eurprd03.prod.outlook.com (2603:10a6:203:7::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Mon, 13 Dec 2021 01:15:36 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Mon, 13 Dec 2021 01:15:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 02:15:22 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [O+oRbUNOSXJDM8xiio1jNsuJgWZdjpYz] X-ClientProxiedBy: AS9PR06CA0164.eurprd06.prod.outlook.com (2603:10a6:20b:45c::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211213011528.1749871-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0b2adc7c-f7e4-4735-e1ef-08d9bdd6112b X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEvw0jJqV5+qBT8yalQtudcTwkP1sav/dRRQ6eQ34ujffxQmwL4LRO80Lf7WgnrsyULbSIMO8WD16QfLt8+XBG17dBf73eyHZjEmmNPAuAS74WeYrkmbOD01/whpsteI2KZZsis3yoRDGGS0V3GU1BtOYoM/8Rk9YYzbfEXZhrD+9i2KM0qWhFTOIPN/UUrZSHk7uY7vS7XE/i7ZKcQACO1JaLRce8DrSYBinRxXBYqIWVBCpW0ixI0XNl9rAsgml88oGwSzGWd98ObKuLF0D7gHlbreqxkRiN8Zd709kDIo5badJAC6FqGfwRQvMtZZGbPRzD92AeFCJCqoGCbX5nV26RtNL4UA1zkSa1OX0NR8pagk4xKNtTa7AHoOxNxyH+ql3EjlYWROxzhIi5BlPpiQIPjGzW5Md5ZY0kFL1QffsyE67OQmtjHVGHnhU9/+qgT2D1rZ7XdbZaErxFFPVgUMYoqY3PCV64jakfjEbahuMchk6s9Tths4/xgkOBBU0lFQvW9/U77WV+yFCRZdTadt7dnqAtK9Dp11a94qv3tAQcRjm2nsNwDIHutUT5UR9u9NJELvGOZHlqiGQ9mRYM3n8i3J7FkydZT2nrqxpFpG5k4SCjF27Udxrj4TNhngXfxXtoqUQsVAaweqbhFg2STZzYrJBhXdZnPwXUmUa1MHo6uANtPDKi+LuMKHlSGsaAq1xb9sgGXhe1ATV1n46cBv1jbSBYIxjUXP6OqSpDIZYbW/dI+OX00kl9zQjauHj25y1Vac8IZ0iJ7xHQi+l40v X-MS-TrafficTypeDiagnostic: AM5PR0301MB2433:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A/uDJ/TlkSM5WjLHxgT5njQE/MVOjhfFbFopRzXjqSIxsG0XKRHx+I8+hN6GX4/VuOs50M6pmbsUls93s/2O5vkWFrPfsNyZB/LGxtkps1Zw5LokjsHU4KX9FUsqTtILGBLtfHs8w7C7uBQ06vOuXpJj3DP/JtsEin769BG4Nk0AYPc3JciPkaLwR6o332KFhmxEfNoeReeEHk/1wOHQdoNVPJ2mYg+Dci3JmDYs6NitLwtoGM7M1HkxFV7jy/J4gM6Z5B4va1x6X6mI2Mi1BqMF9PbqLnm5u6hQ6pY575IWFhgEmoe116tLukulqtvBvIHUjmJqraKNV7Uwex1IbkCVT1KbVVtw2+VgM2F8AVA5uikcu7PyP+mgEEFJ5/42eqGitTFY0+4rjL9euzgaK7VNxR4LeW4hSFYVOKlhX8HSUAwyL6wMEr787pjG/pUiSrtOmJhWfd/gICcYuPbTrnw20STDp2qH2tm7xMlLw3tC8at3rOBLqdiKZ5ArplSMRxchFN4BhewLbT+3Rg0eNeJ+ZDPU8VXVAmVZxcA/msqQz1gB0iDWOFd7Zubdi6BaKrT/JNUDGmhZLbghMSuszA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BBIkXmemDbuTIf8IM647k1gRe3xSPNK1yMrXZfF46wK1DP2SEdPGN+eipaUavHJmdvjswarFEW//h5QXpSQqZVnzEJ4CzlBTGqZq6E9FnmqJs6ambVcZs62aTzuEHnfa3LuSIe74uWlrE1245KvF356/UQY7qUKBZ6Tu5vbttPQrAnNVdm3triEEDHenyl2LSRtxI5VfJoNqoNezcqxzw4QE0WL6XNygc4whWyRs1Y9TmqKjwDBHq/CrljLibCIV77o90p3NI2VLF2dtpG+Fz2WBy8Ur+rKQB+SXWKR+wKc4Szu42PsZqR4dDgW+XzFIgGuiQHkfAuTI7pc9s2KzKjGNPvLUN5ySx+42yGGBSs2q0L9znaPGF4SCvq5AHNxHHmiLMpxLNdQkHR0+gYKAu1U6C3VA8DOWoNHPIgcSCNBsvVytssF+AEUqOMExzNg6fU/ddyVM7Ldk2Nb2IjMB/JwjONCRFy4HcG5ELWSyIFon+D4cQAlJK8ypW4GNxe7gBJ0GMqCiN6M+K8D70gQzySUpKX6VP540espx/Jhr9QmbWZ7VdvIrmASjaotmDeK+6IkdLHyLikSdXVoJiD5jZKdeqiqlvFtLt5h9Ibg37Pe+tyZBsZsrSWBeC6U3qnRiQwZkbH9LPYby1oWeaoWa50zUTdO3fPmHyKS8kSo8daNqfQzFXezTFz8mXXiWAdKdHeROvavwkAY7VNAZ6jUT84B+KXslIJsxcasr+unbrxXWGI83NePXk+SemkWRb9ujPt+mgVAiYrXUxZgEwwSWEOIOuYrt6yZVoSZY4sGJO9DhFvaqLPAiflQ2jR/Wumiko2S/Ur20J2W1E3wQUmlT5xbUM2cWIbUMWrdOG/vMQPPSpmrh6r1YVV+voHT9AJFsqkQMcW7jEaJbe3ILqz0QhnL/6J39LzDKTG8rwTMFcP5FfUBC+KqpWrXUNKeorHTp0Yc+20V3WkxcLQPdpPaQpQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b2adc7c-f7e4-4735-e1ef-08d9bdd6112b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2021 01:15:36.2728 (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: AM5PR0301MB2433 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/mpegvideo: Move closed_gop to Mpeg1Context 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: XKcn55JbrM53 Content-Length: 3434 Only used there and only by the main thread. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 8 +++++--- libavcodec/mpegvideo.c | 1 - libavcodec/mpegvideo.h | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 09b2902bca..672031b6db 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -69,6 +69,7 @@ typedef struct Mpeg1Context { int rc_buffer_size; AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ + int closed_gop; int tmpgexs; int first_slice; int extradata_decoded; @@ -2449,7 +2450,7 @@ static void mpeg_decode_gop(AVCodecContext *avctx, tc = s-> timecode_frame_start = get_bits(&s->gb, 25); - s->closed_gop = get_bits1(&s->gb); + s1->closed_gop = get_bits1(&s->gb); /* broken_link indicates that after editing the * reference frames of the first B-Frames after GOP I-Frame * are missing (open gop) */ @@ -2460,7 +2461,7 @@ static void mpeg_decode_gop(AVCodecContext *avctx, av_timecode_make_mpeg_tc_string(tcbuf, tc); av_log(s->avctx, AV_LOG_DEBUG, "GOP (%s) closed_gop=%d broken_link=%d\n", - tcbuf, s->closed_gop, broken_link); + tcbuf, s1->closed_gop, broken_link); } } @@ -2694,7 +2695,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture, /* Skip B-frames if we do not have reference frames and * GOP is not closed. */ if (s2->pict_type == AV_PICTURE_TYPE_B) { - if (!s2->closed_gop) { + if (!s->closed_gop) { skip_frame = 1; av_log(s2->avctx, AV_LOG_DEBUG, "Skipping B slice due to open GOP\n"); @@ -2882,6 +2883,7 @@ static void flush(AVCodecContext *avctx) Mpeg1Context *s = avctx->priv_data; s->sync = 0; + s->closed_gop = 0; ff_mpeg_flush(avctx); } diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index ba5b51955e..55399a7478 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -2317,7 +2317,6 @@ void ff_mpeg_flush(AVCodecContext *avctx){ ff_mpeg_unref_picture(s->avctx, &s->next_picture); s->mb_x= s->mb_y= 0; - s->closed_gop= 0; #if FF_API_FLAG_TRUNCATED s->parse_context.state= -1; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index e90669b776..85f02b1355 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -198,7 +198,6 @@ typedef struct MpegEncContext { int *lambda_table; int adaptive_quant; ///< use adaptive quantization int dquant; ///< qscale difference to prev qscale - int closed_gop; ///< MPEG1/2 GOP is closed int pict_type; ///< AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, ... int vbv_delay; int last_pict_type; //FIXME removes From patchwork Mon Dec 13 01:38:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32362 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4814554iog; Sun, 12 Dec 2021 17:38:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJyxi8R7VyX3JYYT3vPapeCsByBDAvVfeVAUIcQj2TBpd10Q9g1sLmn0od3nguR2brhH4MLQ X-Received: by 2002:a05:6402:4c4:: with SMTP id n4mr61078342edw.30.1639359529183; Sun, 12 Dec 2021 17:38:49 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qo11si12748401ejb.347.2021.12.12.17.38.48; Sun, 12 Dec 2021 17:38:49 -0800 (PST) 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=PS65uyMc; 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 9D98668AD92; Mon, 13 Dec 2021 03:38:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073016.outbound.protection.outlook.com [40.92.73.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C0A868A842 for ; Mon, 13 Dec 2021 03:38:38 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mYyCXUupNxMMkEGyxkyDZRCrewZKyMnfUeFFcGkEk2Q3NcblbLRd/axuJVVuJOej30zjQVXr1qSxTqvsSvDRxing8If1QauwuDxZki+txlFLDeumXeE2lIS7lV18JNv2sZBf7lgOjvlDydnAchi11XS1TPeYYczjyzH3kR/WEacI4Jw61k6ZMeTT2A2yBT1rnnK2UUd83M9PRMVd5LSYc+CDctl/VHExsiPmmwxaHpq6/VzU859i/9juc52PmrvCCYwTFPNgVTdmZ5dnnwdbU8wQZLUThSQXF6KduP6s1PIYdjBzNizlo45ghHvUovDV1as+ZSv7t53sOROHz1NzEQ== 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=gBiPWS/mLl27ZC6zgvqUPI8E77MlAj/BWKaTynEgnrA=; b=WK1E+6pSgqrnAYdzr+hnt7WkStR9sJ6K9cfzTDfMYGbGJF7OGNiwRABxRJoPhpg5TGy5sKOROtvQ5Gb6OFVfc0Nr+iDSmZhDw2/VbrRKZmHGKuuwyXQ/KC7lmG4NEB9FBVdhgk49zf05yemXphwoD/Uak1j3zI0Zt8zK0Veas8eslQEKKpXqGYzGZiDHq7cKwFQaxo9aILzSxmFgTA6ktKQ7TfnqL/xuBfjikSgIC3Zy2Wr2GKDSGrQY6XooFmOeSq4w3pmMOvH0CXyNMmCCcToDeYNaykVkHvu+ZLSwoZ+2yOD/f+T2mHTUUTT0CQIQUo91GypIXMGJviVyv7t80g== 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=gBiPWS/mLl27ZC6zgvqUPI8E77MlAj/BWKaTynEgnrA=; b=PS65uyMcvbZAvFkEtAZsQquLmFmRb076/Hv9bsTSgSJ1UQuNbVnSJMC7XRGjDnaqm8IQ3uEIpgM3sGe18TgUhZMZJhYpQuzIzfuXKNDhs51k5hxN12RN7bx9NWmVBZc+JnWXu47xYgD9bip3cZMvK6Ht+vvpJWA74NKSEvKg1ktDgztpWRHm/yTpQM9y/xxXMX3zJeWFJD5wtd6N+hncHsQXvTu1pMpQasUKYGMT/bBGmYuJFO7g3ojYF0RwMQx+mwB5jGot9mumWTwpLV6MwNnedE22/6SExqhL+f/uUeZbnxvi/UQPOBzwy5QlMuZKkXgaeoKjHWuzUCGngYhp3Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3864.eurprd03.prod.outlook.com (2603:10a6:20b:1c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Mon, 13 Dec 2021 01:38:36 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Mon, 13 Dec 2021 01:38:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 02:38:24 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [H5feaKQOQfqQAkL06sDyCuqpmS7InJSl] X-ClientProxiedBy: AM6P193CA0097.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:88::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211213013829.1749956-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9312343c-ed6b-48bd-925e-08d9bdd9480c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRhTeYa9y1Ya0aPjwWbsts1pjMNWZevbFpfQlL4jci6df+0fw9bhfTutW5fngg9GEtfIOAK5lMEZW8im3a79Uefod6oMWFumV+jTEJO/PKPKfxHGsCZFQ3Y9GxVCHr3aDmdB7NBxhQga5ebKwl6HprbATxbWT8Cv+rmlUEPikwQtxsbphrmTiqCv8/HHPW32rzhyoCWYM659YXqs9u6xnFsazdZEgK1rebQz1650bRFanE5FEZD6EbmDDR2F17hmhce3b5c94eSU+RxGdxfblDaaC0t1w3lH/hppyrZENuALg6MJwZqZAv/x5rcvZssGnDzKOCRX24Rc7OsW28X4sXxXJjxEJxmxC54WNAbAxK7WMK2Cr+fKLBBerYnO4zLbBQb6WTQm+6sPSjvzx71U4yH23k+rJZIQ5mKWb2tOBVxlzGX+cxLmH1q1GLT7BQ8nkaNV4BpW9FI1iSq2nxt/eAXrar5BpTQPPD6+zWyaiZ/RnS5YUoWj/5FrIn9AN5EXky2t/g05I3tcjoiLg56QaA+bZYhVMFzon459Q7RckYaM9BU6w/sDvMtco+oeDRFHfx9Y1q204lpK90y4TZbXE/Jumo3+NRJaJmhX8zX58JtU3jPRXXbLu/mYysGh+5kp/gXrT7l7FhLGNDE/pdUpqW79K/M2pb0WXrxxiGtegtd8ebKXMh/go+wNE7kvSzy3NhdyN3vp0wdIpbMyXILoXXeugKNL4m1L7wgHO2pnQV6ZfWfNIrnmGSaZ6WI36aRv/c= X-MS-TrafficTypeDiagnostic: AM6PR03MB3864:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M3d6wGaEhk2v1ZPD7xWmPHwcunlVhUxjmp19cZysSz38NstyUzlv/EmJI9oGGDu+vz6KdULH8HAKpoTzrCHVJJ5U9V1hwvJ8bMBsewca/puuJMasnzcVMb85KcLtgO5X2+Ce2W+xVtLq173vsKjwZkew0y6zijyauGroPXdp+yIVEwqMWo56dbbTVl8WkgJv8Sy3ZrAH399Hw3FG5xZ6KOhvk3DFy7meGWWicbIA2KnCH1ssEzjy5gumfqrFK0Fl2UZBZbY0lmcLK5HuzZ7jxgMv+JBWirmwGuZfaLn51U8kIlMZHFXpWrj9PE6zn2ibfu5o+lFHweEB0S2RwKRdrA4ifCwQJvJOeE1/i5mZ7ReL4S7J7D5333jdGPyAVGaVC0q6BdypA5joSWlO95rkQ8ISFj/4UaCQhYQjoDhOe163MQM3EuXieUL5rZUvFB86OxfnnsQ0cELGnWDd7QJu1BM94D50AZdbsEcTIHM06JyGEi/SNEBmIUHvjVWkh9pvSe4+4Fi+9RKrQ5oFXIV+yUfEsV6nIkwzhQZhhaUO8oet4Et4uX+KOqOVGMRfZc2wI89k3h5qCpmTIJ7FpDgHgA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FYlW3qF0eZ6Q6CT+JWHW3RBGERUfvClAdP7wmpA16u1k1tGf4hG9z5T7JKOoFwsHL21xDBwi+8DSG9zyrGemk8QftfkSJTCa/4q4UIiSrMyi7pvWYonsK+L5SKnhsjv2jJ0MfW64Y4kSUfQ9qsdDYnM/eBSt+qIvy+uCCOLRLiyyxMAAdP1WDK33UEG/QSowrHDhMdhgWdSm/SOOJrpuiqM3oVyADmPI/VQRLC7MP3ZyPBiOdQCoJvTx2YL7gWUMqyOcCCWwVtopWCu6WB3QpEWDbXvBb4/q683r3CU3yFofw4WtPI4DeRbnU96WxqxZ081kIf9TkeIWQOLtbAJVauAQGu1pvkAffTXM8Ambrnl+tG3sI44QvoTwzqVLGcC7GyINvD4hHOIn9MoUlsaBrpX5b00w4Fo7UVhPuCtt6He4NfM/FF7ujk2do38tHMR9afSBttT6ZcRA1y4zgZy/OyxTt6kk1SIFmEJqLxxz57626cKME/m3iLymX0egBV7EQo7qStHsrhDZYx0PKc/OVqBTpxSeXGLYo4ZpM76NZXYbja9mm7pvoF24LhME6DpU/7J8ARsLv7NqIRJIunt8cvE+E3G8tqF2hAhPETJyQaZvTyKUjyoHwHTffQ6Brimxeq6yW6p219326zmFsE6biTIRaWi3Ja/wihU/Ebg9aSKv4xNtGpK9I6MVPuEWxMBKK5I0vRl7qjGRC3fKXlDG19H/0G9NpurGYuI1He6t+hHD53/qPcjZAFvecYvAF7+po9L1oQ3ShzLkB6SHV2jbWb1xsWpHt7zR71pzUfqOX483mtXQNV/PHTTU9fkiO9c80LPg1QaXc2MEs4TLsEwE718rzDSeF+O35BcRre5Bu+lopxTjdgUTNNlNunD57pywQ1XD+gGWLmhqYx3N2viCksh6pmSrur3764dy1oe1YRoknC2Gz2WWxVVB9r/EJbSFsHRwTZ6IDU1ZKSaR/PhORQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9312343c-ed6b-48bd-925e-08d9bdd9480c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2021 01:38:36.6159 (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: AM6PR03MB3864 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/mpegvideo: Don't update encoder-only fields for decoders 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: 0JxNk5zbGbnQ ff_mpeg_update_thread_context() is only used by decoders. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 55399a7478..b5ff4cec69 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -658,12 +658,6 @@ do {\ memcpy(&s->progressive_sequence, &s1->progressive_sequence, (char *) &s1->rtp_mode - (char *) &s1->progressive_sequence); - if (!s1->first_field) { - s->last_pict_type = s1->pict_type; - if (s1->current_picture_ptr) - s->last_lambda_for[s1->pict_type] = s1->current_picture_ptr->f->quality; - } - return 0; } From patchwork Mon Dec 13 01:38:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32363 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4814651iog; Sun, 12 Dec 2021 17:38:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxMPC8Ne82BAdwOLNQ+WPBGo4ewxioW1ttqFiiOcqDKFj7SxT040Ntn/LtO6mcNo4xo4EhA X-Received: by 2002:a50:ce4a:: with SMTP id k10mr60516763edj.31.1639359538062; Sun, 12 Dec 2021 17:38:58 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m10si19453951edc.241.2021.12.12.17.38.57; Sun, 12 Dec 2021 17:38:58 -0800 (PST) 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=siFzCX4U; 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 B44F068ADF6; Mon, 13 Dec 2021 03:38:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073074.outbound.protection.outlook.com [40.92.73.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF7AC68A865 for ; Mon, 13 Dec 2021 03:38:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eudbte/2cL2/qCtRWczqV6fYRsmPLQd00XDPbStdu3EEVfEpdrTGLMnzoCuhDq5THHGNdTtzPfKkZarCrFHOfGLBbyeQlIDUC5n/xD1TCNH/kvypi/h3bEbLxlbnrs5A/eGR1SH7xMxVi4rk7L4/xBVQkY11fRm8grSDCyo5TXS4mxmKx4CH9lMPV3929Ivnpp3BC1UBQJdfTyEaEFjbhCtFiblVNoOkVDT1YXOxxUvG7M3l/QG8KtLISk3FJLGew2wCJsY2pk2zw0S8gJP2/DrkMTWHxWoLPPRt2VnvUg0WX8NTUsyvBB6ZzIvMq10SJG0RWl3LZCrzqypn4TSylw== 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=ubePYN1hRinsdZYxGbSrgEWYHQFIs8RECEidVAfi4gk=; b=Fo/wcnhaDQ272SW8C9EbhqUBH/rnYYGxai94MaS44WIxXb2Fn2dGRCuSfsyX5Z/wL2eCu6Zqj08Fb9iJQu6OlE23hfCQ7HSZVbPhJDPOU+uCLDzzlx6BtQxqZfRV8plrnOXCgLSG+a/+e2IvvNGQ6oypNv15mSkMy/nn2w+aZ7cf8eufFZ4um+V8C9IkX4DUZg36VIc5IdaQKMFbSKeOEe0s2I7hd82KS5XUsk23cEieD1GLkShjI5CW2jFZ8XHgnPUrTvYwWk3OS4u4C61Hu9YT32I+NVT9M0G9je0dZNyvpt+ZtB24yq4KClGYcvBrt8c+HZxMGx+Ko/GOpI/pMg== 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=ubePYN1hRinsdZYxGbSrgEWYHQFIs8RECEidVAfi4gk=; b=siFzCX4UfJUc7Ubrypa67PoIYa197HdHhBrIUJtosaUHJ8CPF5YeRQtfgYkPqjObh/zs44o4lmDum4CvZ/+pIwocWYXkeIpEs88Eo6hXqWwy926M40KesJuAPHXiweWvnqJMlxm6nrrrSc+Y2VgDXEYi74xBYPGV8YCey58k54PWZSp7Zt2261KR7dX33K3btlYw0x/ac74Ak4Rlbv4yZbO4O3KZ2uBPi+qP0fEnjzb89wTcYCgkqY2Bct+FXalg0xeTsrOXud/72fLtIySMSShby5IE1kcHsX4/hqCFWm0pukKg5Tckf25zbYvJK4JzlMV0RyzB6H8ifBaisPBmQQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3864.eurprd03.prod.outlook.com (2603:10a6:20b:1c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Mon, 13 Dec 2021 01:38:44 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Mon, 13 Dec 2021 01:38:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 02:38:25 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [XX62MOmHEZmSR5hsYLSlnizKnIVb5Ero] X-ClientProxiedBy: AM6P193CA0097.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:88::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211213013829.1749956-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee13dfd8-b183-49cb-ffdb-08d9bdd94cc6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRhTeYa9y1Ya0aPjwWbsts1BdCSigKZtSlRtGDy2j8fotXfTC/iwDD4p+f8C1KgbS96RsKCM/QW1FAbFJjjEdmA/f7YVL72+xCYQkn/ePnqSNQgnM2MKYIkm5/lV7e8PECMRJfXHUFvcjBjSxlA1pJEZKaCAmrLdVOIx1eLmjeAGPCk4W9CnUJZXpkOKcHvqP+IqrpNzE8ekcZAcedDPZA/1aG/LJtGbFCO1vlUUy56cgrgEcJn2Yj8zaeIQDnr0uBWIIdzDGC5qCSh2wVTnAyu38YnwmUeAwCw1qFvUiSmwgZPj6kSRWG/sRsn1DOcgPEyaDsiblwnvLmAKY02y3lix4ihxgKj9aWsgsnipiAZvsaniq8noeLcooL7rR/mJARypmH36AAEKg3J9EM+ZHy4ng2tv+8JOKNcTzPhLeMvSkNhHY4TsicaMHWwwPXEsGGdLBUtzhX9WPldw2eLE7qpZ/ySSz413oZK/yVFYPqOA3/L6dIdqIh9VtyMlewbIRCiRMsI37YeyyFqQz+6O39bT6XIMK2L9VVK4aqZvCNkM2ANUPcXLubBz/tUdxCj3f7i/kzxWZ327bs8a8/g1Zwe9cZ6tSsyWGOLYaWXPuqMg7WhM++XeD7ucCXQFLsyy9c+idgR7aDeyWm0WLc06gEpCPhbTMXCh9s8l+ATydLC9oBwWkNf0ENqf7/eNIpUCURXtn0AH0KF144sXyVdJeRH1Pc2t70E1zc9Orx1zJn4maVaDBQvnieoUTfel4C5KUM= X-MS-TrafficTypeDiagnostic: AM6PR03MB3864:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hWrJtojh7/dJb984wsS4EQv6zVmPa/Rx79a9TFNTCag8WoI+D3h3jXXynnL/PEqB/27FpOYNzz48HrvpyOw4Gc58obC4k+5QADKWTmU0erG/uDkkqOjJNaVGb7GwSWvjdHN3JRt8RDLbiLFPjzZwab/zmhC17hNPZLTScMaVXyDRSWifykGsfTyYrnhPi7bsk/oDn5Xci8OPJEmMFgOfrKGeruSp0zilDaV2THjMZGWrBXSPxU0KE10nOXu6sSOSFg1L/1dQ3L6NGRgW2YR3Q0HChgZf0xhzpVOolprPcYwqRIwNo4MRiRvaQBXzl578PGgj3uH8ihWx6GSZf+bP5fUKFH0yAEvVGoDdZklLc5ohb6878HSrQWsz6/9/G45ZHJg+mOLnkau/ISIj0ec8b4Ss/8VPbJ5rT/Ggc9seD2l/39OZwmrUNW5t7fI57R10pXFXW/1T64HM4weXQ7SlN6dAlP0OfNeREnO10RcZDqqm7k3bi1r5NtXfPu+kPoVDABW8oO3AM8MyBNw8XUDsZcBQT8WA/dJV7peVzELIghwAJCd+IiRf8nWL0VjoBCv5BMvH7RCRAYZbunMiqk6jpw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qNcaikjdPkw8wYXrQhutXsGfS6laXndrjarTl3B3Z5eAKABOyCBsrRK0/lEUl7V2YAahF43mLtr81MVKfFaWRh9BvTmDqEqFzNej08y+RhSQ6QE0poqf0Alj+WE8TXzq1Vioic3jAvGeZKhoqPf7BiMrBWDrxvAMLD8Ibq23UcP/9NhnLqLUyxxwfNAJOqU8/8CfiTRU1+a8qUIhJ6tgRnP5aSFIg3uTJuv8LhMF5LzRjFJvNlNbRxcvR8NqWvGv66ug0gLb+xZHutFgXuq4HgzCVEWYBNCjWGLOfA3trOQMw5nLPM0bDQ2qLjubzvc6uFANzL1dmsZytUhlpDkjhKfIRNMjmbYo/VYHSO4Ax06aTfOwSJdfDwcrBnRXvhmwa7u5PU9ZmEylh17x0ixWAM4HM3F1PZOxRQlYjZdTnGIg2Aa8CAgjgtBsEkVCuRlPe1pKxA5eUAqTMq221aUFqZgtTCABhL62C+8F80ZzRnSFUualHOFLLb/dw7oeFzttCAQcevVrmcHCoOeGV/E0h6E5KNOmSGf6pcNGIboX5k05cT+dXE5+TVOylRKa8mFzCCzpTp5Dj6ERJrEwbGPF5UnYjsC41xYeprehCEneYyqmzy09461xp0xm1J/aj3hlvQUlCHvgpmcapri/MJ0SWDmYtAUDfYxoA71bOcUzzre07em3cPdTcLiVRLcCVfUNC5c6ykcSj9ZDNBlF+lxUvd1nnxkx/ExXf99gjQ+lT0X2INWnOkQ5Omx9HYtZo55KpIN9lg65SMXvZD7be8hQt2dUKWKYP/7a1Uz6v47e9NPYhGPf0zzJ/iAiQ5UNJgEjyBqxlIEH2JBra6lP9cEppTzw2qb4k5X8tqRpg1EAhmCQEVsXHNvnFSXlAVFNn5aAevhtxe0eKAa8+Yus9WjZvi1H/7JEmtGLt3mefSjUIWoymc1mle/tkk+3kFHyimPGyFMFg+LYVzPZSjQs3DooCw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee13dfd8-b183-49cb-ffdb-08d9bdd94cc6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2021 01:38:44.5017 (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: AM6PR03MB3864 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/mpegvideo_end, vc1dec: Remove always-false check 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: IqS6v+Io7Zil Mpeg1EncContext.droppable is only nonzero for the FLV decoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 3 +-- libavcodec/vc1dec.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index f804b8215d..d33cf9477d 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1658,8 +1658,7 @@ static int frame_start(MpegEncContext *s) if (s->pict_type != AV_PICTURE_TYPE_B) { s->last_picture_ptr = s->next_picture_ptr; - if (!s->droppable) - s->next_picture_ptr = s->current_picture_ptr; + s->next_picture_ptr = s->current_picture_ptr; } if (s->last_picture_ptr) { diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index e636fa6160..267d72d15b 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -862,7 +862,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, s->current_picture.f->key_frame = s->pict_type == AV_PICTURE_TYPE_I; /* skip B-frames if we don't have reference frames */ - if (!s->last_picture_ptr && (s->pict_type == AV_PICTURE_TYPE_B || s->droppable)) { + if (!s->last_picture_ptr && s->pict_type == AV_PICTURE_TYPE_B) { av_log(v->s.avctx, AV_LOG_DEBUG, "Skipping B frame without reference frames\n"); goto end; } From patchwork Mon Dec 13 01:38:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32364 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4814749iog; Sun, 12 Dec 2021 17:39:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJyCq06MNdKddLv1QlxjUlEp5giYLoBrn/xRAiJ1zSTIa9lye0SYxlJmAvhWpS3WAbp93BZj X-Received: by 2002:a17:906:f894:: with SMTP id lg20mr40316938ejb.33.1639359547203; Sun, 12 Dec 2021 17:39:07 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k19si16548490ejv.383.2021.12.12.17.39.06; Sun, 12 Dec 2021 17:39:07 -0800 (PST) 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=cOWFpM5k; 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 B8CB168AE4A; Mon, 13 Dec 2021 03:38:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073074.outbound.protection.outlook.com [40.92.73.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0299868A865 for ; Mon, 13 Dec 2021 03:38:51 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I8EyKlyiNa1AHP5VKUtVKGgM2Gn0coYwWsAp5DgubO9b8Y8dBxFGiIaldR4YqlCYZqmp2g+4snsDpPKaBhELfOdZOvxjXHw2pooeXUXrHX4PXDg2WGsEPcd0Ex000qNTX10sm6qeuw4272z4t6YkkbawHTe5y1wAGuejVWMMzIH4Egk6E++wC1XMsVe0pqrelWW97D8Fkq9IHp7GUGqFTcJPk2LAI+Ft/7pn7wcJr8pkMHSNFFI2aNX1pP3pgL0dnCsCdvIlVGJyvkVA3aRd7GF+0+ms8NofAB/GCgmaNocMgPQB/6lP923Udy8If/3ApPCOAuybZO4xE+1/OLT+lg== 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=OkvdJJ4IT2RcGiQFHVC7qlCawJNXLAS0WlziujUAJXQ=; b=TdgHd1DC1Ama+6808AmfFfBc8cq8SMg3V111GJlCsvI3qcAMJXVKIWA1KkL/pb+MQlAOajlVmi6zk8QD2uFjdijLsGGAIyq7aICBtWQKb4VcytGz7D+bvf5vOiTLr3Z2Rv6xJBOjuKC6T4y+mIvmc7P7f6VuvOHNrmMcD/QZFZzPZ5NuMqiJlZwBiTFJgq+hJODJMQMdD04Ed36hnh3INxhm90+OR94fWWBFie+N0dwbt8fqxmIyIKL/93yh6eTy5dQhkCejq9W3+tB6yKJhzbJKzhUoEWmh3IuEcJmmP4dcgpuuCmgy16T4g599sX0KwnQIFcOfgbHLJOsgwdswUg== 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=OkvdJJ4IT2RcGiQFHVC7qlCawJNXLAS0WlziujUAJXQ=; b=cOWFpM5kM3LR4jd7SJ62YoxkSF0FNQD+VVJrC/rWOscA8mscGxEztk6OndbA7de82FnVK2TbIJhuSEYlRMtRBv4Zc3M4H89ZmwNhJLeBQrLgcl54mIroj92R+vMKQL9kkhaZRVUh6OsJqr/VPTm3W0snNG/N6KkYixpCUYXEi9z6yj82dewGsFQr3I1x+b3gZ+IDUj2NL/bUdgU5Xdx2+pRNhHzwRVDl3ZSpAWrtOiOV8SFu2dC+6B8yuKYADvqTGoOc6fkEtGZvgqwykZzbcR04TByfCOZANGyZpdI9E55qHUESx3D0R0Y0bCsa4Mrik89pc+n7Uc7f5OQBa4Zlfw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3864.eurprd03.prod.outlook.com (2603:10a6:20b:1c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Mon, 13 Dec 2021 01:38:49 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Mon, 13 Dec 2021 01:38:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 02:38:26 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [5iBBehi8zjAXTV9djA9aMzSHccJfalcz] X-ClientProxiedBy: AM6P193CA0097.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:88::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211213013829.1749956-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 78948438-b906-4a9c-6f16-08d9bdd94f48 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRhTeYa9y1Ya0aPjwWbsts1eQw55XAsu24DqGiiZv04LAqobdcgnCsl8C/666dNOcht9jGiHM44GcDKWIrJWQses6+b7RAlOH6nKPHA9OWccokTg6S4lDfNHWeXZSflpW5so0/dI6NsW7QbdVGahmzUftyb6NskieBvSrLkjAJ26DND1H0W1dTR9tCxcrfr1gy6f7ffv/cFVLCXzm7x1PhT3Is1msnlQh/XGoOR8OqOZNo/NP4JWejPP+l0YTN3VOT8HeUqyJdn8pUXrEgGLcZEkHmT9RsNT0Wn/Xm7o+dl9hC/qf2Vz66ER7RtMtIOg7MIzgj2w32SSvOlFl61giSnBcdl+PPAAKNF6S2BYpnWin8F48trvc3nKTUiWY3IkbYTBO/KSjDzHEQDuU03aNb+42Pn2Qf7o7EuFuAGB5385LYbGIHu8tEf1kmGFFQO6zf105LAxdnFNKIIlFpX6o9BbIyV+jKh5aAEH1iO8cDT8E3PVmFeYjwQthj5OmcF8fG7uxjSTDUBNyaGvvepzdMNLbgkPShOyFZXhW3ZbGaW05iLrK8hZGzORSjo/c8lcmaYRTCGxwbjqlwx2zcvS6FrYndhW5jUfxMpLagfzfOBVwYbcGMAzENnDoUH7x9Z4xhwnN7Q9E350f7Llrx6HjT/45XnHZvXNbo4SJX3MU8NLpgFS6F8WMfbuWKy84Va3w6LXeh2BV/BlDpPfFmH/tNN8OJwxwq8o4PgL/pkyN2XfHsBRyk97luIEWyewh2BZn4= X-MS-TrafficTypeDiagnostic: AM6PR03MB3864:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J1Vt2z6K2qP5WkgKlodcaJ1G6STCfLyl1sHjDNkWz9PZwKktH7+MLQFiN6AkZzFBBmAuE9LJLwwGkEDPvl7NYRLTJmyQS/JiSVnUDKTCXBuQIb8XKX6ZFsnCSlpaUzofoOP5cjWYcUDX2OnoVny/RIRK7tC6ct00L6BXGJHhBvVfHcRejyGjK2xurpJQ1nBvX4RBMyN7PqWTMQY2ddi+9C7p18P3Nhb8Rh3P6kDdmi1Xy6wmagt5KxZHYnFlwiJeCKbPFAWr+AK5ln6eDQ2Sd+kaFV22SHtI34gUKTQ0eZ7SEEVvL4r0U+67kAGElb8EzDiaQEW6P3tzlIcxvckzQh4EPnT0kkFoA2uARj3S2v4F2HxXtXfdo2bc2MnMyikgmmPGnlm4i9oBM/z6LbO+KOnH4ZdsynyR4njzjK01ulSKV1F8Fg5LRoNW2ArwO3b1YChs2J8M63SazBpxqjL2VICMMKBod4TuoF2QSeqOqy3MRtLj5Zca7lZyjibvilJcLTXSsG5T8+86Nyi49C8FU9itCh1Sumpux2zSOS3UNoeObHEJ9p/4axPd6bJlPpKEgxlgrYrOGVmhtpvjibob9w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: t5a9ZtfSp3TG/ZsH/l/cMLxDZyHhz81byRObT1i0qGMiCvwBILF1wOymIATg5OFyf2sSSCMcLeY4gmq7JJ0Eb8eR/T+DxG9gWXfUtPZidIZYsZux57MpJxa5x5XReWlWB8DzLWMQf1WXL0BYfttDcJJSwU40zP8d+Uj9e2FVFxFRvBFTQcJLntZsMTwDTVQNZyq9EdtKw1hPSb7yTsWGr87l5L63ys7lzygUPbMH5Mi8r/zUVKA7gyZxekuEuBwXglUFTus2vKpKaC1dseyV1PefAeMuqZQenP/1emcUkl5gb0Hb1az7rOxeA0HGIJ12nTj7hnxiUSfNMNknNjwyU9sNgcDedRKMYj08XUWIpJ60EkVT1F+lqI674ChuMP79PY/Lpfpyi8x+FlCewcis0OFpwdvz81DJ3ioEX54udwrW8EAk3nNgCEyDRIj7wZU3mSTAyUMg+YrNgEoYgnyHGJGmFKIaQfKOBAGsxVoCpkr2WEK44urgTwye6+yfkYBg0Kk/dQ13bI167waOLq800vkptmOroHVlGLjRQiqOGg/02lBatA/OxMOTk1RFNW/NOkx2BNECw7aEjV6NN/7qqS85O/zuSo9836Vjrt3jBm1ge5vgFY7YAZESCer46h3LCSw9BZ4FTTSVHqPNFPMBLh38APv0ONN7YfFZSue446/EztxAsHxW9wxZcYufXhM9E06mvNfrGWjIZfEHRmiYXbtmVzizwhgW410XtrRfqUs42yvb428cw5SygLYQ0ygc2A7WsYh/k3DpWV+YfylET5BpziJWeaq4JzhAtkQuf3kd85WjSpI3CDei1ctKR/sf5TxdtY6zEbmtgLvEkv7rK2COSITxXIT4Py9t3ZfgPq5UIVTJJnXHCI97C+hLYs1NKRrULtDHfzD9JgMYIxhFXJ0/AwxU5ACzCWmy3CSKz4ZVEdi4L2HiEL4jYlc1gCMSotvgIF8DJo5kkG1H0Q+NUw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78948438-b906-4a9c-6f16-08d9bdd94f48 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2021 01:38:48.7223 (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: AM6PR03MB3864 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/mpegvideo: Don't allocate encoder-only buffers when decoding 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: 75+Yvg9d31m5 Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index b5ff4cec69..e2cdba8bb1 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -768,11 +768,9 @@ static int init_context_frame(MpegEncContext *s) !FF_ALLOC_TYPED_ARRAY (s->cplx_tab, mb_array_size) || !FF_ALLOC_TYPED_ARRAY (s->bits_tab, mb_array_size)) return AVERROR(ENOMEM); - } if (s->codec_id == AV_CODEC_ID_MPEG4 || (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_ME)) { - /* interlaced direct mode decoding tables */ for (i = 0; i < 2; i++) { int j, k; for (j = 0; j < 2; j++) { @@ -782,15 +780,27 @@ static int init_context_frame(MpegEncContext *s) s->b_field_mv_table[i][j][k] = s->b_field_mv_table_base[i][j][k] + s->mb_stride + 1; } - if (!FF_ALLOCZ_TYPED_ARRAY(s->b_field_select_table [i][j], mv_table_size * 2) || - !FF_ALLOCZ_TYPED_ARRAY(s->p_field_mv_table_base[i][j], mv_table_size)) + if (!FF_ALLOCZ_TYPED_ARRAY(s->b_field_select_table [i][j], mv_table_size * 2)) return AVERROR(ENOMEM); - s->p_field_mv_table[i][j] = s->p_field_mv_table_base[i][j] + s->mb_stride + 1; } if (!FF_ALLOCZ_TYPED_ARRAY(s->p_field_select_table[i], mv_table_size * 2)) return AVERROR(ENOMEM); } } + } + + if (s->codec_id == AV_CODEC_ID_MPEG4 || + (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_ME)) { + /* interlaced direct mode decoding tables */ + for (int i = 0; i < 2; i++) { + for (int j = 0; j < 2; j++) { + if (!FF_ALLOCZ_TYPED_ARRAY(s->p_field_mv_table_base[i][j], mv_table_size)) + return AVERROR(ENOMEM); + s->p_field_mv_table[i][j] = s->p_field_mv_table_base[i][j] + s->mb_stride + 1; + } + } + } + if (s->out_format == FMT_H263) { /* cbp values, cbp, ac_pred, pred_dir */ if (!FF_ALLOCZ_TYPED_ARRAY(s->coded_block_base, y_size + (s->mb_height&1)*2*s->b8_stride) || From patchwork Mon Dec 13 01:38:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32366 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4815180iog; Sun, 12 Dec 2021 17:39:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbXAGLIIx3tEbGXgL2WcCoD2vwu7dzAa5qO0MTdu4gHW911+joOWPHoHYz/4noF4b6Tc3C X-Received: by 2002:a05:6402:5156:: with SMTP id n22mr60521897edd.222.1639359578508; Sun, 12 Dec 2021 17:39:38 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hp8si14846023ejc.359.2021.12.12.17.39.38; Sun, 12 Dec 2021 17:39:38 -0800 (PST) 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=odjFUUNi; 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 BAD3468ADB0; Mon, 13 Dec 2021 03:39:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2084.outbound.protection.outlook.com [40.92.91.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B76B68AE51 for ; Mon, 13 Dec 2021 03:39:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oTPslovZdKHGQiz1u9me3RgptVhviOK/lX8Gkbk20wvvhbZiTjP8q61qEFS9XaSMa4DOejM3VFSFa95qljh1od/9HeXJWMVvcmCCpxWJe7FlHpIbw6Qj0WK6SbrOZuVS/TohslHH+cOteQRLDclXsN/apjAjMhEvXdaU5oRlvqUhxGJ7jRKCpwIeX22fNYFJA+uYH0votw6oCQYuDWDxg5yMo8UBoOE6wYGDjZzzTwwWHLLt8D3nJru1ggdtaMQJkmb0uAm5AlRWmyTqOeRldaBNExwZ7uCFMW67WV30IV8ATNJUBMhKOSbh2f5JKheAvUj8zvOkEFjnOTUXzOt9Yg== 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=m+Ww2U7vXZZalB64MpK4OUv41kn7XQscRPYWJGMIplE=; b=HSPpLCKmUqNiO/MgfhED02lKymlEvWesC7h+0qObDkH2yD/pWd+cHVmmLuhybDR+rgHe6fj7YKhHKY2sou4XVS1sIZok8BggMgpDvqQIG/mG17u5zZupgI4GF8Ju9xTj2t8k/OxG6zHBDMhBAPBjatLrPOMtaek+5v3yx9ZdmODqmZ+7ilF67NbaI3AQ02irLdsY8661/mjt8Z2jy9Bb3me1oZI8e6KAHCVnS90pWLraJtwB/o1CzL9hJRmvBac3eAlMVssqJ/hwf7s+FgJv3Mh8hvEq5F1dVlcMPqzvdVz2D3/8JqFFkpzvNm/DfGIaL8n18Os+ETslWnNzWmvG7A== 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=m+Ww2U7vXZZalB64MpK4OUv41kn7XQscRPYWJGMIplE=; b=odjFUUNiLByCEVLfm8eu+DIlwwmKt00TkOvOKXG4JcX1OQZF/Bky72pQHOYixBMi6UpYjEY33B18NHTwDzKrR/lSf1JV5OixXYI0ByVtiPoIBhincX90AZm2dTl3yf7ss3aeeVPHpUajqkAOpnY28ir+DTIMQfQ+zMOwO0qg7U0QKDgcwMFh7NIvN+Uuyce4zsCoQG+qZluvGDrdgn8UncvrseT/9M5+vn7I7Kn4S+XFFogSr2+Ziha1YYu3AnCswFYEDnjnr9IkWzdY8dpPeHPCiDyrlt6c7H+z7S7iRalpBBVBlyWzedBA5v3Ij/R/d1tjC7/45t8qRYJ8uIRfTA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3864.eurprd03.prod.outlook.com (2603:10a6:20b:1c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Mon, 13 Dec 2021 01:38:50 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Mon, 13 Dec 2021 01:38:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 02:38:27 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [SnZYJNrnmBMmJB3EluQ+DjLiKiR34Y7a] X-ClientProxiedBy: AM6P193CA0097.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:88::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211213013829.1749956-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 949f3612-d28c-4165-6905-08d9bdd9501a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRhTeYa9y1Ya0aPjwWbsts1MpPMswtNhY1SMv3tkIbDh5n8hTMD/C9gI10sHFuGuYrW/g/saDeM/pOI8CI8eKpH1+AK7/e78f8tPDCHE8oOwxpF6XWsyvQSRoKe2PlKZnSz81QkJMeoeosKYl/xrK+aIpGporsdC11c5uJr8oRftJ6MmuAEG9i0r/CHRALQ0PUQb13gcUIIaYdAGNJ2iabJC2u1GRxKg2E3zfbj40NBYjKnBzLxVcTu3j03a8LnSfxenskuYBWXhWaIrZsdDgdkPFDUY415IEhx86hMD8M5a7Lh61SYRGJaUOWHr0yYTNStVCChAJIQKx7WpXKL49gVXOnohgLrM1bsipVqz3kMgo2sj3vGqav7dgG7j68K54kyquv6abQMAlXIbjArx+QELDP0cAzLH/j8gkrMWe2dgvddIENT34Bgwwoxok1FbaHigDrsyRlEwhB8t/SpdB5eDpotTIwOcKHHkHe/jgl3p4aIp4AsjKd5iSdIil9L4WNPZpcbwiMgkrX5wT8Nzq/xh+dju9rWcH5yng3jqDF/G+vRsV9wm+rUbYlmS/nIUqdl8fGGNabWtoCJeD4p6Rhl3NusDs/6e7/T1UR6joY8pa5nYFBwtJejfF/UBxGbnvHzBAm82RsVxLPCwygdsY1PPcZR7vrK+QRK0/q8MCdnWjAuYCIQ/zFkPZi2wv+m+Eqq3m3npryZyEodBVgN7Nv3gyPLy6tVDrKV1+2q23Hf4UlcGA+KkaPPJ3OFWiiLgkc= X-MS-TrafficTypeDiagnostic: AM6PR03MB3864:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8mfMFpBgJxxIAaMQf2uyM8J3PfW0bUyroBpCvLvTdCKxd/ObbsQCm2y32RZwLGXYruPKxzAlgWQGrkMcFMYc2ttFKLWNBYmxdVtCK97JtoHaUxSeOEtLdGnnM16m2efpmw5Hg790P0LcIKZ8R4NwANKGciOlsq59RYLdepsKwv+kTDjrYncrAHzUC5UsMYmVffgoqOKqkbaaZ9uhaapC28ZH6jwcqjqZUZIirSqXjBpdfbpyU8Zz/dfG8eL8ABlXiosfj8/bMG4TREpX6QNESVjibgOk+g86Ii8DSAiyqjUjY1naxJ0Jc7oVPn10TRAxOC0EM6SdK6hZBR7eEqwKx4wRzTFT0uzY8+eTzRPSl6CeUC9yRpkwtSp1mb3357+rC3KUFQ4+q+o/i1JtVEApIxA3stK+azjWv7g2taZSWON1HRSK/0rSjOaJsH/bRSMZaZkfL3T65kvvO4kQCjt0lBIdDExf7/eaJh5SYRimTEzmRBEv+IvkH5rpT02L9TkcCPVDNZXSxlgQvkSmO9RC+H8bgSG5+VtlnWpzyoWCYn3FNYFzQ5ziOfKbaE8IxlY8t2eOP8Q8aIw3nx8S6IJC6Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bEB/MJmfpE0F5m0UwDTh8odWcXzcFFzEDCEO28iwAyeES3FSVQJkywY7DRP6YKTk3orRFShT7pu7pdMRkOPRE7AYBItWDA+WJbQ4jVFEapTFeuO2tGMnYOfFWCPYTEfhu0rW6ejF7Uv8AEelnhTHyJaJO5BC6IX623IAIWPSmIuqx5lvS8fDJ48F68vYsOeaJAaDcAE4/LBUa9RKM+Vwms+yceR/Lk/vpGpzfVXXYnebHDtNRpPCYDueFi6OycDQshDWfIcHQx8+mNRmODo0HntJHgbUQ8VDCfb8TPUwa0XUOsRYfM1wrhNddUJVH5ewxTTC19F4E6uV9kxrLZyzZra7y/6QLwr9I1N1ojVnvCm23a4kZtQGCMyYXBREUP9ZEFqRNBU4il8g002y/eWqRuyJnuzhuAnB2KdlzpEGtwuEtc3NzmTBwIwm+MFARJEOGWKfIvXLLhkc8O0uXNLmfuw1BFdnoqq5PG8HFjyW9EpS7LAzEvU7SyFJySN3LCY23miXpePTQP/At71wHZQdVuTm1q4gUbMokt1ANNp2XJVS0CzjIBqQHD1G+Tum7qQsMYbx22LVWrj0mriSSXPODgkQ5O+NF9KU0fTUru60W9KuBxu3ORr0j9Z0Y3j1dgAKb+SRLGM6R9GtHeiqgGawD/e+rbUkkWuS35bHTGPikbriHhSEIVpU70WJFomxe8/V5tO50Hx4D3VEbffVIHr0HRRyQo/3h/b6q373sEMzo7g28TQJIOzcowgsQwnWhZkWF3CdmVEMY25iTIj8+YBq+zIE9eNTs5Y1MpITYNYg0MNTPwMNGm8qPDLW1fZEXbmTB1FhQ1VuycOSQiaTNOmdjTU9FaOFJeSgN+/SpqxgNVmN7sESywehBQiLyqtzsGExEI96ShMChKOPMcfpG6oVC4paWQWIHZHTMkdaTstKn/MGWIZ4AbUIdBdSLHVkMQ5uF+C75DWgyCQGsN862bJomw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 949f3612-d28c-4165-6905-08d9bdd9501a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2021 01:38:50.0970 (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: AM6PR03MB3864 Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/mpegvideo: Allocate several buffers jointly 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: lpCeCYevO4Y4 Reduces the amount of allocations and frees. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 46 ++++++++++++++++++++++++++---------------- libavcodec/mpegvideo.h | 8 ++++---- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index e2cdba8bb1..be47ccb8ed 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -769,34 +769,44 @@ static int init_context_frame(MpegEncContext *s) !FF_ALLOC_TYPED_ARRAY (s->bits_tab, mb_array_size)) return AVERROR(ENOMEM); +#define ALLOCZ_ARRAYS(p, mult, numb) ((p) = av_calloc(numb, mult * sizeof(*(p)))) if (s->codec_id == AV_CODEC_ID_MPEG4 || (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_ME)) { + int16_t (*tmp1)[2]; + uint8_t *tmp2; + if (!(tmp1 = ALLOCZ_ARRAYS(s->b_field_mv_table_base, 8, mv_table_size)) || + !(tmp2 = ALLOCZ_ARRAYS(s->b_field_select_table[0][0], 2 * 4, mv_table_size)) || + !ALLOCZ_ARRAYS(s->p_field_select_table[0], 2 * 2, mv_table_size)) + return AVERROR(ENOMEM); + + s->p_field_select_table[1] = s->p_field_select_table[0] + 2 * mv_table_size; + tmp1 += s->mb_stride + 1; + for (i = 0; i < 2; i++) { int j, k; for (j = 0; j < 2; j++) { for (k = 0; k < 2; k++) { - if (!FF_ALLOCZ_TYPED_ARRAY(s->b_field_mv_table_base[i][j][k], mv_table_size)) - return AVERROR(ENOMEM); - s->b_field_mv_table[i][j][k] = s->b_field_mv_table_base[i][j][k] + - s->mb_stride + 1; + s->b_field_mv_table[i][j][k] = tmp1; + tmp1 += mv_table_size; } - if (!FF_ALLOCZ_TYPED_ARRAY(s->b_field_select_table [i][j], mv_table_size * 2)) - return AVERROR(ENOMEM); + s->b_field_select_table[i][j] = tmp2; + tmp2 += 2 * mv_table_size; } - if (!FF_ALLOCZ_TYPED_ARRAY(s->p_field_select_table[i], mv_table_size * 2)) - return AVERROR(ENOMEM); } } } if (s->codec_id == AV_CODEC_ID_MPEG4 || (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_ME)) { + int16_t (*tmp)[2]; /* interlaced direct mode decoding tables */ + if (!(tmp = ALLOCZ_ARRAYS(s->p_field_mv_table_base, 4, mv_table_size))) + return AVERROR(ENOMEM); + tmp += s->mb_stride + 1; for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { - if (!FF_ALLOCZ_TYPED_ARRAY(s->p_field_mv_table_base[i][j], mv_table_size)) - return AVERROR(ENOMEM); - s->p_field_mv_table[i][j] = s->p_field_mv_table_base[i][j] + s->mb_stride + 1; + s->p_field_mv_table[i][j] = tmp; + tmp += mv_table_size; } } } @@ -880,14 +890,14 @@ static void clear_context(MpegEncContext *s) s->b_bidir_forw_mv_table = NULL; s->b_bidir_back_mv_table = NULL; s->b_direct_mv_table = NULL; + s->b_field_mv_table_base = NULL; + s->p_field_mv_table_base = NULL; for (i = 0; i < 2; i++) { for (j = 0; j < 2; j++) { for (k = 0; k < 2; k++) { - s->b_field_mv_table_base[i][j][k] = NULL; s->b_field_mv_table[i][j][k] = NULL; } s->b_field_select_table[i][j] = NULL; - s->p_field_mv_table_base[i][j] = NULL; s->p_field_mv_table[i][j] = NULL; } s->p_field_select_table[i] = NULL; @@ -1026,17 +1036,19 @@ static void free_context_frame(MpegEncContext *s) s->b_bidir_forw_mv_table = NULL; s->b_bidir_back_mv_table = NULL; s->b_direct_mv_table = NULL; + av_freep(&s->b_field_mv_table_base); + av_freep(&s->b_field_select_table[0][0]); + av_freep(&s->p_field_mv_table_base); + av_freep(&s->p_field_select_table[0]); for (i = 0; i < 2; i++) { for (j = 0; j < 2; j++) { for (k = 0; k < 2; k++) { - av_freep(&s->b_field_mv_table_base[i][j][k]); s->b_field_mv_table[i][j][k] = NULL; } - av_freep(&s->b_field_select_table[i][j]); - av_freep(&s->p_field_mv_table_base[i][j]); + s->b_field_select_table[i][j] = NULL; s->p_field_mv_table[i][j] = NULL; } - av_freep(&s->p_field_select_table[i]); + s->p_field_select_table[i] = NULL; } av_freep(&s->dc_val_base); diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 85f02b1355..879b019ffc 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -232,8 +232,8 @@ typedef struct MpegEncContext { int16_t (*b_bidir_forw_mv_table_base)[2]; int16_t (*b_bidir_back_mv_table_base)[2]; int16_t (*b_direct_mv_table_base)[2]; - int16_t (*p_field_mv_table_base[2][2])[2]; - int16_t (*b_field_mv_table_base[2][2][2])[2]; + int16_t (*p_field_mv_table_base)[2]; + int16_t (*b_field_mv_table_base)[2]; int16_t (*p_mv_table)[2]; ///< MV table (1MV per MB) P-frame encoding int16_t (*b_forw_mv_table)[2]; ///< MV table (1MV per MB) forward mode B-frame encoding int16_t (*b_back_mv_table)[2]; ///< MV table (1MV per MB) backward mode B-frame encoding @@ -242,8 +242,8 @@ typedef struct MpegEncContext { int16_t (*b_direct_mv_table)[2]; ///< MV table (1MV per MB) direct mode B-frame encoding int16_t (*p_field_mv_table[2][2])[2]; ///< MV table (2MV per MB) interlaced P-frame encoding int16_t (*b_field_mv_table[2][2][2])[2];///< MV table (4MV per MB) interlaced B-frame encoding - uint8_t (*p_field_select_table[2]); - uint8_t (*b_field_select_table[2][2]); + uint8_t (*p_field_select_table[2]); ///< Only the first element is allocated + uint8_t (*b_field_select_table[2][2]); ///< Only the first element is allocated int motion_est; ///< ME algorithm int me_penalty_compensation; int me_pre; ///< prepass for motion estimation From patchwork Mon Dec 13 01:38:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32365 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4815004iog; Sun, 12 Dec 2021 17:39:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJxnGz1kjFbYETwu4umaBFeHKs5NuhEBkt8EuCR7ziyI2IPs5mz4iO1wP1Ahaj4MoCwl0ScP X-Received: by 2002:a05:6402:190c:: with SMTP id e12mr61273161edz.396.1639359567087; Sun, 12 Dec 2021 17:39:27 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds9si19142760ejc.479.2021.12.12.17.39.26; Sun, 12 Dec 2021 17:39:27 -0800 (PST) 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=k5cxNi5o; 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 DFE3968AE9D; Mon, 13 Dec 2021 03:39:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2084.outbound.protection.outlook.com [40.92.91.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDC6368A717 for ; Mon, 13 Dec 2021 03:38:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OdL3gvDEe4/RqTxRjklKtgLRwSxyueB7kh46KhpmTKdkq1lFHDAZYIRyV3FEuFUwS4LYjB844Mcq3SWq/vHlBjscIYZvbNVmZWm9x5OI9rUejek8QZOWy+qpLuN657DQ6UA4lsc93eMczFFwG3klCF0JPSGGszD0UlXNaLOn8aLGqWsIOf0AiMrqly30t13OOQPUe1l3jYRI05VrnAIDunxwe08pL2WvXpfzCEzcSCkbbWC4he9RiA9h4OTalIgLXEQoy6zo0xyFx/8BZ9X/ErQUhOBZmbtcL0R0TFwJer4S+cPbLw48Ow5sKlSo2Vg5APRi+WVyKm5S336/IMEZpA== 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=FqYi5oBaY31KFMnvi3mUYdJ6Y5s4F7bMOBh1VzGuzGc=; b=OmQm59wutiqTqlQB7OrJvypvSEoBihoyuwLivQm2HeP/mAXt+uHnr744+Su9oIK/koIVB/KIaIbem7azYzCIOFy13qp+ubR1R7Zo/G6xUxxNW3g3/GOYQ9jCb6TWjXnmTMmL9tMcyQq0ClAb1QrqKIFptfiEMWGiKM65Wx64u34vjUTI4EQo1cU/eXQqqY4aq4RmS+oMmP/RoSWgriqEb1Asf1Vytpw9EaxWGamCVPjpvkB0XpKf5aL3+Jjj25zhuQlEs6GXvco4GSEX9hGMAOR8xZIJdzJ5hjMyJzYeWCxoVZndBqPDkRgBpAfMATuDSFccjqgFqUfc7ew/BFlq4Q== 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=FqYi5oBaY31KFMnvi3mUYdJ6Y5s4F7bMOBh1VzGuzGc=; b=k5cxNi5onF0OiKaqiOafkdtKlFd/eGE127bOXptoWrXHTwAe6gFkM1B6DDpblEZkeyGpfZfhVWjITa1QUelCtWr6AifOrFXJ9e5fCdeP9VLCgEhT2aW1hmHYnr5XJHH3qYJyVQkVBESWyj6XT7y3TYPQzijFllGiPBdwKmWYwfwJR5jPXTDj4EdquUetRL3mRT9ruCB3h/HaofL++oAeDdJx8lSTser1jS+64kKvX9YJGYOrmLvTbvLFMSM8YM6dvgg1DxXiPUDaB+VJy0JdopRtfmv7fJbsPrpwQOGVx/NM4PK5pv/KW0j2uldFqqX8B4OIbsf+NkGt9jVTesaJqg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3864.eurprd03.prod.outlook.com (2603:10a6:20b:1c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Mon, 13 Dec 2021 01:38:51 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Mon, 13 Dec 2021 01:38:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 02:38:28 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [27KRz9elVduN8AjklE77o4FetpNZRy9j] X-ClientProxiedBy: AM6P193CA0097.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:88::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211213013829.1749956-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65e09a71-a4ce-4995-c41c-08d9bdd950b0 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUhTk9wNH1r0v1auB1qr71MI/iqdAHCSAKmWQ0Ri6CL8ZB0DbBrsA/Hga8AR0Sk3E5344mTt4O34Sdxz48xFVmn+cqV2OKarT8ipMxgfdAHJ714K0FlCSTLxP1CgYCL/xo5BPnApbZcVUrMa7oVPWUYwsSKojKUH1UDzcC7grdGkIXe2byP+bciGo0b06Whm4Xo/3jYHC0VhlL1r89xIChcNspmlAqCnkOWuVnqmq/U5L0HjFaplgnk7EiMMTxXBbGpUsLSdZtPO0C9Or1VgqJ2JIAUQNxmF35aVYiwIS/wBg3Jf78C9YKh00ydac5UzVB/M3oQdgniSTYochcotigaQbU6UBalm/uR7DKCR/ggcuCWTyAOK2vOXWhL97WiT3DDq1S+/G0TpbnAzittfm+SZeQSQ6mE1Gi/R0dv6W1KUjzoiXk1mBz4Xdu/Qbc6r+Dq8iZ678EISCBaRjCFTF4ZfGEZu9YZIlJSrEkWhvsOyQGGl4jm5tnnEOlbEqkUug3sLX5w2hLQw5u32KHn56D22vlFn78QIu1KMcaSDjDrgj9qOSSaT2iMoQFih9BTdCcCq8pPghqrd9mx3liqqOvgwKm9biri8s+G3j/SiFJs2h6z47FSPRFPRmoetceqPJHBrbgbwQ8nhDi/8CD3eBv7VxNptYhZ44j90ZhJvugh/9R4p/sUCmXrf+t069/tY3/iDmg+Cqrd5CZ0bsjPT+bud2iAUcP0uPY= X-MS-TrafficTypeDiagnostic: AM6PR03MB3864:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X83O98eZVc91MHZ717BgvQtdSA19CJpoRF6twSUiFeKDZ2+Yx/v7omzrbPOhMSsxRytBm4qCd3GSITvpeByJJ0/oxL8sSxA8k3IaSpapgFec9NN9bvXcRiGAze3BtEhs+9xf3zVQ57+zPJZAa9doY/0ZLIPeSvMICuICP+J8kX3l3gaSMCfUhySrv5MqLV6/C9m+LI9cD/5BndYYdm/Fx3i0arUR1/psw1Vbz1dk2tfWpOYc+982VVMnwJmmlwiojalufwIfi0WlMHVfVvAnu40V0dsB8vTBi42RUC0gNHs4S395o71vR22ZEjV/u16OkoXCEWIgRPmXMYYYmksdKFJI6HLxeObMSrrzzqrdveVwojc9moRLyLQmML7MA83IWpITbn22D/O8BN2O8LypWS8yH6o+Q3Eijfdiz2L3TfVfodr0oXuVrGhgYkmVV7yYZCE/45zi/xoSkMToL7M1/V42dKfwHrha9S2OJ0+GK56WoCvyTOSQTnI//3XBbCzNXQENfb1C63b0I2C3kKr21LScIxx0WHcKQ7IX0buSkLY8Ge1FHSBz9mPtiQmO5It5CbN0M74qE1TR3ZvZ+nwieA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KutUaj8Kcf+gPEMScVJC+UPC4V4huUUBacgkcbW85LEJkbPK0Pvb/YdW9bOKnogIqWQdM7ECpjNALv6nLKDWC0nWCYsze1Tf9KVuewnxPViVi5b1liy3NLMASCCvXAgrwJEGHipholH4XUZUB7FOrPuU17zO3uYjd5tNvCiPAmsZSHVLYdqNjH4fvUmxYORJRZn0mg8eRPxTUpOxPBIL5V19KRKvSD5REK4Hny7xJwNInlTQsREDHW9I5hMWherbXDR05h2JzZHZgpcEQE93LTr88u8Hr3MckLYYGsz+kxGv6nqPJrYNMvvSTLg/+MdOB33hOGS3t0N/5ZdUiowecKLHTVNX3fESCuU61krVH92ndd0OzNbPeKyI07HfxqkUS7o+ZQGpljxCQ9iu66WNI031f8xcYPNZejXo7FJk09JMqfT6zvt12+/81f670MTvbGAfpohmcncAO9w6nK/EsiLtbuN69cONitx7rTnhOVkyuAWwsRjy7BiP/syIGXl1ybl4b8IB5YBQ6HTF54J+PM8xttZx8n+gRXuRY2PUzZUoK3u0BVHI9F4NX0Wt8W/ZUBrnI0iOQLwLErbQhSD8ZBSfA67SikSkupnoFMILwEERVhqWHAWrj9vANpLTWYv/G6gF9qponGx+SRFpBf1uEpwP3YqHqDhs2hQS4aTjLEJkRq3BeI7HgPbuL0LrnD+RPeRUHfhWWw1uWjpxcpb6TcPhxzzLRNSzkpcjUWQtV/AkWxzDihdXZu7OzJVgvnWihcOW9YSy8UN27lHq9jgiauf/PDorY5I9wyW3ezizhkFa0EtMsWgcQhx6PZXUbAUYgKjhmifg1Ni4yb7ZVkJioeAieGzZuREpv7pebYaQemSrU+yn/9tqqDtFIzspLNocz/fJX+r60IRn0dEjQC8w9RXEcCsFk+3ENUrUEAd5anOg3HhcEZeL6sEKkAOddSiP8C2ebagU7MwllQXDhJoMPw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65e09a71-a4ce-4995-c41c-08d9bdd950b0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2021 01:38:51.1450 (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: AM6PR03MB3864 Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/h263: Remove declaration of inexistent function 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: /fMYwNeKvdJE Forgotten in c46eeae2a80dfe0046c15b542e8b9a2c78f19bf7. Signed-off-by: Andreas Rheinhardt --- libavcodec/h263.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavcodec/h263.h b/libavcodec/h263.h index d6bef8318d..84a3a19517 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -87,13 +87,6 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s); int ff_h263_decode_mb(MpegEncContext *s, int16_t block[6][64]); -/** - * Return the value of the 3-bit "source format" syntax element. - * This represents some standard picture dimensions or indicates that - * width&height are explicitly stored later. - */ -int av_const h263_get_picture_format(int width, int height); - void ff_clean_h263_qscales(MpegEncContext *s); int ff_h263_resync(MpegEncContext *s); void ff_h263_encode_motion(PutBitContext *pb, int val, int f_code);