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 0C467409CF for ; Fri, 4 Mar 2022 13:45:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B96C68AED0; Fri, 4 Mar 2022 15:45:49 +0200 (EET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069049.outbound.protection.outlook.com [40.92.69.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B14468AED0 for ; Fri, 4 Mar 2022 15:45:43 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U5TTVdNB1qWpmzmNjHi9/xM/baBWKizJN/av+Uq0geD6oN4FpXqgzzsdzfIZzpl221cyJA2GeEIRPCOr43N1DuxqlsKGGJfqNmsYe1zmbZWKOJ7L5D05rANBBPxsNomsA66jOJG9h3zhjXbd7K5r2mYAdoOqm2XBNZ0y0a/XAWWc85DQx9pCWOlPcC2pVjVpgDmVSF6gAI4MOc1qBL4nhhhHH4MZIdTKx53cRJVB75Q5GChYgY8EhSFY+H53gbZ2znex4dOD8s5GPLIuuhPQPtA8NxJCQO4Ex163YNNywduYbrlobNnuxiroRWHgp4CifLTNu8Bbxa309Z9TSZ6PmQ== 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=Pt4Af5JWh9JcyGT+GmESmnsToK8D8UnkwtCLAWcoKok=; b=RIgfTlFt9sospPw4C6R5uhNSQFxQh1pW0I6PI2TQc8KmomMZJoA0Z/3XIOFliQWTbCNcqRlBTJO70GYO2CvGtFvpUwvDiIdIrF19IUKsaUD+tpO7UAIlTi5vFpvF4RJeucxI2FhS6OXMg+z8flbS+Hd9bVGvya80b/dpdq+IBtBtx1rNCZFMCXbxODlU0DM5MW3h5RLZnnVUTcerWpQhFlirZiDXnDogavkddVhl3pdSEbdzIRNSyzryhERB42vkGkJuMhnoSIZ4bMia5hQme6iArFI/NxrUhdVWjO08WVhxJA9OXRtUg19XnAtxb1C5QVSOOGSCqISOmJXBmHukQw== 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=Pt4Af5JWh9JcyGT+GmESmnsToK8D8UnkwtCLAWcoKok=; b=ZduMl6C9gT5De+0ceT64P7HlPXRLGV2FCEmr+ZjCzccFOAapGHqdXfdpM4J4bkkrS5SaQJi++xvamXT4QhLSkTEUentWo080r0l4ifWbhyPo4ObMfNlGiADyNsNMiva/NFjEXcQtLm9ljvvfsrIVBdtG6ZxG5SaIQt6BNvn8/aV1wv+c7xt7HuZkBtcYE8OsdrDBGQDFnQLiPKu9nvi7f19AU87VNWkpiHVYDg6d3mS4wW9Dfl8YZ2Mtn4g3cKjbTdMOfeSxkNtAAQnpeMYq9NctfWaizFKpZOC8cBieR28pRPro19zYtJGiHCdP3pgyRSEW2Rs8iQAPl/53AKT3HA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VE1PR03MB5966.eurprd03.prod.outlook.com (2603:10a6:803:10c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.16; Fri, 4 Mar 2022 13:45:41 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090%5]) with mapi id 15.20.5038.017; Fri, 4 Mar 2022 13:45:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Mar 2022 14:45:29 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [LUCOoiqobLnulq3rVkWY2ySppQNa49Lo] X-ClientProxiedBy: AM5PR0101CA0008.eurprd01.prod.exchangelabs.com (2603:10a6:206:16::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220304134529.125077-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ba82dcc2-d418-477b-a02f-08d9fde545d6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSTpLjdQlh7tBxvgJwal5XclhbsV3rdSHN9D2Pa1Q4vqhbvQMk0v/mNXYTlBUP3UjGpFRqhHbc0TVnxLHgKpwMQ+gBw52/dab0ER7LvEY6PkhbQ2+ND7LJ7idbpKHnOYRq83TySafTRoXOJruiHy1BTsSdxxXq4W3SU9728lDz/RG+mR03wIp5ghfdaA0Lf9z/HrFFuDnNXgLNzyznRPt4VdWacBTUOZvauc19Vg2U09kWPWBIwK3sF2jyChV5V9G4HDTuwJAI/t3jttrmX2OBK0Mbgwt0CYygwlpe7Mb+WhDdc+JeQ9KqO8KO4Tlv7sTirCPfUKY9bFeApAMBENjqqFj1fI0N/QAd0YzxqmTCmQhYwy3NLVDUKgFlqhVecLhmi2ypqoGcWZzvGmsanyUUWIGnpAGvjg9TERlf72Sqd+KtDCoNM37dljCh7lOl1P3LF/ZySpGZfS3unDPBmMnZeHXaA50dk4TV86aWSqRPKuQYZ+Llb0zIMnGZgkBo5uxK/MsUcfq7lg/9JLD0dZq3SBniFndepDf3PK6AQuaiAog6ynubvcKsCgdFsd2GxQObaWTY1SBufaXxAU3ub6G7yAcfNrgx7P9O+p9I7WUCoG2iSr3aY0cR5FKFaP1c2kIYgMBe8hnTty1RriqKk6gExcglw4+Pc9b0GcPTcuui8gBu7R7rexySpDLLx4qby22WyHwTKU88gGtA0OOo46wbSD2nnIVweN0uVM+Z3K2P66ZHWM1pcuC8554Q8bBumilg= X-MS-TrafficTypeDiagnostic: VE1PR03MB5966:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: burZho2IQVw+v6ALujm/7eF+0cd+g7/Xtcx7IW0e569qfGNNnz1dCP8MoS3qSmddCwVThQs6h1ZrxfWw6imbf/xm5eFnYMMLVJBumqmM/V33g8tDnk8jUrMjB17wgc3+9x7BMnjqh5/LJ/5NQRJS1HpJ1lkFLOesQsylJILV9eQUybNQjhk39Afkzd726b3mNeLdVURUSHA0sX97rv0du9zdgcFfQoqFbwN6a5c5mjLxxMeDIC4pEkOMiNhI0NW4CvYKl088Wfgq1+TrVx67filzSQp6zrkgftTWrS9jHg7mBeqOQXUQMZNVjlKkjkWYpxBpu6WYeuWtHr6Ye1w791M5XIkppLWSnFkKYY/yuvYnX7kZFoJqyJE+sf1M5z84JEtX7Kgx+fiWHj3gCABr1OFU2wZTGfSFDrBQPgwAd3hb0ZCC3vy8Kl1eumCeknlCfUg2WFAsVjHx6FuPEYzNrXNhLoHiOUEjAKqWEBoH4KwqkZ17cNmKyJr+MTwzhHxjeR13QS+cNTWZvIfoOZCHx8CCsIUilnxhuMuNC2j230BcTFdvzh0Pe8L9WMBEPJD78FS9REzujGnxLFCJP++OBQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5PZdhpmlUn4iQUok2J4EEsGSO4L1xkt/E6IKNAfrC9VWEc8p30L0e41yFpKR?= =?us-ascii?Q?yG0J/0jqoSROoGx2+Klid3qV+bY4Tfbez+cTVB4P1TauuBKcVsjWEd/i0dk3?= =?us-ascii?Q?e7YdCNSrFiAp9H++d/FJ1+PcKC3nvg9pEW0w/fI9eVZrRsO+Ub7UdTQz6hNA?= =?us-ascii?Q?FR9JoLI/wA+iD9nMP1Y60pG+nR4sBagDn96NnQ/zaXhIZiD6g0fwoAaKNdCe?= =?us-ascii?Q?B1ifBESa/X+g8kStzWtkEUh1DZLhLvqM49EkqWY7Fg2qNDoH5JV24pw7DndX?= =?us-ascii?Q?9EFB7Dk/7lKdTjLTgZAWyWTqRgkKk/GFefQAZCHppT8B4OgA9iwFywu/RE2m?= =?us-ascii?Q?qgNyOfwAhVtP/MAX59fFyh331jBfJajKQm7N9P3ZlUg0hAQdSzwf+pedTw99?= =?us-ascii?Q?dW2PAzv7sv2DPSPgMYIEeKCnLnPtCvaIG3YbGKy3Ycj7XNsVHGRQLS8RK2W2?= =?us-ascii?Q?VIgnSI4v+Rhc9ia6oqrACqoIFvE1Y/wlpDJitrEQRjKGuoyZEIpBkL4A5p4R?= =?us-ascii?Q?cI/OZmRrIYLgD8cS3iirQZzklRQFik+FjnZawrAZsgvTIfHyUR6oOyeXTfmL?= =?us-ascii?Q?gKD2i6r5Sj5tn5fSi8STLaj/c281EwgRmLh56cDcEpy/Vln8ZR+d4okHrVVy?= =?us-ascii?Q?F+CKE8g22ZlZjA0Q1LrIEzS+CT3TIz1jbMTa8OEpSNzZcqY0OBF2tdDjkIWG?= =?us-ascii?Q?jp0IFfbyjRX+VT05g9mQKPt4j/gg4twjIVo9zwXuDXtnKPog+o7WV+YJsgx/?= =?us-ascii?Q?3VGr/E7z521xF8VzHy9WB3SMZ+F1COVQIdHCveRcw61Qx4C4iAnkiAHYpBdI?= =?us-ascii?Q?xsKjEXwmswujIRQQR4k7IIxmWAOXABBKy61RDpmW7dv/b+NIh2r+gSBeUzel?= =?us-ascii?Q?ra4LPeUbGXGtbdXT4G6pFhmB6cw8Lxax+6f396gwspfWGUDEOrFJnSIzFMJs?= =?us-ascii?Q?qUsPFOlXTzsHGIt+CI28dw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba82dcc2-d418-477b-a02f-08d9fde545d6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2022 13:45:41.6616 (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: VE1PR03MB5966 Subject: [FFmpeg-devel] [PATCH v2 2/2] avformat/movenc: Simplify creating chapter track extradata 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 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: Signed-off-by: Andreas Rheinhardt --- libavformat/movenc.c | 79 +++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 53 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 4c868919ae..2a6cc1bc6a 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6238,12 +6238,32 @@ fail: // as samples, and a tref pointing from the other tracks to the chapter one. static int mov_create_chapter_track(AVFormatContext *s, int tracknum) { - AVIOContext *pb; - + static const uint8_t stub_header[] = { + // TextSampleEntry + 0x00, 0x00, 0x00, 0x01, // displayFlags + 0x00, 0x00, // horizontal + vertical justification + 0x00, 0x00, 0x00, 0x00, // bgColourRed/Green/Blue/Alpha + // BoxRecord + 0x00, 0x00, 0x00, 0x00, // defTextBoxTop/Left + 0x00, 0x00, 0x00, 0x00, // defTextBoxBottom/Right + // StyleRecord + 0x00, 0x00, 0x00, 0x00, // startChar + endChar + 0x00, 0x01, // fontID + 0x00, 0x00, // fontStyleFlags + fontSize + 0x00, 0x00, 0x00, 0x00, // fgColourRed/Green/Blue/Alpha + // FontTableBox + 0x00, 0x00, 0x00, 0x0D, // box size + 'f', 't', 'a', 'b', // box atom name + 0x00, 0x01, // entry count + // FontRecord + 0x00, 0x01, // font ID + 0x00, // font name length + }; MOVMuxContext *mov = s->priv_data; MOVTrack *track = &mov->tracks[tracknum]; AVPacket *pkt = mov->pkt; int i, len; + int ret; track->mode = mov->mode; track->tag = MKTAG('t','e','x','t'); @@ -6252,57 +6272,10 @@ static int mov_create_chapter_track(AVFormatContext *s, int tracknum) if (!track->par) return AVERROR(ENOMEM); track->par->codec_type = AVMEDIA_TYPE_SUBTITLE; -#if 0 - // These properties are required to make QT recognize the chapter track - uint8_t chapter_properties[43] = { 0, 0, 0, 0, 0, 0, 0, 1, }; - if (ff_alloc_extradata(track->par, sizeof(chapter_properties))) - return AVERROR(ENOMEM); - memcpy(track->par->extradata, chapter_properties, sizeof(chapter_properties)); -#else - if (avio_open_dyn_buf(&pb) >= 0) { - int size; - uint8_t *buf; - - /* Stub header (usually for Quicktime chapter track) */ - // TextSampleEntry - avio_wb32(pb, 0x01); // displayFlags - avio_w8(pb, 0x00); // horizontal justification - avio_w8(pb, 0x00); // vertical justification - avio_w8(pb, 0x00); // bgColourRed - avio_w8(pb, 0x00); // bgColourGreen - avio_w8(pb, 0x00); // bgColourBlue - avio_w8(pb, 0x00); // bgColourAlpha - // BoxRecord - avio_wb16(pb, 0x00); // defTextBoxTop - avio_wb16(pb, 0x00); // defTextBoxLeft - avio_wb16(pb, 0x00); // defTextBoxBottom - avio_wb16(pb, 0x00); // defTextBoxRight - // StyleRecord - avio_wb16(pb, 0x00); // startChar - avio_wb16(pb, 0x00); // endChar - avio_wb16(pb, 0x01); // fontID - avio_w8(pb, 0x00); // fontStyleFlags - avio_w8(pb, 0x00); // fontSize - avio_w8(pb, 0x00); // fgColourRed - avio_w8(pb, 0x00); // fgColourGreen - avio_w8(pb, 0x00); // fgColourBlue - avio_w8(pb, 0x00); // fgColourAlpha - // FontTableBox - avio_wb32(pb, 0x0D); // box size - ffio_wfourcc(pb, "ftab"); // box atom name - avio_wb16(pb, 0x01); // entry count - // FontRecord - avio_wb16(pb, 0x01); // font ID - avio_w8(pb, 0x00); // font name length - - if ((size = avio_close_dyn_buf(pb, &buf)) > 0) { - track->par->extradata = buf; - track->par->extradata_size = size; - } else { - av_freep(&buf); - } - } -#endif + ret = ff_alloc_extradata(track->par, sizeof(stub_header)); + if (ret < 0) + return ret; + memcpy(track->par->extradata, stub_header, sizeof(stub_header)); pkt->stream_index = tracknum; pkt->flags = AV_PKT_FLAG_KEY; -- 2.32.0 _______________________________________________ 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".