From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id E9DC043BE7 for ; Thu, 22 Sep 2022 00:05:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B3CC468BB19; Thu, 22 Sep 2022 03:05:39 +0300 (EEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064095.outbound.protection.outlook.com [40.92.64.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAF0668B788 for ; Thu, 22 Sep 2022 03:05:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FUp9XifhDJP9l9IjQ3pzq0T7sL/trOlTNIKIRy+kgFoR0RfM0Eigdqby7Imtb/qf/tAcvXlSz32kHbwDaHhpqc1O8RK3bHp5RvrOjBPjdtamBHdD3kkVW82TnVG1kGZ/OM/7jrFb3a6D8z6bJVv0JemkUPjJA8+AT01rY3VRJFlibywAsU8jxu2ReFZ/3OKjVDK1R2pfZlTZ4B5t67qLcjT8rMw7f9NJgWTu+xFmjAi7K/zD31ozkZfLPyIlrsNpNFcAZJjfMgkN1+1y3Jhc5SMIZg7P+tbgLiPZgX9dT+jxY5joGLPAZqYG/fz4vabLACNPinbguR+Rcmr3hSFd3g== 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=p7Xe7S03ueN5RsN4AhwkMouOaslWRxs4WzmEKO6RhUA=; b=nypuGOgzlHsoE7vlV3z54JyJ7GvHJXpMZ5ofLV2j7OlR0D8bp+PLICyQQbfyul+WueXSrwmfvuyE+L5PgdaK6C4lAsa3XN1wgGjl3Lci0dkl4BR1c6szrjYWyXFKrwaX0xH0h9jI2N/7gX+Y1YvmAggGtCJFkIFYW5yHLNoTJn/ndLD24XTNsvvTXVdFjbgD+yG18GychN471cFSBBQZlgU4t9psTIycirD726VGDUcyMXEqybjEwqPDipCtJZxkdcfUMO4KcSXAdbHo0Zyh6fVggYth+TuQib9+rXtasFJvNsaGknkTAwKFcjSL7IwXAmB+qfah4Py6cJScXLztPg== 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=p7Xe7S03ueN5RsN4AhwkMouOaslWRxs4WzmEKO6RhUA=; b=AiQuXtFAkAyCm0+quUUWvFG2mu454QlDueqQZsCYUEQCAf8flvY1kpGo6/pFLmxv7KFO9wgizLHQatATuE5+NDq5Xw+KHLU2pZ6DWvqEUd2H4x8VjUd/RgtPH4g4U8qS09ott6jnuFAOPN40v0d1yKl+qCtUQbzVGvYy77xlSsGmGhKbNj9skR95VnDz8zLE+WcWLN0RoXR+U7ngW2JissvgwbgqBq+0pqviljdBqcoziUWafLCtWDQF+JEvgiOdSWWCqbqNE+MyzDKRQey6/pcezGUoNzD/T4z+lPsN9cZAZ/9KrZSwEwUrENItmJsuiJsKoVbR+lrnvWcDdnR9nw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0379.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Thu, 22 Sep 2022 00:05:32 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Thu, 22 Sep 2022 00:05:32 +0000 Message-ID: Date: Thu, 22 Sep 2022 02:05:35 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [d2XQZQutQkVBF0lPnj14ng5SE0Gb+xBYrsrbI/N69i4=] X-ClientProxiedBy: ZR2P278CA0019.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <974bb9b6-bcff-99ec-6aa1-34b583585962@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0379:EE_ X-MS-Office365-Filtering-Correlation-Id: 5de9db64-9f77-4d65-7121-08da9c2e2a45 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y/GcTH2msd8+FKkF3LpHV1hmOwljKlij33GXEe0k7enJ5staS2P8lVaePxVAPJ2+a/cVgfsigGmVYEmz8H9RWbMwXHrkh+9lVkyAVmHVPLLGNL5mdhj0ZHYrz8ItCLULLEryhe5Zqq3sIhgEdI4z1iBz3s8Lzz7iBT0ZhsTD1pCTA3JOoFSHyqKCe+JH7VDt4qy9GqJC6BBtr9KhO/lykokwNsJNV5vJbOFq2feTdvZKO/MR2UodBXpVSrpnFj5+8+FwynemwGXgn2CqHt42Y6dYel1qZnAXxLKpAQXLLmpzYFkewvaPsLvuP3lOIDEVCjfeeK+GPwIpk4T9os4Imlr6Aen4+YcNpoIniiW4SeFLZl5ZZ9GAF6ePRwo/H9AyUIGa4oPKVH58gZ7cik2bapjbJBHVgKOf3gkJWgx7llcwnMsgRQxa2FoQ4muy2EEhp79LcrmGYRJV2NzDqe3rD0GzGoG9vWyFEpQdj6r+QEVj5/U6rJWh+NYWa4KkCkI+5/xqoIu8JKlF7gHjcXvhFM0m8avASacG39JOVuhtHfDr5mMAHGHSv560OIGD4udrOOCWMvB4DIrkrIk0hzxvp4w5s6jLe9VUx1fPe18ZXxF1CFSo4BEFEdQUTVqCKk2Ga/RSUAxy5ZC/3TB8MihswS6Cwrw+5VHtce6yuBg5msswsRZHbbeZ28OJDTkTtJ1r X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MFllN3QzcFI0eml6VXRkaEk2NVRvSEkzZnFzWG4rck5RSGlualJwdm1pcHlY?= =?utf-8?B?alFtVTNndHpsR3VDTGdhUHVtbmRVeWdyZ3dJN0pwVXd6eERiQXVySTlFKy9C?= =?utf-8?B?NUlaRFdUb2FCTmlOSDNZTG05eThDWFdhcldnMjN3WXgydVdnekZxclZRQmpK?= =?utf-8?B?dExtY0tva0hOR1lzblhMRG1ZeVRZZlk1QmxoQ2NRRWJMeFBDSmZVNFgrV1dE?= =?utf-8?B?VUczbFZ6MVphRS9qK2t5N3BEalBRTDAzNzdwNEhRNGZSeVc4bUxWYzhwOU5p?= =?utf-8?B?TlBrSWNxbUhrVnAweTMzbmN4QkIrb3F4aXBuNUQ5Q09YUDd4M2pEM2JTMmRa?= =?utf-8?B?MC9MVVJrNklZbFdxU2ZqWDR4VnRucVFkdUZ1cmNpRFhMOFYxbUFFOEFiWE9B?= =?utf-8?B?YWZyUVFjcStPaGlmZjd0T1hmR2dDMnRtSTVtMnNpTk9Xb2Mzekt1Tk4xanQ1?= =?utf-8?B?YVg1VnNkRTdad1M3Vm9jekkvUUcwdnB3TUkra3lnTndYSURGVm5OZ0pKVkxF?= =?utf-8?B?UDhpUEpRUS9mWTZmWnBsZWdFcDJNZjN1NXlqYkt1UEtWM2tWY1pHMGVjQ1l1?= =?utf-8?B?S3owcGl5UXdhcDFrNi9UYkxJYWJIaFpGR1RXS0VKM2FyVVBYbjB1VytFQ0NH?= =?utf-8?B?YitCb1lHa1lidGhBZXJEOTh3bXlXeWhNZmNnZUFRenI5NXRxWmJzRGtvSk5Y?= =?utf-8?B?cVRoYVpMRXNYZFJIUWRWUjN6WWxrQmdPNHBXbmJXYVRzUml6eUNObC9FRmtY?= =?utf-8?B?K1IrTXJOd2RSbWFvR2RzQWtpNGxiWG13RmpDdVU2Y3lKc3VpU1JVRGhTTEFP?= =?utf-8?B?KzcrdFpsRUtlNnFnUDZLdnhBZDhtWXFFeGJrR3o2UHRVWlF5NHNkbzM0MzBS?= =?utf-8?B?S2c4R1ZxUno3cDk0dkpOY2VkSVVndks5cjFxWFdGRStZZ25ZMDV1Q21JQWdn?= =?utf-8?B?a2NWYVozZkVpUk12YzNsYWsyRnorMDJCeEtzcUd1V0Rzc1pLWlY5bTcvOC95?= =?utf-8?B?Y0N3M0NzbnhjWlpWcVZMR2ZKUm5LeEd4bWVCSjE2QzdGV1BpT1JvMGUzNEg1?= =?utf-8?B?djVEKzZ6Y1BEK0JzeHZOZWRDRlhUOXhKNlFld254SmJkbXBSaVNkWWtsZEhs?= =?utf-8?B?cmJuYkowdkZoU2gvY09DcHptanQrcjB3TlloRmQ5aXhoejVqRjV3VFhockhr?= =?utf-8?B?MFBqRnVhdXhnaDdYaUNSazZBRUFlSUdwVjVXYUZlMnRDME5vaUZwK041NElG?= =?utf-8?B?aWtVWHhzb015b2hrM0pEMHAzM0Zxdy9zb0JVREUxbVR4V2pWdGJuZWdnT0pW?= =?utf-8?B?RGVJUmNHazB5QzJHc1FSRTlCeGlmRkRWRmpKdTkvSUVEMEw1K3BSODZoYkts?= =?utf-8?B?K0lBNWlrNk10aWRjZmhQeUZwVU8rOFBmc203eldIOW5vT29wSkpBUnRLT0py?= =?utf-8?B?cHRVekZlL2Z6b1JaU0l3L011OWp3Q3Q2MFlBS0l1U2pnSTJ4cm1xQjdLRys3?= =?utf-8?B?QnFQQWN1cUJ3YzUwN2xCaENIZkhGeVlmU0Y1TUNXdnp4VjhvVVQ2ZUFsV3pZ?= =?utf-8?B?MTdRRy9jSlZNblNlRllyaUs3OG0rT1B0eGVKd05hYXhxUndpLzhtRjJjUUtB?= =?utf-8?B?M1ZwQUI4N1BoMTNZZ0xJaXdtQjU5U2hsdjR2NWM3ZmNaeHlJMHgrYkZYSDNC?= =?utf-8?B?K3lSamlFUWZCWEZ0czJkSC9LQWpORWNSOHRUVU11cHR5SnNDSWQ0ZDFXbnN1?= =?utf-8?Q?exS6PTCjJSwsfgYG6pbq9/tcFUwAmBjVJufoEK3?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5de9db64-9f77-4d65-7121-08da9c2e2a45 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2022 00:05:32.0000 (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: AS8P250MB0379 Subject: Re: [FFmpeg-devel] [PATCH] Media 100i decoder 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Paul B Mahol: > Subject: [PATCH] avcodec: add Media 100i decoder > > Signed-off-by: Paul B Mahol > --- > libavcodec/Makefile | 1 + > libavcodec/allcodecs.c | 1 + > libavcodec/codec_desc.c | 7 ++ > libavcodec/codec_id.h | 1 + > libavcodec/media100.c | 216 ++++++++++++++++++++++++++++++++++++++++ > libavformat/isom_tags.c | 4 + > 6 files changed, 230 insertions(+) > create mode 100644 libavcodec/media100.c > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index b9aa6efaac..45702551b3 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -468,6 +468,7 @@ OBJS-$(CONFIG_MACE6_DECODER) += mace.o > OBJS-$(CONFIG_MAGICYUV_DECODER) += magicyuv.o > OBJS-$(CONFIG_MAGICYUV_ENCODER) += magicyuvenc.o > OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o > +OBJS-$(CONFIG_MEDIA100_DECODER) += media100.o > OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \ > twinvq.o > OBJS-$(CONFIG_MICRODVD_DECODER) += microdvddec.o ass.o > diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c > index fc88e25fda..1966f61770 100644 > --- a/libavcodec/allcodecs.c > +++ b/libavcodec/allcodecs.c > @@ -194,6 +194,7 @@ extern const FFCodec ff_m101_decoder; > extern const FFCodec ff_magicyuv_encoder; > extern const FFCodec ff_magicyuv_decoder; > extern const FFCodec ff_mdec_decoder; > +extern const FFCodec ff_media100_decoder; > extern const FFCodec ff_mimic_decoder; > extern const FFCodec ff_mjpeg_encoder; > extern const FFCodec ff_mjpeg_decoder; > diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c > index e8e1529401..a58b3f9780 100644 > --- a/libavcodec/codec_desc.c > +++ b/libavcodec/codec_desc.c > @@ -1909,6 +1909,13 @@ static const AVCodecDescriptor codec_descriptors[] = { > .long_name = NULL_IF_CONFIG_SMALL("WBMP (Wireless Application Protocol Bitmap) image"), > .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, > }, > + { > + .id = AV_CODEC_ID_MEDIA100, > + .type = AVMEDIA_TYPE_VIDEO, > + .name = "media100", > + .long_name = NULL_IF_CONFIG_SMALL("Media 100i"), > + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, > + }, > > /* various PCM "codecs" */ > { > diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h > index 9c01ea9750..dc79c95b46 100644 > --- a/libavcodec/codec_id.h > +++ b/libavcodec/codec_id.h > @@ -318,6 +318,7 @@ enum AVCodecID { > AV_CODEC_ID_PHM, > AV_CODEC_ID_RADIANCE_HDR, > AV_CODEC_ID_WBMP, > + AV_CODEC_ID_MEDIA100, > > /* various PCM "codecs" */ > AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs > diff --git a/libavcodec/media100.c b/libavcodec/media100.c > new file mode 100644 > index 0000000000..2c7bb3cf93 > --- /dev/null > +++ b/libavcodec/media100.c > @@ -0,0 +1,216 @@ > +/* > + * Media 100 decoder > + * Copyright (c) 2022 Paul B Mahol > + * > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with FFmpeg; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +/** > + * @file > + * Media 100 decoder. > + */ > + > +#include I think you don't even need stdint.h, let alone inttypes.h. > + > +#include "libavutil/intreadwrite.h" > +#include "avcodec.h" > +#include "bytestream.h" > +#include "codec_internal.h" > + > +typedef struct Media100Context { > + AVCodecContext *avctx; // wrapper context for mjpegb > +} Media100Context; > + > +static av_cold int media100_decode_init(AVCodecContext *avctx) > +{ > + Media100Context *ctx = avctx->priv_data; > + const AVCodec *codec; > + int ret; > + > + codec = avcodec_find_decoder(AV_CODEC_ID_MJPEGB); > + if (!codec) > + return AVERROR_BUG; This bug can be triggered, because you did not add a configure dependency on the mjpegb decoder. Btw: If you used ff_mjpegb_decoder directly, the linker would now about this dependency and so this decoder could be fuzzed. (Right now we magically add these dependencies for the fuzzer; see lines 188-191 in target_dec_fuzzer.c.) > + ctx->avctx = avcodec_alloc_context3(codec); > + if (!ctx->avctx) > + return AVERROR(ENOMEM); > + ctx->avctx->thread_count = 1; > + ctx->avctx->flags = avctx->flags; > + ctx->avctx->flags2 = avctx->flags2; > + ctx->avctx->width = ctx->avctx->coded_width = avctx->width; > + ctx->avctx->height = ctx->avctx->coded_height = avctx->height; > + > + ret = avcodec_open2(ctx->avctx, codec, NULL); > + if (ret < 0) > + return ret; > + > + return 0; > +} > + > +static int media100_decode_frame(AVCodecContext *avctx, > + AVFrame *frame, int *got_frame, > + AVPacket *avpkt) > +{ > + Media100Context *ctx = avctx->priv_data; > + unsigned second_field_offset = 0; > + unsigned next_field = 0; > + unsigned dht_offset[2]; > + unsigned dqt_offset[2]; > + unsigned sod_offset[2]; > + unsigned sof_offset[2]; > + unsigned sos_offset[2]; > + unsigned field = 0; > + GetByteContext gb; > + PutByteContext pb; > + AVPacket *pkt; > + int ret; > + > + pkt = av_packet_alloc(); > + if (!pkt) > + return AVERROR(ENOMEM); This packet and all its content leak. > + > + ret = av_new_packet(pkt, avpkt->size + 1024); > + if (ret < 0) { > + av_log(avctx, AV_LOG_ERROR, "Error allocating the output packet\n"); > + return ret; > + } > + > + bytestream2_init(&gb, avpkt->data, avpkt->size); > + bytestream2_init_writer(&pb, pkt->data, pkt->size); > + > +second_field: > + bytestream2_put_be32(&pb, 0); > + bytestream2_put_be32(&pb, AV_RB32("mjpg")); > + bytestream2_put_be32(&pb, 0); > + bytestream2_put_be32(&pb, 0); > + for (int i = 0; i < 6; i++) > + bytestream2_put_be32(&pb, 0); > + > + sof_offset[field] = bytestream2_tell_p(&pb); > + bytestream2_put_be16(&pb, 17); > + bytestream2_put_byte(&pb, 8); > + bytestream2_put_be16(&pb, avctx->height / 2); > + bytestream2_put_be16(&pb, avctx->width); > + bytestream2_put_byte(&pb, 3); > + bytestream2_put_byte(&pb, 1); > + bytestream2_put_byte(&pb, 0x21); > + bytestream2_put_byte(&pb, 0); > + bytestream2_put_byte(&pb, 2); > + bytestream2_put_byte(&pb, 0x11); > + bytestream2_put_byte(&pb, 1); > + bytestream2_put_byte(&pb, 3); > + bytestream2_put_byte(&pb, 0x11); > + bytestream2_put_byte(&pb, 1); > + > + sos_offset[field] = bytestream2_tell_p(&pb); > + bytestream2_put_be16(&pb, 12); > + bytestream2_put_byte(&pb, 3); > + bytestream2_put_byte(&pb, 1); > + bytestream2_put_byte(&pb, 0); > + bytestream2_put_byte(&pb, 2); > + bytestream2_put_byte(&pb, 0x11); > + bytestream2_put_byte(&pb, 3); > + bytestream2_put_byte(&pb, 0x11); > + bytestream2_put_byte(&pb, 0); > + bytestream2_put_byte(&pb, 0); > + bytestream2_put_byte(&pb, 0); > + > + dqt_offset[field] = bytestream2_tell_p(&pb); > + bytestream2_put_be16(&pb, 132); > + bytestream2_put_byte(&pb, 0); > + bytestream2_skip(&gb, 4); > + for (int i = 0; i < 64; i++) > + bytestream2_put_byte(&pb, bytestream2_get_be32(&gb)); > + bytestream2_put_byte(&pb, 1); > + for (int i = 0; i < 64; i++) > + bytestream2_put_byte(&pb, bytestream2_get_be32(&gb)); > + > + dht_offset[field] = 0; > + sod_offset[field] = bytestream2_tell_p(&pb); > + > + for (int i = bytestream2_tell(&gb) + 8; next_field == 0 && i < avpkt->size - 4; i++) { > + if (AV_RB32(avpkt->data + i) == 0x00000001) { > + next_field = i; > + break; > + } > + } > + > + bytestream2_skip(&gb, 8); > + bytestream2_copy_buffer(&pb, &gb, next_field - bytestream2_tell(&gb)); > + bytestream2_put_be64(&pb, 0); > + > + if (field == 0) { > + field = 1; > + second_field_offset = bytestream2_tell_p(&pb); > + next_field = avpkt->size; > + goto second_field; > + } > + > + AV_WB32(pkt->data + 8, second_field_offset); > + AV_WB32(pkt->data + 12, second_field_offset); > + AV_WB32(pkt->data + 16, second_field_offset); > + AV_WB32(pkt->data + 20, dqt_offset[0]); > + AV_WB32(pkt->data + 24, dht_offset[0]); > + AV_WB32(pkt->data + 28, sof_offset[0]); > + AV_WB32(pkt->data + 32, sos_offset[0]); > + AV_WB32(pkt->data + 36, sod_offset[0]); > + > + AV_WB32(pkt->data + second_field_offset + 8, bytestream2_tell_p(&pb) - second_field_offset); > + AV_WB32(pkt->data + second_field_offset + 12, bytestream2_tell_p(&pb) - second_field_offset); > + AV_WB32(pkt->data + second_field_offset + 16, 0); > + AV_WB32(pkt->data + second_field_offset + 20, dqt_offset[1] - second_field_offset); > + AV_WB32(pkt->data + second_field_offset + 24, dht_offset[1]); > + AV_WB32(pkt->data + second_field_offset + 28, sof_offset[1] - second_field_offset); > + AV_WB32(pkt->data + second_field_offset + 32, sos_offset[1] - second_field_offset); > + AV_WB32(pkt->data + second_field_offset + 36, sod_offset[1] - second_field_offset); > + > + pkt->size = bytestream2_tell_p(&pb); > + > + ret = avcodec_send_packet(ctx->avctx, pkt); > + if (ret < 0) { > + av_log(avctx, AV_LOG_ERROR, "Error submitting a packet for decoding\n"); > + return ret; > + } > + > + ret = avcodec_receive_frame(ctx->avctx, frame); > + if (ret < 0) > + return ret; > + > + *got_frame = 1; > + > + return avpkt->size; > +} > + > +static av_cold int media100_decode_end(AVCodecContext *avctx) > +{ > + Media100Context *ctx = avctx->priv_data; > + > + avcodec_free_context(&ctx->avctx); > + > + return 0; > +} > + > +const FFCodec ff_media100_decoder = { > + .p.name = "media100", > + CODEC_LONG_NAME("Media 100"), > + .p.type = AVMEDIA_TYPE_VIDEO, > + .p.id = AV_CODEC_ID_MEDIA100, > + .priv_data_size = sizeof(Media100Context), > + .init = media100_decode_init, > + .close = media100_decode_end, > + FF_CODEC_DECODE_CB(media100_decode_frame), > + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, > +}; > diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c > index 362cb77e8f..b1f1193234 100644 > --- a/libavformat/isom_tags.c > +++ b/libavformat/isom_tags.c > @@ -274,6 +274,10 @@ const AVCodecTag ff_codec_movvideo_tags[] = { > > { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'G', 'R') }, /* ASC Bayer BGGR */ > > + { AV_CODEC_ID_MEDIA100, MKTAG('d', 't', 'P', 'A') }, > + { AV_CODEC_ID_MEDIA100, MKTAG('d', 't', 'n', 't') }, > + { AV_CODEC_ID_MEDIA100, MKTAG('6', '0', '1', 'P') }, > + > { AV_CODEC_ID_NONE, 0 }, > }; > > -- 2.37.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".