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 B0A4B47740 for ; Wed, 20 Mar 2024 14:15:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1938B68D47F; Wed, 20 Mar 2024 16:15:00 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2101.outbound.protection.outlook.com [40.92.73.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F4FD68D19B for ; Wed, 20 Mar 2024 16:14:53 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b2mC/sVxTHD6Xctfedlf5Vi9kYE7OsCOed0+2OAP/SkRSJpQ/KOAy/j7XCX1Uh+zgv7EPduN4lYDYwbTnAVf9IzSDypyv9KEX0zSrJYVZSHA7VdpD53LomzmDS4U8a+rYR4hZBxC9mYan4irZAaI8l1uKf6W2GVsjoPP4Ekpbk7N2olwkGYT9465FPcxHtGkUdaJtuFWKzW1vumQWonBY2ObfEJ0nbE51YQfzjWIBV0nnKheAg+jqvuT8qb2M638LLDbWIlWusBTwjg38evitw8l4SBY4lpsHvuAonAgY7Tb3GRR3RhbZFw9IzdxF4Wek3ODR8Beae+M+OLAoMEhIA== 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=eyKrNKdR1WAh8qjv2tXIa7bOmzNOYO18DRyEAcy9dbo=; b=PwtfW3Ku/oorx8FZ9nXYywL8e3mg9K+lYPmbdFk639dqCLK2FQcqXOpHoxGMVuGnf5RYgtPk3+iRfU/jXH7GTYo2UGKVyRnU6+RT4UG/rSSBgQtNiewF66zCqymSjPiQFyQqdXCQ0zClOTpTtL7K4XQ4FEbkxnhwpZEaCnHe9eWlEl5zMcuEm2bkc2iveh9/pB6JmKKLqhRIW0zESMkXUPRblvzvVTu9OTUDBVMUMtyNF5FN6HPCWn4H1qMDZOCehQj8OJT/1wDFiBGUh1sh+qu1Z9eV9nt34stoXIJdBiY2RcxCH4YtAf/UgHGsodyF62ROErzDc/YqQj/Mr55TAQ== 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=eyKrNKdR1WAh8qjv2tXIa7bOmzNOYO18DRyEAcy9dbo=; b=Ijkmy24KE1yeu0ZZJu0Rn2GW7DwbB+ZGaU2HQ6GIpuAMYc89VPp2pocAaPsY92kkVzSU8Awzl5P42PMuWlfVVXYm9ZUE/O+YqsRELgXXv7NFLsakKBr7cJgYlW76cdNRW2wKqcTkN5WO4V65LHm5cTpj2Sydd6uoyhamsWU0mDzCqh4upHiu775rq90FW6wYm4XpkDYNgSRQWJHSVXoYDopoQTeeKUCS+BKg4g/k0L/cZvk/oTCzdoISqvo4HrdWtZzt2M/MrJ2zk1mfE/yitb+JHXe59rJPYTEO71URmT9s9Sf2HX1tmF3zKeN0t7G7MK5uKRdEi8nAEXbwBVPMBw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DB9P250MB0523.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:338::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.31; Wed, 20 Mar 2024 14:14:51 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Wed, 20 Mar 2024 14:14:51 +0000 Message-ID: Date: Wed, 20 Mar 2024 15:14:49 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240319224429.3133701-1-marth64@proxyid.net> <20240319224429.3133701-2-marth64@proxyid.net> From: Andreas Rheinhardt In-Reply-To: <20240319224429.3133701-2-marth64@proxyid.net> X-TMN: [jqAxDRJaUhsiFy0GV9po4bUYHuqIYn3Z1l7K0UpAZLE=] X-ClientProxiedBy: FR2P281CA0013.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a::23) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DB9P250MB0523:EE_ X-MS-Office365-Filtering-Correlation-Id: e3b8f0e7-a0f3-47e4-82aa-08dc48e81b5e X-MS-Exchange-SLBlob-MailProps: YfhX3sd/0TVoUMj8BWYCuH44a1iS9jPDmhEL5Xl+XccPVFGLQIbHSgl/pHW9au/k0sSfFHdjg7SzFMm4eMB6D+Cz5W7yn6sYi3CdGaEFxfBmw8Zb/kzUscgZsU7SpKjb+Q54dLHh6ahh37CVJ9B8aJY/7LivPATCo7jIPRU3UEjgMKHyX097VW2JbcWkIXqA7gmfuuwl3pfu1DccCs0BXy9y00ouIOX9WudOyRbF15aFoRG337AIKaZ/jI97uk3DAVHrElxVlK9J2mPsGGSggO0TMHKZniu9cv6j5fV1XSZ8CyjI+WivKAVC9ajFCfq9o2W7JssMYOYBwz57a9Cf81K0/hw155PPreBW1vO/iBVtv9+0AM4ClyP/5bYSUAIaRwXkh7VkIPvE//Zn17FWTyKd0LmLLvRYZip0/1rREYryGUoklCpAgdCW53PLhGeRVz+gc7N1+7+qjctuGQrnOEJ9sDloPg6NQur7kIVHhbs2biBMUTOjIGd+yXtK10/0lgURdMO7H0PiGFzsfFLScXL2a0wKDwyd1wqnjB7H36JyVF6nrc+0gB2S5mjOtVw8KM+KaZlGaMHKTMAU1ylrONQ4C7S/BOUrKX/a6f9QwReE+/dEt7UrJhlTfKtyGNaFiKnycNrkK8Q0SwJwU15GKJcksHtTFbo0Kme7XE5Ho8MqpkbwjorVI2Uq89O99e38jbsE8mJ0Sa1AkD3pQ9c2/oWWyqm30x6CHkwiRn9+w9EuDdE+LARIDhlLqa1ZQ4ddYw01QbT8OkStFRSsT1Su+txpiwZWS6S/Q0IsR3puy5c= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WfYNWKUq1oORGMycEeTzkplLMLz4vlyQzqcnlJ7fACPd9uVPBUg2H4y6PiK16xCBq6m9qvznen+cT7SXvA2fZvW19WAYo1cm6Osm5kGgo1C+uh0co8sLX+h7x0XI/n7TRYZIzlalNxgYumUiasgmUVPou9XwG9plW05ug7ls+9N7VGkWtjkI3j7LH7LyXBtgkC0Ou5RFF00bbzl6RewwicSAFm/M6UeHpEBLD00vO5WsvSIqZ0ZvBU6g29iN+Ze+DeTXNGwUgFTNlXhf15w0XcmUKD2Spr1zqQNPmyr2HfIrf8i5zIVnUEUYlcm0P7QvzCKSG7Oi8EIZWMNcbphV8J3AbKmqzmYMnmaMKoRy/Na59c5G+zTlWI/UpdY36u0SNOQtFKsWXO1NpkCtGL8S+n7nxPKA8mvCwmK7geCVB/EAEpbhUryQ+m5NcjzQQEUBulpiE4jDj7SUIheqH1E80R0+/COIWGQhrWVPhOOUKe/HYsV/GW08tbcGkp0vVRvXI6HbmHItznZdCBdlv0QliRX4/IGrMaE9+5QS2gfQnd0uW92vXQ2lNjP3WBH5mJvv3GeLZ13NNPeXa9XwhYHKwYILT2KtWggCgVG5+V1OrfaKOVmWGi2o83rxfnfdMd4rolckDj9t3VA+IVuT3mB6d4eEszF0AnU+G3sGeLxgI8U= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MHlrcHRLTlRIZnBLdXExcm8xQzFaZElobnhhcW1KWXhMeXMwQWdMRmd1M2dQ?= =?utf-8?B?OE5zeHlqK0M1TVZSVHZzRkh1WDRIWWpHQXpWdk9vV21ING1NaDVETm5BdUpF?= =?utf-8?B?K2srQjFtOEt1Z0J3WEtOTEhTMmVndExyVVVaY1A5N3d2N0hrZkE1NGx0SjJG?= =?utf-8?B?cUZ4aUZEQXdsQmFlZVFaTHVmVDIrVW5jYnZzQmlVWmtMMktjUHJjcUQydEZ3?= =?utf-8?B?YUlpL002ZFJVRFdnMVYzRDZSalFJSk01QWM5TElIQzFPTnJvU2FNODNxYi9p?= =?utf-8?B?TU1wRFp6NE5rTm4wYndBL1RZb3hGNzllRnA4YkZpc0pqR0NyK0VZNEJ5bG1y?= =?utf-8?B?SWJvZTRyNHlNRjZiSzBXZ3R0eDg2Q2dtekN4Uis5ZUdVQXZYckRtNzJtenJt?= =?utf-8?B?TURDbkFVa2V2THBRbUN6YlByNHJMNmUrUW1tZXRJazlRWHN1MjRPTjJMVG5t?= =?utf-8?B?VUlUMDIvOHdLUTEyRDVJYksyVkJ5QWo2YW81aHZybmsvNjFYV1EyV25pK1pM?= =?utf-8?B?blVZNXBXV0FZdzFVZU42cXF5L3ZCZEFVeE5pR2ZoeXh3QWVyOTA0VmZISVdx?= =?utf-8?B?Njk2YVNNRWlaR1EvL2JEZ0VtQS9yaFJXWXdQTk1xRW9WSmFPMGp4em5jQlE4?= =?utf-8?B?bytIcUVKRE03dk83WTQ1eVc1T2RXaGNhL0FtZTFPdFFxeTdKUDVaRGFBcG12?= =?utf-8?B?dE94T3FBSmFCaXlWR2lwT0YyK08vUnA0TGRDLzJFSUtSQUJYamc3Q3Nla3gy?= =?utf-8?B?N1lQOHlic0RLUWRRdTFmQ1pxbHpiZHVIVVFralFhSjJzckIzUDdXNUJ6eXlQ?= =?utf-8?B?MmVBVGpzNHU2NS9Hdkg5eFNwN2x2NU9id3lVZk9icDlIc1ZvS1U3VzJOaXNy?= =?utf-8?B?Y0xOV2FHQnNIVGpuQzh5NTQ2aU11TUFUSk1CWldOK1Z5TmRSREpUNHhxYUtp?= =?utf-8?B?My9FVnRYZUNadWhjY0pXVjNCV1VWQm5kZUlxVk9tZXltWmt3ODc3eU03SGZ3?= =?utf-8?B?Vm1Zb283Yjl3TjFUSEpVUWRrVmRXVGJSaGxnNjRZZ0svUTdVMkFrSzV5OTZm?= =?utf-8?B?dCtwY21INWgza2RxYVVqWmdOL2ZKUWVTbWdTMHg5NTVJR1YzZ3VucEVSbDNZ?= =?utf-8?B?R09PK2VkV1YxSkdBVUtGRC9vQUVWaFEvRTIzclEvRG16RitSUmhZaVRZQ282?= =?utf-8?B?S3pObmY2aXlObzc2Q0FyVmhLR3pnWndhR256QzFVT2hEQTFQTVlJUmxJTFAv?= =?utf-8?B?dkNPUWVtMndoaUdIbUYzdTMrcm01ejh2Z1o4dlNCRlA0UmxYRmwyMlo1UHNO?= =?utf-8?B?OWpYNXErVFhGcGpQWGJkOWRQUDRLNlNOcFJQV0VtT0crUVIzOHg0MllpVEFj?= =?utf-8?B?akhGVThENXNRdlFLWENjOTh6N09MMTY4Z2dIUGRMdzVjSnpTN3l3WjZSblY3?= =?utf-8?B?T3dHcHpYc3NyMUU4MDBxeFR0Y1lVMzV1b2t3R1lGZ3R0aHZhZGVGOU9DR2o5?= =?utf-8?B?Q3pPQmZoaERQZVFkVjBsQXlmeFlNa2lVRDREZ1pRa29CTGVRdk02Zjc4K0s5?= =?utf-8?B?MEpNYS9Qbnc4dVgvcXpKdzNGM2lEUEFmVXJYc3VzenUzUy9PeXY5dGdrbnha?= =?utf-8?B?eEpKUGJ2cXZJby8vWS8vN2RGRExaZGc3dS8weWZpaTMrYVpBMDQ3dVdxcndl?= =?utf-8?B?ZUpZaE5kMDEwdkRSbzFLMXZBbElhcm12cnd5VmRBRnhpS0w3MVlnMWJnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3b8f0e7-a0f3-47e4-82aa-08dc48e81b5e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2024 14:14:51.0251 (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: DB9P250MB0523 Subject: Re: [FFmpeg-devel] [PATCH v6 1/4] avformat/rcwtdec: add RCWT Closed Captions demuxer 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: Marth64: > Raw Captions With Time (RCWT) is a format native to ccextractor, a commonly > used open source tool for processing 608/708 Closed Captions (CC) sources. > RCWT can be used to archive the original CC bitstream. The muxer was added > in January 2024. In this commit, add the demuxer. > > One can now demux RCWT files for rendering in ccaption_dec or interoperate > with ccextractor (which produces RCWT). Using the muxer/demuxer combination, > the CC bits can be kept for further processing or rendering with either tool. > This can be an effective approach to backup original CC presentations. > > Prior to this, the next best solution was FFmpeg's SCC muxer, but SCC itself > is not compatible with ccextractor (which is a de facto OSS CC processing tool) > and it is a proprietary format. > > Tests will follow. > > Signed-off-by: Marth64 > --- > Changelog | 2 +- > libavformat/Makefile | 1 + > libavformat/allformats.c | 1 + > libavformat/rcwtdec.c | 150 +++++++++++++++++++++++++++++++++++++++ > 4 files changed, 153 insertions(+), 1 deletion(-) > create mode 100644 libavformat/rcwtdec.c > > diff --git a/Changelog b/Changelog > index e3ca52430c..abe5f79b85 100644 > --- a/Changelog > +++ b/Changelog > @@ -19,7 +19,7 @@ version : > - lavu/eval: introduce randomi() function in expressions > - VVC decoder > - fsync filter > -- Raw Captions with Time (RCWT) closed caption muxer > +- RCWT (Raw Captions with Time) Closed Captions muxer and demuxer > - ffmpeg CLI -bsf option may now be used for input as well as output > - ffmpeg CLI options may now be used as -/opt , which is equivalent > to -opt > > diff --git a/libavformat/Makefile b/libavformat/Makefile > index 94a949f555..a6de720d8c 100644 > --- a/libavformat/Makefile > +++ b/libavformat/Makefile > @@ -493,6 +493,7 @@ OBJS-$(CONFIG_QOA_DEMUXER) += qoadec.o > OBJS-$(CONFIG_R3D_DEMUXER) += r3d.o > OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += rawvideodec.o > OBJS-$(CONFIG_RAWVIDEO_MUXER) += rawenc.o > +OBJS-$(CONFIG_RCWT_DEMUXER) += rcwtdec.o subtitles.o > OBJS-$(CONFIG_RCWT_MUXER) += rcwtenc.o subtitles.o > OBJS-$(CONFIG_REALTEXT_DEMUXER) += realtextdec.o subtitles.o > OBJS-$(CONFIG_REDSPARK_DEMUXER) += redspark.o > diff --git a/libavformat/allformats.c b/libavformat/allformats.c > index e15d0fa6d7..3140018f8d 100644 > --- a/libavformat/allformats.c > +++ b/libavformat/allformats.c > @@ -391,6 +391,7 @@ extern const FFInputFormat ff_qoa_demuxer; > extern const FFInputFormat ff_r3d_demuxer; > extern const FFInputFormat ff_rawvideo_demuxer; > extern const FFOutputFormat ff_rawvideo_muxer; > +extern const FFInputFormat ff_rcwt_demuxer; > extern const FFOutputFormat ff_rcwt_muxer; > extern const FFInputFormat ff_realtext_demuxer; > extern const FFInputFormat ff_redspark_demuxer; > diff --git a/libavformat/rcwtdec.c b/libavformat/rcwtdec.c > new file mode 100644 > index 0000000000..0d9eba025a > --- /dev/null > +++ b/libavformat/rcwtdec.c > @@ -0,0 +1,150 @@ > +/* > + * RCWT (Raw Captions With Time) demuxer > + * > + * 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 > + */ > + > +/* > + * RCWT (Raw Captions With Time) is a format native to ccextractor, a commonly > + * used open source tool for processing 608/708 Closed Captions (CC) sources. > + * > + * This demuxer implements the specification as of March 2024, which has > + * been stable and unchanged since April 2014. > + * > + * A free specification of RCWT can be found here: > + * @url{https://github.com/CCExtractor/ccextractor/blob/master/docs/BINARY_FILE_FORMAT.TXT} > + */ > + > +#include "avformat.h" > +#include "demux.h" > +#include "internal.h" > +#include "subtitles.h" > +#include "libavutil/intreadwrite.h" > + > +#define RCWT_CLUSTER_MAX_BLOCKS 65535 > +#define RCWT_BLOCK_SIZE 3 > +#define RCWT_HEADER_SIZE 11 > + > +typedef struct RCWTContext { > + FFDemuxSubtitlesQueue q; > +} RCWTContext; > + > +static int rcwt_read_header(AVFormatContext *avf) > +{ > + RCWTContext *rcwt = avf->priv_data; > + > + AVPacket *sub = NULL; > + AVStream *st; > + uint8_t header[RCWT_HEADER_SIZE] = {0}; Pointless zeroing. > + int nb_bytes = 0; > + > + /* validate the header */ > + nb_bytes = avio_read(avf->pb, header, RCWT_HEADER_SIZE); Better use ffio_read_size() > + if (nb_bytes != RCWT_HEADER_SIZE) { > + av_log(avf, AV_LOG_ERROR, "Header does not have the expected size " > + "(expected=%d actual=%d)\n", > + RCWT_HEADER_SIZE, nb_bytes); Pointless logmessage > + return AVERROR_INVALIDDATA; > + } > + > + if (AV_RB16(header + 6) != 0x0001) { > + av_log(avf, AV_LOG_ERROR, "RCWT format version is not compatible " > + "(only version 0.001 is known)\n"); > + return AVERROR_INVALIDDATA; > + } > + > + av_log(avf, AV_LOG_DEBUG, "RCWT writer application: %02X version: %02x\n", > + header[3], header[5]); > + > + /* setup AVStream */ > + st = avformat_new_stream(avf, NULL); > + if (!st) > + return AVERROR(ENOMEM); > + > + st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; > + st->codecpar->codec_id = AV_CODEC_ID_EIA_608; > + > + avpriv_set_pts_info(st, 64, 1, 1000); > + > + /* demux */ > + while (!avio_feof(avf->pb)) { > + int64_t cluster_pts = AV_NOPTS_VALUE; > + int cluster_nb_blocks = 0; > + int cluster_size = 0; > + uint8_t *cluster_buf; > + > + cluster_pts = avio_rl64(avf->pb); > + cluster_nb_blocks = avio_rl16(avf->pb); Why are you initializing these variables with values that are immediately overwritten? > + if (cluster_nb_blocks == 0) > + continue; > + > + cluster_size = cluster_nb_blocks * RCWT_BLOCK_SIZE; > + cluster_buf = av_malloc(cluster_size); > + if (!cluster_buf) > + return AVERROR(ENOMEM); > + > + nb_bytes = avio_read(avf->pb, cluster_buf, cluster_size); > + if (nb_bytes < 0) > + return nb_bytes; Leak of cluster_buf > + > + if (nb_bytes != cluster_size) { > + av_freep(&cluster_buf); > + av_log(avf, AV_LOG_ERROR, "Cluster does not have the expected size " > + "(expected=%d actual=%d pos=%ld)\n", Wrong printf-specifier > + cluster_size, nb_bytes, avio_tell(avf->pb)); Also: Pointless logmessage > + return AVERROR_INVALIDDATA; > + } > + > + sub = ff_subtitles_queue_insert(&rcwt->q, cluster_buf, cluster_size, 0); > + if (!sub) { > + av_freep(&cluster_buf); > + return AVERROR(ENOMEM); > + } > + > + sub->pos = avio_tell(avf->pb); This will use the position after data, not before the data. > + sub->pts = cluster_pts; > + > + av_freep(&cluster_buf); > + cluster_buf = NULL; This is already done by av_freep; also: your whole approach has an unnecessary alloc+memcpy per packet. It would be better if you extended ff_subtitles_queue_insert() to allow inserting NULL buffers with size zero and then read the packet via av_get_packet(). This would also avoid having this cluster_buf pointer which needs to be manually freed on every error path. > + } > + > + ff_subtitles_queue_finalize(avf, &rcwt->q); > + > + return 0; > +} > + > +static int rcwt_probe(const AVProbeData *p) > +{ > + return p->buf_size > RCWT_HEADER_SIZE && > + AV_RB16(p->buf) == 0xCCCC && > + AV_RB8(p->buf + 2) == 0xED && > + AV_RB16(p->buf + 6) == 0x0001 ? 50 : 0; > +} > + > +const FFInputFormat ff_rcwt_demuxer = { > + .p.name = "rcwt", > + .p.long_name = NULL_IF_CONFIG_SMALL("RCWT (Raw Captions With Time)"), > + .p.extensions = "bin", > + .p.flags = AVFMT_TS_DISCONT, > + .priv_data_size = sizeof(RCWTContext), > + .flags_internal = FF_FMT_INIT_CLEANUP, > + .read_probe = rcwt_probe, > + .read_header = rcwt_read_header, > + .read_packet = ff_subtitles_read_packet, > + .read_seek2 = ff_subtitles_read_seek, > + .read_close = ff_subtitles_read_close > +}; _______________________________________________ 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".