From patchwork Wed Jan 5 21:56:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33103 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1111641iog; Wed, 5 Jan 2022 13:56:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGw/UruJAPfgGcqmQ6GM15zq/8yhT0LK4Vx1QOCQWqKnXtYyz7kwXEGScsV8Nhz7lt5iV9 X-Received: by 2002:a50:fd1a:: with SMTP id i26mr53898147eds.229.1641419814896; Wed, 05 Jan 2022 13:56:54 -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 hz2si40959ejc.687.2022.01.05.13.56.54; Wed, 05 Jan 2022 13:56:54 -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="Rh/iLLlm"; 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 DBEB868AEE0; Wed, 5 Jan 2022 23:56:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075019.outbound.protection.outlook.com [40.92.75.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C21768AE25 for ; Wed, 5 Jan 2022 23:56:33 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UQ+3MQTD7YKIjtJ2VCP1M4L21o+w2vgFDQh/wTq9htx8JFVTP927YMQqPU87Q1iWJlG6JdAmlPTMixM+8vMm2yzEGePqh5IqMvuS9yngYVfKDclH1vGunFtqS489W+lNuKLaWo/epQMSWK2P8v5bW2IDUE9MpOsP5cwEghVKGHlGxdeOngFngAbQdjWAr30XqVFEZKmCx07SToJ9wK0Q1kQkum8mJiPD6hZ9nPbFnYKldMr/MRRbN2TW48baeBymJlUfEAs1YxMN5bDvFvl313mvF0fCBoTxM3Fl7tjolTEyjmjccF6euM6Vq6M98hSZOI5EdtAHX79f+hM81mwr0w== 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=ESQ9DuJUsY3NxRrmaiPApxCVqH7mlTsETMe6iLKI9eg=; b=OMvQm7lbB0lZ87Pvy2664beYyM+QN1a5VmYn2xt4b4dC4LYoGD7awWBd+kLFB7e52YtT6Dh4BMKffcv4KRET24aeJqdtukJvC3D4LJwSFQtKQZWBGrd1UXROw9PF2gl+z3svcWBTy2mZKoRA7bRvV5mBUrQOxch7wXY4LC0VKIEFntff2B0L8InaIR1R1ZGsKu/SrPXN9plWjpGGHJ59HvF++X7AXdx/4pk+yDpYyQ7emKzAjhxHJ8/6agGxH+dEzMgXwbed8GMU4wj70Tf0ep8pDoqmj7dj+FcbTQXrOsaMYoAnEpkqT5g2nGN4sdCdUOyy/MckKgmNkEb5uaNlLA== 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=ESQ9DuJUsY3NxRrmaiPApxCVqH7mlTsETMe6iLKI9eg=; b=Rh/iLLlms03vfQz+V2ECrrtB3kXClHvk8T6XemayAm+ZDteVCykgAZzKwHFoNPdA3Y+Zzu0YrC8Weqp3OkqczEG4up9pXVskta3nm3BKxS4rrIOkLpf8yioLZ9rmOmDQb9UYihCcy7bgsnE8g7Yf6CrWDVpx8mKeLB/x6qqtVYcDIFwLcJ7uzBTF/2lbe0f19Yb6iWIgAy2CQp1pO07aZ7BWN7dCD8DuX0uOQqGcblNXla+i/0hEeyPzH96jWbFa53TqJD20LO81O6TS1odOTR9NEOnuIhFhauNMU/x/2ZAyjncLeWKkxIgHMi0auVoaieuEpCtgsIb/pxaNUHsKuw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6450.eurprd03.prod.outlook.com (2603:10a6:20b:1b2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Wed, 5 Jan 2022 21:56:25 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Wed, 5 Jan 2022 21:56:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 22:56:05 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [+n1kKGzmnHkjA1R7206b0In7jx+oSPiv] X-ClientProxiedBy: AM0PR02CA0183.eurprd02.prod.outlook.com (2603:10a6:20b:28e::20) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105215610.813119-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b8b09b64-df38-40c6-6746-08d9d09637bf X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JIqKRrfc4iwhEg3GJI/+f35QukJKS3BfzHktOPGh2jIO94CN3UdZO4l9h5SbpgYIqwcDf/pgpdR0ZjUY3vdcpBC8REHuJOJQGT3lWD6a8ppvrd8qBnudSqTTLe3DOId6iP2Tr8KmLamjuci2+JIWsBKLNbCss+k4q3Hwz/23ZSTUf+0VdEYrasZoNUi0ZQ9O5qSZx8actjEwadTnuT6GYZcE2FJVtrEHCL+qWRLaVlvgKXFAPqIc8LRqrLwtPv1NCtwGoZ9NZ+R27czWj5y3Jub09UN4YqeVxgk2ld5yRp8kldjy4gmLcwo/zFJtP3qA35MDu0QEwq8gC1oyh2U/tJmbju7veBYickJ9OJ/T8Eo/tG22vmObEHenulj5L/HsOHmw/eir0r6um6M2Q5ioFgXYLyA/74amGYVWIGOwiY3Gd4Sh70I+eNWO77RuLcXmBnBVRzmfaRJmLfGdUsFaCGdbAqzvWYSQl1wH0kFOlLNV4c3UmAIx1if3383u82cTJfon40jrpH9UT6MBnKeaHVU2GFUkHUth+hudcWou4JMc6qBdxaWpW6UTvhEV6HmIs8by4km80+2SYbeyo4Lg0+wTiyp0gSY+UH6/rKWIDTkXwnBBZObXzk7xXftbpaCWoiAIYMxPZ5GwbOZ8O7rMKQYtHYG4QU/eDzUmGVwQugOzigea9/KFLJd8g6pCuYNhHgEGtekte1F8azOpDmDgLBt0wtvKqGluJaCGLQ5iRcOk= X-MS-TrafficTypeDiagnostic: AM7PR03MB6450:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dsVmgF2Y2/8IULzwfmjAS/p0MvfsRk0dRjfRIdAhlB9mTGAc1cl1Sdn5ebnE7KOPMr4ILbBgT3pDWfQ0kC5dr2WHfaB893Q2cywnJn1a4QMCpqWWuI7+ZWs9jpaLO9RQ2I/gkC1Pj50eVGcJqOYbN4A6EfYksQ+5XsKOSExf3AC5roybotI9WB8Sgqj360yQwCNZfbwkRs1Fjgaf6ndKYwMkX63nEIpxfdqn/BhS1L0OtoR0/ntM76i+ZevhONAeuc72g4wQ2qCJ/8d/pjcOUnkgujhjzIuu6yAh17zreUYlwxzTjOVl6GoauGtcmriZ9Aco/LtSSWkxGnMXGWZyO2CVC/GuiWxDvlKt/CQ7TMgq83nKGIh+jaoS9FL65GXl0HtBkaDpnx/W1JIUvdxOC+1EF/uI3UMIWaOphaXoPH+1O+lBlFtRjVJAs7t72zxO8+GkN2R2Ssz2NTHJQDImZ4pp6hUxHOyYLiSq/xXbTJjPkBtlMyGadzGCzhuMTLK51wKQRRGHczVSu1z4XkVaa8cW9mibJus8GR6o61PlR5jqpO1fJEKNNoWE39CeV6uKajywXVlVkwpn4KEBhnnfqQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /qhvSOws+Wrn47s0op+S2UpM90VWzqana3JA5ACKL6rfKRuNOxmKVDCVEiq2+7Jn2QK2131xHYbcw/UKYif8/yvVMVxQgQUR+d8OADIZz70cQL0P2Lf/ZtQnKeGnbd8xcs+Q7LX5OWjirlC+VW8/xdRvU4HrCPX35GVHH56L3y/AcdlxSPs2tSvnb2yC9tKqEbge0hUY0YiQlAOFVwkcEZgkedf59gUJUDybHePPQWxuO6qiI1SoeVwr/BTo5vjKUccgrzV4hjA9d5sUSn98r/CWy+3III3VKQ9bwLMMOTp4hqWLPtiSsa4bzUevCW2hTXUcl50rOxqi8QIBXiG1JtDmBm/F/9L3npnn73rH+LpRGpX1qRg7wzXdb8HihUuo6S996PzNNJ2XhiuSDSt5jeO9wICecKZotf+nMCbY/09J2onkGsF1wmoHeF4kMuZ8MsEF9Z4kiUtvuTVSd+sVY4FX+fF9LgCY2yBp6acqLodF0/DwjB7lj0of9AXb+xniSIEY76IxipK5fXAnwDgDOw8vOMgxa1/09FtM++5SWGkxy6/WglktNfMTebTm5RGCsMxYSyQmv7l6XYFdiYS+7R0lASuiGsuSVZxc1wQEkTHjGd4nDrlR5hQ691qiGBcp8mQvAhlz/3stHt9amrqwtPIPrOrIi73MBYPqDOFNfn7J9bgqX2THZRLkQNSWSVZ+zw9W5Uhsz9y+Y/nMgN6h2cnrXlMh+P4TE//Ky2VfNrjTlfNsAsiIp/8tDsvlYohxEVQ5AeNzKjq7/o1t6dTtFPW1wp4E7ZNGppXJthr6jnovJEbbPSqznih+WrDJjaVWDUX6pnUIfF+bOv7kmx+uXUhcsjM6QZpcH0uJ3MZTTh4UgDwLrP2voAWKvpzIMF4bec3RAUVN9UWfvVYDq2wNoF9zK/oFYNg1nLF8ctE+ConSd/HV6WiotEjR0OJZZ5YJQW1a1nTjIvXY+TMQCyEXsg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8b09b64-df38-40c6-6746-08d9d09637bf X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 21:56:25.0316 (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: AM7PR03MB6450 Subject: [FFmpeg-devel] [PATCH 05/10] avcodec/mpeg4video: Skip unneeded element when parsing picture header 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: iTl2LmDAWEqe Namely, skip some elements that are only useful for a decoder when calling ff_mpeg4_decode_picture_header() from the MPEG-4 parser. In particular, this ensures that the VLCs need no longer be initialized by the parser. Signed-off-by: Andreas Rheinhardt --- libavcodec/h263dec.c | 4 ++-- libavcodec/mpeg4video.h | 3 ++- libavcodec/mpeg4video_parser.c | 4 ++-- libavcodec/mpeg4videodec.c | 18 +++++++++++++++--- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 2682a7f43a..11e80cb9e9 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -507,9 +507,9 @@ retry: GetBitContext gb; if (init_get_bits8(&gb, s->avctx->extradata, s->avctx->extradata_size) >= 0 ) - ff_mpeg4_decode_picture_header(avctx->priv_data, &gb, 1); + ff_mpeg4_decode_picture_header(avctx->priv_data, &gb, 1, 0); } - ret = ff_mpeg4_decode_picture_header(avctx->priv_data, &s->gb, 0); + ret = ff_mpeg4_decode_picture_header(avctx->priv_data, &s->gb, 0, 0); } else if (CONFIG_H263I_DECODER && s->codec_id == AV_CODEC_ID_H263I) { ret = ff_intel_h263_decode_picture_header(s); } else if (CONFIG_FLV_DECODER && s->h263_flv) { diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index 3db6f85153..ee8eea7121 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -160,7 +160,8 @@ void ff_mpeg4_pred_ac(MpegEncContext *s, int16_t *block, int n, void ff_set_mpeg4_time(MpegEncContext *s); int ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number); -int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb, int header); +int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb, + int header, int parse_only); void ff_mpeg4_encode_video_packet_header(MpegEncContext *s); void ff_mpeg4_clean_buffers(MpegEncContext *s); void ff_mpeg4_stuffing(PutBitContext *pbc); diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c index c68c966259..9e96619a12 100644 --- a/libavcodec/mpeg4video_parser.c +++ b/libavcodec/mpeg4video_parser.c @@ -100,13 +100,13 @@ static int mpeg4_decode_header(AVCodecParserContext *s1, AVCodecContext *avctx, if (avctx->extradata_size && pc->first_picture) { init_get_bits(gb, avctx->extradata, avctx->extradata_size * 8); - ret = ff_mpeg4_decode_picture_header(dec_ctx, gb, 1); + ret = ff_mpeg4_decode_picture_header(dec_ctx, gb, 1, 1); if (ret < 0) av_log(avctx, AV_LOG_WARNING, "Failed to parse extradata\n"); } init_get_bits(gb, buf, 8 * buf_size); - ret = ff_mpeg4_decode_picture_header(dec_ctx, gb, 0); + ret = ff_mpeg4_decode_picture_header(dec_ctx, gb, 0, 1); if (s->width && (!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height)) { ret = ff_set_dimensions(avctx, s->width, s->height); diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 34b050db28..ab8d2e8236 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2844,7 +2844,8 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx) return 0; } -static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) +static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb, + int parse_only) { MpegEncContext *s = &ctx->m; int time_incr, time_increment; @@ -3018,6 +3019,12 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) ff_init_scantable(s->idsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); } + /* Skip at this point when only parsing since the remaining + * data is not useful for a parser and requires the + * sprite_trajectory VLC to be initialized. */ + if (parse_only) + goto end; + if (s->pict_type == AV_PICTURE_TYPE_S) { if((ctx->vol_sprite_usage == STATIC_SPRITE || ctx->vol_sprite_usage == GMC_SPRITE)) { @@ -3095,6 +3102,8 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) skip_bits(gb, 2); // ref_select_code } } + +end: /* detect buggy encoders which don't set the low_delay flag * (divx4/xvid/opendivx). Note we cannot detect divx5 without B-frames * easily (although it's buggy too) */ @@ -3214,11 +3223,14 @@ static int decode_studiovisualobject(Mpeg4DecContext *ctx, GetBitContext *gb) * Decode MPEG-4 headers. * * @param header If set the absence of a VOP is not treated as error; otherwise, it is treated as such. + * @param parse_only If set, things only relevant to a decoder may be skipped; + * furthermore, the VLC tables may be uninitialized. * @return <0 if an error occurred * FRAME_SKIPPED if a not coded VOP is found * 0 else */ -int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb, int header) +int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb, + int header, int parse_only) { MpegEncContext *s = &ctx->m; unsigned startcode, v; @@ -3371,7 +3383,7 @@ end: } return decode_studio_vop_header(ctx, gb); } else - return decode_vop_header(ctx, gb); + return decode_vop_header(ctx, gb, parse_only); } av_cold void ff_mpeg4videodec_static_init(void) {