From patchwork Wed Dec 7 19:02:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39651 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp874094pzb; Wed, 7 Dec 2022 11:03:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ma2DTgU5dKg/vVnaAk9/HgeqaxMZd1Z2gzs/Ec6ztBiVpI2D36C4LzoBuJHeGdbmLH3EX X-Received: by 2002:a50:ff04:0:b0:46b:19aa:cfc4 with SMTP id a4-20020a50ff04000000b0046b19aacfc4mr40851143edu.384.1670439791343; Wed, 07 Dec 2022 11:03:11 -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 tz14-20020a170907c78e00b0078e1d213812si13967194ejc.184.2022.12.07.11.03.10; Wed, 07 Dec 2022 11:03:11 -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=bQ7Mh6Wr; 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 CBE2868B276; Wed, 7 Dec 2022 21:03:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2025.outbound.protection.outlook.com [40.92.59.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E04C68AF4E for ; Wed, 7 Dec 2022 21:02:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e/tdluyf4HgHnrN4x1AbEveYZw5cb6AoJXWArwdUOBRm81R8jVjarGbf3CfHNx1a2UG2zQBe4HK0dq6v1iyDXYUFIu/w2cApQmOpbfEB6DUEk7LzMhEB5K8r9hsDxZmqcPfeg3FbiSZUOTR7g6URzk8tVX8uH3MM7Ypci4hrB9zv8Ie8nGXLva7U6xK7zCsafYPJY3HtJVmD4ZlGt/SWCgyPgGJhtogmYMykIq6IQG0gIpp6Vve/s4fUo9tNVUQHjjkxhVeA6FWqCUioJk1gPc8H811cpOIvH2Q/UQihCucows5evRgTL7ghZL5eTgtbazqIIHiJjq6DJxM5IBMqIA== 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=RU0/VtY5iG5zcd7Ilk2dh//cxwdISPfE9HVcOdUPQNw=; b=Kd3xBzUKTxYNeEVgnyvrSEn/aDdfMla7Ivfvd2grJY7rGOioeY/KyyiRqH/k9GJgQutoIOTFvAUhaa0X7J0vQoDveH+c+HI9+0Cirj+Htaf43ORVnWKfIulZmmbCIANuFT7cIeMyXU142hxaaRb9RqamPmBi+DWBT+6Dcsfb8jbTdOPmx6pA7NrbtxQ6JyDnqjl+hPHWZggDLjrJqxf2NasY2z7iItjG0Yx1UbRTCADCPB4L+b4ZM9bCV5/StPVhJdKsaAUxlzZWUo37ROsqKAqyeAaQXPL7Q38ja32W02czsEOCQMtxglbBcTQ6KOMOaAyxCGF2lI0G1F5oCAunZA== 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=RU0/VtY5iG5zcd7Ilk2dh//cxwdISPfE9HVcOdUPQNw=; b=bQ7Mh6WrWzfipdP3W2lXaohTZNnqVmYzSAVraxdEMMgEyybNnXgxv9HS7u8JSO+U4+HDGun3pxARdYvMjE10/IQ1BhW+TItZxixVgWWDsYKfa/rrazjt99HkjBGU+sVcB+f4jivJ2UYRUmUMR+MDYxVHCrvbX8KHoK9BF/7agXsQeOhzZLaJyUJ7JwFJLjLcN1PwMXpUxNOlTxdxfhxC6wYyJybXsIuQK/jDN7gfPvM62Xs09LudVzYj8h9AsGWFOmpyKSyPH+DT+gaffYL1DNM10VIq2hXGM0mcd1Eloe8dQ0UWcHCz+PBcEm6vZpWzKP7aot4c49hyccWrP33mqQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0462.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4b1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.14; Wed, 7 Dec 2022 19:02:54 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::da14:61e3:630a:70b5]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::da14:61e3:630a:70b5%6]) with mapi id 15.20.5880.014; Wed, 7 Dec 2022 19:02:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Dec 2022 20:02:49 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ifT2v3DjN+7Vk6qcjsD4VnVEYQsNe1sd] X-ClientProxiedBy: ZR2P278CA0043.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221207190250.1724895-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0462:EE_ X-MS-Office365-Filtering-Correlation-Id: 62e4b70c-6937-4882-57cc-08dad885a515 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKwv8c23SHrwi4NNoC0VDHb7Y7hb0E2i1yTre5hablHWHFbnFrhhd46UO08xDuDLJ8ajQYkrfxDswetBfPsP0nLHoWcxTbKczSzqpJNDelnmNIhjqVZQuBo50dJP8NVqQ8/xlHMyxMS/Bk3HbZjt30Im9gp7u2zDersVDNI3TyLZZMX50qEP1YbFFJ0gVsWn3tWu15vWds/ibnBmSCznVe8esFCSIHmLyjmMP7lcujgAhDoZreeBuAmJaedAJCx12Vd9j/HpYMlVCq81qvaaCgUCjUYixKwmUS346ZrXRLhia4kTjU6z218qblEz1NOjzwXDvHoJDGddF9K7zqztGvxkpj1N3W/CCiDB0rltTnLIgLqPShnpxycHkGu/9QZdXMfbQiFdh7wd0pQx/XTnLEeMmre6klh45xX1Dp5qXr8TsUjsqHlm4YRbq628fpvEDrVAeXXfYjd9hPg+6XutYbofwOqGdW4R8ENbhwSNVdtqWgcenTSXv3VYCYA9Klxzdy0FgqZBSj7tt5qYJGwAEpti0y7td9mhPME0vnwe8+iCdA17hCmFkK3xuvWtR46qeVM85suc2j45tqUU/r5LPeX8HLIdrK9RDChAT8byXP0dBNF1JDJi/q3OXZQAgFz8TennWIL53aQEZIIaNQssE+o6HJXEp4SRy1j/3trKHhVp0lEyF4rgGbXN9Ivce/mO2R0jtrjvh5fhMydZitCixcG/DYzokrH0UM4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R+sWKo2OGL64W2cPowx4Ufg2XwHqSL0fFp8v+0N+if+AMT3R34xpeoyPiiKuezmOkSGhy5boqnFhOqnlOReKLg7Nez+fiih9b0NrXCYDAxixblRuiYhAgZQrJi9NKw2zispL4TxH30R5lIUithF4Hs3nSwZNCn9CnsGiNW5D/4UXTiua+LHTqiLCty7rQsUVVw4cU066Qs83WVeRUbqGEKuixQxm1N2WG/LKYmbwCFTj4SQVu7kw08Im3ZayDJoBw67fERud05sZzFKvfVI0opMObc+A1LwRQnwD8i8XNwhbA2cJLIzVr4RHjitNK1QGyH26/H99jK1vIRcESB4xLeKS4a1v2VnoniieoFMTL34V3M2a1ayIx9OhvXTet7RmXc60SLU2yVMWd0sPosHxwkPQGHwcUDfbLaDcLfkmqh/xqG5p+Cx1UGB1ahVR4b/hxr8UJS48GSv8Z8dogZNJ1X+RI4SsBp+Gekhd2X8iGiaiz5zx041DLd915fR5yHmhaSUFxAMyG/3BHM+UJByMW99PVhops7duR1YP3eOKvZ6RohyEWwUG47oJ8c+76+3MQk4ggpkvSEIR3sriiD3Gh+uvx9Ge32KWau9hthtCsGfPAkQACzyvVpm6V2uH/MSk4hNa1CGnzgkMlVx+w4mG+g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PG6WE/7LkFA2igLGN1oGa2GJ8lAnIVey+y1uZy9LHGiPT3N35z1wbaN7+e5yo7TfZuoHRp3Ex8GFqmXGZ3ONaRPIpL+FoQuiXNCrZp053CSpgkYGHjl1EkOr5kSAfqiuwb+mZaZrO7DFCRxUug4FFgtEGYQX68GTOzAIPdzGcZd22xGdfy39FEnd7zm28SEG6NuG5OOH786Vu1eaBw7B485ezUpoa8CeWThdsPS+wES60E3J113v+0iocKripi4YQa4yqXf0t4BzPBVra3aGkHtKvmiU/TKlOw4rfcxztgEU6VIRHOSKaFWl5tMl4vKzFtfAFbQSMJ9j+yc8RNGF0qqMRhIZvi8rh1OTx/P5dl86QF6yAE4ywCSRkHApNMKxd9TbQZYq98zL5k1jhqMWJjBYY4CluZUMjTa0nspHevaRjboksHDiw480EJNyJckYrVROpUkqW+snK28VEVlsDL6Hm5J1IbkK5Ve3NIzxQ4/0hdKwygdsokNhNTV9zC1pmj67W6UEPvc7ybiaRjwKSynQXZPtLvA62HdUuUIEScZPuCH1SgaYxM5EIc7TYH6DxU6a4xPubmNWH4KihjBvv8CeJEMinhXYwpCx1UZZCx3J/MxdBxkgY/BeUQRtI7MIa9fuEns2HIYGzDJtqN1FLO2Pbt99EZAsqOq4Uwlc4sBPtLokKkYoz0FiNUO0MPRwiLttCfH36Djq6YBdx/nnhYy9KWfITIy8CZjHAtD5DLLKf0K4/IBceZNhpGXKcO83kCUTcdf+979p9P/URsN3yOrwagQUnsbaoMOxf752SFFsimWc0ARnLwAcXLUhpLr8H9q3sHXIDjnUN4JBV4/fa9ayVJEWZM1QkE/y1KOljB1wq0SiJX1S7Y2I6tGXi2GzuXrzb6dsjpkbY4nUd2U3zuMc0asosTbhFvjMoyoO9btSSQDsMYARMT8q+hCLkgvtE8fGCo7Dr9oFJmgqTb7eUL/QQP0F8G1UwxD44DKJI9EamWaETa9ota0Al5+4Gk/QTgIm+4RJmb7/5c0WJFzIxpHdCdshO42mhRXAtY15pVhTROgYdC1Wm6jQyBD0m7c5DjRCz4vVaijCgx947cZe4GihIoQwooGE5B4TZdv2a7cwTholCMeAbsbhi0wc4xPOZNynhXzKv3p+LrRfOVcaPzkgv/FNBaRMm/48TjCb6hJ/5lRqDux1b1KGdgIzonSW7ushMqMUpiT7+u1TBFYU0a6kTZbYQsGuOZ8n3bwXXUwbgO+iSgETTI9RQFJl8R+EJdYG8iKpOqNkW7VbS/AweVEtTT1VfppCdnewNKj93GI= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62e4b70c-6937-4882-57cc-08dad885a515 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2022 19:02:54.0579 (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: AS4P250MB0462 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/mjpegdec: Only use receive_frame for SMVJPEG 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: XtCKgvCbO7u0 Only one codec using mjpegdec.c actually creates multiple frames from a single packet, namely SMVJPEG. The other can use the ordinary decode callback just fine. This e.g. has the advantage of confining the special SP5X/AMV code to sp5xdec.c. This reverts most of commit e9a2a8777317d91af658f774c68442ac4aa726ec; of course it is not a simple revert: Way too much has changed; furthermore, outright reverting the sp5xdec.c changes would readd a stack packet to sp5x_decode_frame() which is not desired. In order to avoid this without modifying the given AVPacket, a variant of ff_mjpeg_decode_frame() with explicit buf and size parameters has been added. Signed-off-by: Andreas Rheinhardt --- Weird that these receive_frame decoders have FF_CODEC_CAP_SETS_PKT_DTS set, despite this flag only being used for decode_frame decoders. libavcodec/jpeglsdec.c | 5 ++- libavcodec/mjpegdec.c | 80 ++++++++++++++++++------------------------ libavcodec/mjpegdec.h | 11 +++--- libavcodec/sp5xdec.c | 32 ++++++++--------- 4 files changed, 59 insertions(+), 69 deletions(-) diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index 2e6d018ea6..ec163b8964 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -558,8 +558,7 @@ const FFCodec ff_jpegls_decoder = { .priv_data_size = sizeof(MJpegDecodeContext), .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, - FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), + FF_CODEC_DECODE_CB(ff_mjpeg_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | - FF_CODEC_CAP_SETS_PKT_DTS, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 2abc42a082..aa1a6b5208 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -131,8 +131,6 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) s->picture_ptr = s->picture; } - s->pkt = avctx->internal->in_pkt; - s->avctx = avctx; ff_blockdsp_init(&s->bdsp); ff_hpeldsp_init(&s->hdsp, avctx->flags); @@ -2366,31 +2364,9 @@ static void smv_process_frame(AVCodecContext *avctx, AVFrame *frame) av_frame_unref(s->smv_frame); } -static int mjpeg_get_packet(AVCodecContext *avctx) -{ - MJpegDecodeContext *s = avctx->priv_data; - int ret; - - av_packet_unref(s->pkt); - ret = ff_decode_get_packet(avctx, s->pkt); - if (ret < 0) - return ret; - -#if CONFIG_SP5X_DECODER || CONFIG_AMV_DECODER - if (avctx->codec_id == AV_CODEC_ID_SP5X || - avctx->codec_id == AV_CODEC_ID_AMV) { - ret = ff_sp5x_process_packet(avctx, s->pkt); - if (ret < 0) - return ret; - } -#endif - - s->buf_size = s->pkt->size; - - return 0; -} - -int ff_mjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame) +int ff_mjpeg_decode_frame_from_buf(AVCodecContext *avctx, AVFrame *frame, + int *got_frame, const AVPacket *avpkt, + const uint8_t *buf, const int buf_size) { MJpegDecodeContext *s = avctx->priv_data; const uint8_t *buf_end, *buf_ptr; @@ -2405,6 +2381,8 @@ int ff_mjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame) s->force_pal8 = 0; + s->buf_size = buf_size; + av_dict_free(&s->exif_metadata); av_freep(&s->stereo3d); s->adobe_transform = -1; @@ -2412,12 +2390,9 @@ int ff_mjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame) if (s->iccnum != 0) reset_icc_profile(s); - ret = mjpeg_get_packet(avctx); - if (ret < 0) - return ret; redo_for_pal8: - buf_ptr = s->pkt->data; - buf_end = s->pkt->data + s->pkt->size; + buf_ptr = buf; + buf_end = buf + buf_size; while (buf_ptr < buf_end) { /* find start next marker */ start_code = ff_mjpeg_find_marker(s, &buf_ptr, buf_end, @@ -2429,7 +2404,7 @@ redo_for_pal8: } else if (unescaped_buf_size > INT_MAX / 8) { av_log(avctx, AV_LOG_ERROR, "MJPEG packet 0x%x too big (%d/%d), corrupt data?\n", - start_code, unescaped_buf_size, s->pkt->size); + start_code, unescaped_buf_size, buf_size); return AVERROR_INVALIDDATA; } av_log(avctx, AV_LOG_DEBUG, "marker=%x avail_size_in_buf=%"PTRDIFF_SPECIFIER"\n", @@ -2568,7 +2543,6 @@ eoi_parser: } if (avctx->skip_frame == AVDISCARD_ALL) { s->got_picture = 0; - ret = AVERROR(EAGAIN); goto the_end_no_picture; } if (s->avctx->hwaccel) { @@ -2580,10 +2554,9 @@ eoi_parser: } if ((ret = av_frame_ref(frame, s->picture_ptr)) < 0) return ret; + *got_frame = 1; s->got_picture = 0; - frame->pkt_dts = s->pkt->dts; - if (!s->lossless && avctx->debug & FF_DEBUG_QP) { int qp = FFMAX3(s->qscale[0], s->qscale[1], @@ -2909,15 +2882,20 @@ the_end: frame->crop_top = frame->height - avctx->height; } - ret = 0; - the_end_no_picture: av_log(avctx, AV_LOG_DEBUG, "decode frame unused %"PTRDIFF_SPECIFIER" bytes\n", buf_end - buf_ptr); + return buf_ptr - buf; +} - return ret; +int ff_mjpeg_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame, + AVPacket *avpkt) +{ + return ff_mjpeg_decode_frame_from_buf(avctx, frame, got_frame, + avpkt, avpkt->data, avpkt->size); } + /* mxpeg may call the following function (with a blank MJpegDecodeContext) * even without having called ff_mjpeg_decode_init(). */ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx) @@ -2993,7 +2971,7 @@ const FFCodec ff_mjpeg_decoder = { .priv_data_size = sizeof(MJpegDecodeContext), .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, - FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), + FF_CODEC_DECODE_CB(ff_mjpeg_decode_frame), .flush = decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, .p.max_lowres = 3, @@ -3001,7 +2979,6 @@ const FFCodec ff_mjpeg_decoder = { .p.profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles), .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | - FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_ICC_PROFILES, .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_MJPEG_NVDEC_HWACCEL @@ -3023,12 +3000,11 @@ const FFCodec ff_thp_decoder = { .priv_data_size = sizeof(MJpegDecodeContext), .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, - FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), + FF_CODEC_DECODE_CB(ff_mjpeg_decode_frame), .flush = decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, .p.max_lowres = 3, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | - FF_CODEC_CAP_SETS_PKT_DTS, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif @@ -3036,6 +3012,9 @@ const FFCodec ff_thp_decoder = { static int smvjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame) { MJpegDecodeContext *s = avctx->priv_data; + AVPacket *const pkt = avctx->internal->in_pkt; + int64_t pkt_dts; + int got_frame = 0; int ret; if (s->smv_next_frame > 0) { @@ -3048,10 +3027,21 @@ static int smvjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame) return 0; } - ret = ff_mjpeg_receive_frame(avctx, frame); + ret = ff_decode_get_packet(avctx, pkt); + if (ret < 0) + return ret; + + ret = ff_mjpeg_decode_frame(avctx, frame, &got_frame, pkt); + pkt_dts = pkt->dts; + av_packet_unref(pkt); if (ret < 0) return ret; + if (!got_frame) + return AVERROR(EAGAIN); + + frame->pkt_dts = pkt_dts; + av_assert0(frame->buf[0]); av_frame_unref(s->smv_frame); ret = av_frame_ref(s->smv_frame, frame); diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index 2cb218902c..13c524d597 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -57,8 +57,6 @@ typedef struct MJpegDecodeContext { GetBitContext gb; int buf_size; - AVPacket *pkt; - int start_code; /* current start code */ int buffer_size; uint8_t *buffer; @@ -173,7 +171,12 @@ int ff_mjpeg_build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_table, int is_ac, void *logctx); int ff_mjpeg_decode_init(AVCodecContext *avctx); int ff_mjpeg_decode_end(AVCodecContext *avctx); -int ff_mjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame); +int ff_mjpeg_decode_frame(AVCodecContext *avctx, + AVFrame *frame, int *got_frame, + AVPacket *avpkt); +int ff_mjpeg_decode_frame_from_buf(AVCodecContext *avctx, + AVFrame *frame, int *got_frame, + const AVPacket *avpkt, const uint8_t *buf, int buf_size); int ff_mjpeg_decode_dqt(MJpegDecodeContext *s); int ff_mjpeg_decode_dht(MJpegDecodeContext *s); int ff_mjpeg_decode_sof(MJpegDecodeContext *s); @@ -184,6 +187,4 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s, const uint8_t **buf_ptr, const uint8_t *buf_end, const uint8_t **unescaped_buf_ptr, int *unescaped_buf_size); -int ff_sp5x_process_packet(AVCodecContext *avctx, AVPacket *avpkt); - #endif /* AVCODEC_MJPEGDEC_H */ diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index 394448c5a9..dfed725500 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -32,21 +32,23 @@ #include "mjpegdec.h" #include "sp5x.h" -int ff_sp5x_process_packet(AVCodecContext *avctx, AVPacket *avpkt) + +static int sp5x_decode_frame(AVCodecContext *avctx, + AVFrame *frame, int *got_frame, + AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; - AVBufferRef *buf_recoded; uint8_t *recoded; int i = 0, j = 0; + int ret; if (!avctx->width || !avctx->height) return -1; - buf_recoded = av_buffer_allocz(buf_size + 1024); - if (!buf_recoded) + recoded = av_mallocz(buf_size + 1024); + if (!recoded) return -1; - recoded = buf_recoded->data; /* SOI */ recoded[j++] = 0xFF; @@ -83,12 +85,12 @@ int ff_sp5x_process_packet(AVCodecContext *avctx, AVPacket *avpkt) recoded[j++] = 0xFF; recoded[j++] = 0xD9; - av_buffer_unref(&avpkt->buf); - avpkt->buf = buf_recoded; - avpkt->data = recoded; - avpkt->size = j; + ret = ff_mjpeg_decode_frame_from_buf(avctx, frame, got_frame, + avpkt, recoded, j); + + av_free(recoded); - return 0; + return ret < 0 ? ret : avpkt->size; } #if CONFIG_SP5X_DECODER @@ -100,11 +102,10 @@ const FFCodec ff_sp5x_decoder = { .priv_data_size = sizeof(MJpegDecodeContext), .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, - FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), + FF_CODEC_DECODE_CB(sp5x_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .p.max_lowres = 3, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | - FF_CODEC_CAP_SETS_PKT_DTS, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif #if CONFIG_AMV_DECODER @@ -116,10 +117,9 @@ const FFCodec ff_amv_decoder = { .priv_data_size = sizeof(MJpegDecodeContext), .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, - FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), + FF_CODEC_DECODE_CB(sp5x_decode_frame), .p.max_lowres = 3, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | - FF_CODEC_CAP_SETS_PKT_DTS, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif