From patchwork Tue Jun 21 02:34:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36360 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp1977221pzb; Mon, 20 Jun 2022 19:34:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vHt+1Weh9Z0WfFyyUzSuavmJSBgrGqlVsUzjVOoxayng807rJ11u25fuJo6OvzvDs4bYq8 X-Received: by 2002:a05:6402:2402:b0:435:3418:61b5 with SMTP id t2-20020a056402240200b00435341861b5mr28554956eda.82.1655778888853; Mon, 20 Jun 2022 19:34:48 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bm22-20020a0564020b1600b00435679a5cc7si10397090edb.560.2022.06.20.19.34.48; Mon, 20 Jun 2022 19:34:48 -0700 (PDT) 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=RyKtfnQO; 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 D2A3368B666; Tue, 21 Jun 2022 05:34:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2015.outbound.protection.outlook.com [40.92.89.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 442D368B476 for ; Tue, 21 Jun 2022 05:34:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YM9d7Wu8+P45i0aq1APpC6rScNWHozB6Cppu+y40chORiloHYaFZmpE7s7t2DS1w2aulKCkVMxkgmseVqoPDbJJhr5FfXq59/e6uFFuTrgd0BlNJ+i/qnDE9udNYTtZW2mEv3OAY/OnY4QTOsbJvPSdRcRm8otFvIpOD19CP9fMwXSfbeGWwDr9vQh1NFyx+yYuQYxwzIAnT5rRhlTxpbvlYqloc6zMv8ricQzLV2cYS5rDFD5yAtTyYKiZHvHDijp3zZ4OsrFRnZVxm9Ff7dxn46x9iH4NiWNqQocJWtWUrn8jcrANJYKD2bCUZ83eCmsTGZQJcWWoysXtGafGvyw== 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=+h7X81XhmCBgyPujEbpLnxxSL9tT/OERXerkcB2wJZA=; b=gX/BqhNAunu9x367bILJ5l6wn2UdXv31Ncc/NizWPXvEJp8GgjNlIKznK/meIqDREfTeLab2osmZ+pmPVpJjpBWUDerSZxsdnKBzx209EJiw0SPXDWwznL4JrcCkDnrxuJWjjPplJCuXKl1STkIToByZCHadFTof/LieY4zow/+fZEwe/Tiih1dqsTCv9mJqdHKWpl1oZjJ48icUIJrYpp2+9Oodh8i5wRMH6LUhe0Uoev95dq0JqZLlILaes302tsARvg6cZQNPArYwdu14W7AK+WFwsrl4n06+KNjn9MfoHChK4WfB9KXx9Wztg/s5jSRuDZRqLCzBGBy/nL5GJQ== 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=+h7X81XhmCBgyPujEbpLnxxSL9tT/OERXerkcB2wJZA=; b=RyKtfnQOX4fM3n+ChMa6wNGJx7FE0JuhGYtt5SmzsmHkKKCkALFpCda+ZhUw3DPmY1ckZP7d6gQBo05n9Fq7pQyUxjmlv6HFtI3ogWxu3XYUH04h+bxNtwDgrsf/qJTl644ubqO2C5/wDxyr/0iJgFGALWoYrnHDq3O4bdSJlbU6JtgVpRroqYxGoxX/QcKHxrQgACbsTXVHDhxAAfuSbbwdN2StoN2AX2eE/9JFj36KUoKsDv32Bk7hZfZTKdyFAqGqajXg1PBFilmEPIwp5k2oMn7HcU3g/h1DvbcyTuQNl0Eg1NeD+5u/cnzHMqqb8JXFxTrXOoPdc4oOV6Z6Kg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PAXPR01MB9074.eurprd01.prod.exchangelabs.com (2603:10a6:102:2b4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Tue, 21 Jun 2022 02:34:30 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5353.022; Tue, 21 Jun 2022 02:34:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jun 2022 04:34:15 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [G8cPzpFVSjZogKG8rCZyzgYaWQ8NUcSt] X-ClientProxiedBy: ZR0P278CA0187.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::9) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220621023418.3322554-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d43ed32a-cefe-4fb2-3b87-08da532e912b X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEtlA26CjnCS1VxapTOXeNoSgarjVwEegyw+Hz2Ngrivg+D5DQB9KkAWUJN8BGtIFTTpmGyJ5A1ZVj6xKvsmFOeE2K/MM+5TkXJSqIll9GVPfuN4tgQ3ZhXj4Ne5ii1/inGn64OWf6Z0xEYDJIe7nBi+yOlo3+kq1LII9FqW5KxDWxrU18IL+VbAPlN7tJzMUPCeBcO0sE2tbo9iZKLDvrg+YQQMdruNr6kLy+6vm/WGImEQ0VO9ExfyUag5k5NxNYRjV92QDReNISYL+Lte3+55Le4Ol6PYxybLiBTFQxVNciEKmpHWEyapeGOS1k+opaW0ahR/795cw1I271cfIGp8/C6JWvv+tDA58PB4N5p9fICUjEMXEjU2FyBkRGEIOsi3LH93OLQmU3P11R4yg8AiFq95UzULLg+ep1Cimc9Gp+4h8oOvin2j29x7VRLcTh0ARY8y//sp6/2zUH8lzQNEBb1f/Yx9NoRJLprGygXHJOC83ebrwRLQxaYnVhht5cRE8hvIP9RBZr8xn6zROMsTvb0OvJNrRWLzU5nbqiVK1RI0B/uFtgbzj8rBAE7XQd6yI/4fsQvv+POaqhcqomfg+SqD1e1xPO3r3U1I5BTvwxvXZNVaq7aywhwzlayPxcbthynTCEnNwWeU25Ab9ZtxFcVrdEPT6EZy9uM6jALkt95eBpm/H/HkOu9YUQw0/WWYz7PnpVriN/AazImoFC6m1N5djPN9L8J5cy3QYGl7CNoTdzhomE/QVTK3EjSUb0NpDI1WhnW6HnkFN12GedI/ X-MS-TrafficTypeDiagnostic: PAXPR01MB9074:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sHMD95TAA1O3W8KTZo0vI9hLaflCjVnMvJ9uvKFpNYVJDcItuMTorTTUAEnGkKXoAFZX8tRNQePnFyrgU9S67wW72DCW488cUSVZwBezbAonVy3IRrfAp/5OXnceHYN78KgPRn1D2bop4IZqsD/ZTzI8QlIfr3VT4LuAShcxh6REIXGIMaSO8GTMESOBC+wEVjWGmuPPyH7DUsLixdYc9drZm0mtrd6Q6ou98TtRr8HEph/fviemoYfEwpLqkOQtq8tMQqtAvsjfYiYykUmksQ2hBZxfD/5Pdc6L3a3KEaRZm12L57XRsonoftLmfbc0UWCDPPVN1fcvtiQmUlXoolPjNAubqnEu2YVuTVCi/6epsfg3l5BcoF4JiGRxOWrabG9uxLBaJTObif8s1FwOp3ThMtlIpSW1vYIT5WHhi41v3svr/j6RDIfYoIRNKgWcHFRafWHxlNyIGZDaQRqxjOE+RYd2sKO4MsE56WrwOaf8OtfA/9aThoUMPTXJUHN4mLArOQeUnVJnFjexS4edCkDwLP7pFLqDGzFmRpE/t8od2ne4lut1dJw4NZ7MFgPPyhhkziMcrWOIIsHILpgAKA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5+p1wjWHnLUKhcDCDl6fRrdiXff9Y0Qsiy8I/5cYxxqssTAo2beiFPhzb6Exwt+rgQtzsvZps1iUbs8ph6hBCX1/Xhrcp9357KSPwyYKiNQncBITfliIdxjML/M49sudKTZrDZTP68eq2zQPZriYZWQmdT9hRHtFDTZw9owRtcs1+JTPbvaakHo3mzl5WQKSPmVqMd8+yx4Wnaaplp8FWVBrpXBEf2j2ueEbjgBzVax38HtcJZ416T+SsFkWOxoizCQ3ib/Q1979OmuI3M/tBGMDSRqLIZS65D/8S7G+UWabUHMngcvaeHbcQiy9rUzcgMUPItgnr7nzMYb8e44SbgjwES9XLRz7f197BwQKMrFFPs3kWNGW6QGmt4WDvS80IFuXF2fNOuBXOsVg/nrHqRXq5xsXDYX6x1D8XCmN8dy6RwWkd5qZuxhern4+G40VgT2K6lHALYiCJMzI15vtTDfW5WQqz36Dc1AUQpgT2cpvSiBtr7PzUNCnairjcwA349KFa6RzTVRUUTj4khqSQOksjCJ0P0A7ElrC0O8gWgKyrSgh4p53MQ/q7vRDLpDGsxzSybjEKF0Y3nLaeBXQjbQpIIGHh0FnNzZGLdMZQDztHs78ZnuGCyIBZqjrsk3tIU0w32sZwyYHmlwLa9LCAkhPlMyXKogD4sLsqR8ZzAeraFsbJKF/Bf8vPwqHNpTPPmBXPnZykIrEDPBBbY7r5sEpBszzlYEdC3d6PHceyY3O+r1fcdgESgw1wS1r6Vp8OuaMwWoqqm3ZK77Kxf67Km319ZSoUbVrrk3YK+gkEWzP08cJCMrsxlFj0JqHJwEeTJVaiL+3XGbfp0siAFFuMQzaZnxKaQzh1m4qp5EnUTSUGrF7TjA4NsuDtp49x4Ty+tkL0Oy9yXDIqEZ6w/uyufeliZPLahXT9AxQLX8iwOLzXXlVUQ/V514H64yJ73eYqnP4Gcx4YzpXNEMJCThdDhj5sDvGB2aAn+TbPHGhvZC5DcI8MDTZ72b5nwP1OdJ1r4nRrqII+vW/SeJsbSblmEEpHrs6WHcFDDtBQvCa8xysx8sh3E3lyJ+7VYs231EXtykG4YH3XIpqYyGo67Me/NdKWWTJvkrfyPeoS/OFlCxB2/BUbG0kQJs9sO0l/YZ8N775HjkzTN9G34nJ+5gojbY/OCkXbS1FQW6w92EJ0Nxllz4wkuceG63BLarSTwIzJSRvuxue6BJTV/O7SUcv9Xq09okYN+8aIHLRRJI6PLRoVJ+MlB0gPC9mMzXmK/sXx8uJWwdYdty6Y5vcOdAWS63/sHxhtuHI96Jim/VsdrJSYbBO33pVYRoU5P6A3MX5/mcvE0EGiDGnMxIhkU9Z1Luz36Pb8R4ujMsZ1ofzPgQA0PQi2kfAEVuFLiCEQJnypPE0bFdyJQI9eZvbB7bO8qG6wcdDU/tCLHWrd1uNdAYMbjMWOGViPdpRva7LAdiv1Kn7ytM0S9fzEcOhnxqTQA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d43ed32a-cefe-4fb2-3b87-08da532e912b X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 02:34:29.8133 (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: PAXPR01MB9074 Subject: [FFmpeg-devel] [PATCH 3/6] avformat/matroskaenc: Split updating CodecPrivate from writing it 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: pj+/J6urcpG/ Up until now, updating extradata was very ad-hoc: The amount of space reserved for extradata was not recorded when writing the header; instead the AAC code simply presumed that it was enough. This commit changes this by recording how much space is available. This brings with it that the code for writing of and reserving space for the CodecPrivate and for updating it diverges. They are therefore split; this allows to put other common tasks like seeking to right offset as well as writing padding (in case the new extradata did not fill the whole reserved space) to this common function. The code for filling up the reserved space is smarter than the code it replaces; therefore it is no longer necessary to reserve more than necessary just to be sure that one can add an EBML Void element (whose minimum size is two) lateron. This is the reason for the change to the aac-autobsf-adtstoasc test. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 120 ++++++++++++++++++--------- tests/ref/fate/aac-autobsf-adtstoasc | 4 +- 2 files changed, 84 insertions(+), 40 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 93d10332a4..250015419f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -184,7 +184,8 @@ typedef struct mkv_track { int64_t last_timestamp; int64_t duration; int64_t duration_offset; - int64_t codecpriv_offset; + int codecpriv_offset; + unsigned codecpriv_size; ///< size reserved for CodecPrivate excluding header+length field int64_t ts_offset; /* This callback will be called twice: First with a NULL AVIOContext * to return the size of the (Simple)Block's data via size @@ -1116,7 +1117,7 @@ static int mkv_assemble_native_codecprivate(AVFormatContext *s, AVIOContext *dyn return ff_isom_write_av1c(dyn_cp, extradata, extradata_size, 1); else - *size_to_reserve = 4 + 3; + *size_to_reserve = 4; break; #if CONFIG_MATROSKA_MUXER case AV_CODEC_ID_FLAC: @@ -1143,7 +1144,7 @@ static int mkv_assemble_native_codecprivate(AVFormatContext *s, AVIOContext *dyn if (extradata_size) avio_write(dyn_cp, extradata, extradata_size); else - *size_to_reserve = 4 + MAX_PCE_SIZE + 2; + *size_to_reserve = MAX_PCE_SIZE; break; #endif default: @@ -1162,17 +1163,16 @@ static int mkv_assemble_codecprivate(AVFormatContext *s, AVIOContext *dyn_cp, const uint8_t *extradata, int extradata_size, int native_id, int qt_id, uint8_t **codecpriv, int *codecpriv_size, - unsigned *size_to_reserve) + unsigned *max_payload_size) { MatroskaMuxContext av_unused *const mkv = s->priv_data; + unsigned size_to_reserve = 0; int ret; - *size_to_reserve = 0; - if (native_id) { ret = mkv_assemble_native_codecprivate(s, dyn_cp, par, extradata, extradata_size, - size_to_reserve); + &size_to_reserve); if (ret < 0) return ret; #if CONFIG_MATROSKA_MUXER @@ -1226,31 +1226,72 @@ static int mkv_assemble_codecprivate(AVFormatContext *s, AVIOContext *dyn_cp, *codecpriv_size = avio_get_dyn_buf(dyn_cp, codecpriv); if (dyn_cp->error < 0) return dyn_cp->error; + *max_payload_size = *codecpriv_size + size_to_reserve; + return 0; } -static int mkv_write_codecprivate(AVFormatContext *s, MatroskaMuxContext *mkv, - AVCodecParameters *par, - const uint8_t *extradata, int extradata_size, - int native_id, int qt_id, AVIOContext *pb) +static void mkv_put_codecprivate(AVIOContext *pb, unsigned max_payload_size, + const uint8_t *codecpriv, unsigned codecpriv_size) +{ + unsigned total_codecpriv_size = 0, total_size; + + av_assert1(codecpriv_size < max_payload_size); + + if (!max_payload_size) + return; + + total_size = 2 + ebml_length_size(max_payload_size) + max_payload_size; + + if (codecpriv_size) { + unsigned length_size = ebml_length_size(codecpriv_size); + + total_codecpriv_size = 2U + length_size + codecpriv_size; + if (total_codecpriv_size + 1 == total_size) { + /* It is impossible to add one byte of padding via an EBML Void. */ + length_size++; + total_codecpriv_size++; + } + put_ebml_id(pb, MATROSKA_ID_CODECPRIVATE); + put_ebml_length(pb, codecpriv_size, length_size); + avio_write(pb, codecpriv, codecpriv_size); + } + if (total_codecpriv_size < total_size) + put_ebml_void(pb, total_size - total_codecpriv_size); +} + +static int mkv_update_codecprivate(AVFormatContext *s, MatroskaMuxContext *mkv, + uint8_t *side_data, int side_data_size, + AVCodecParameters *par, AVIOContext *pb, + mkv_track *track) { AVIOContext *const dyn_bc = mkv->tmp_bc; uint8_t *codecpriv; - unsigned size_to_reserve; + unsigned max_payload_size; int ret, codecpriv_size; - ret = mkv_assemble_codecprivate(s, dyn_bc, par, extradata, extradata_size, - native_id, qt_id, - &codecpriv, &codecpriv_size, &size_to_reserve); + ret = mkv_assemble_codecprivate(s, dyn_bc, par, + side_data, side_data_size, 1, 0, + &codecpriv, &codecpriv_size, &max_payload_size); if (ret < 0) - goto end; - if (codecpriv_size) - put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codecpriv, codecpriv_size); - if (size_to_reserve) - put_ebml_void(pb, size_to_reserve); -end: + goto fail; + if (codecpriv_size > track->codecpriv_size) { + ret = AVERROR(ENOSPC); + goto fail; + } + avio_seek(pb, track->codecpriv_offset, SEEK_SET); + mkv_put_codecprivate(pb, track->codecpriv_size, + codecpriv, codecpriv_size); + + if (!par->extradata_size) { + ret = ff_alloc_extradata(par, side_data_size); + if (ret < 0) + goto fail; + memcpy(par->extradata, side_data, side_data_size); + } +fail: ffio_reset_dyn_buf(dyn_bc); - return 0; + return ret; } #define MAX_VIDEO_COLOR_ELEMS 20 @@ -1862,16 +1903,24 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } if (!IS_WEBM(mkv) || par->codec_id != AV_CODEC_ID_WEBVTT) { + uint8_t *codecpriv; + int codecpriv_size, max_payload_size; track->codecpriv_offset = avio_tell(pb); - ret = mkv_write_codecprivate(s, mkv, par, par->extradata, par->extradata_size, - native_id, qt_id, pb); + ret = mkv_assemble_codecprivate(s, mkv->tmp_bc, par, + par->extradata, par->extradata_size, + native_id, qt_id, + &codecpriv, &codecpriv_size, &max_payload_size); if (ret < 0) - return ret; + goto fail; + mkv_put_codecprivate(pb, max_payload_size, codecpriv, codecpriv_size); + track->codecpriv_size = max_payload_size; } end_ebml_master(pb, track_master); +fail: + ffio_reset_dyn_buf(mkv->tmp_bc); - return 0; + return ret; } static int mkv_write_tracks(AVFormatContext *s) @@ -2645,23 +2694,17 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) #if CONFIG_MATROSKA_MUXER case AV_CODEC_ID_AAC: if (side_data_size && mkv->track.bc) { - int filler, output_sample_rate = 0; + int output_sample_rate = 0; ret = get_aac_sample_rates(s, mkv, side_data, side_data_size, &track->sample_rate, &output_sample_rate); if (ret < 0) return ret; if (!output_sample_rate) output_sample_rate = track->sample_rate; // Space is already reserved, so it's this or a void element. - ret = ff_alloc_extradata(par, side_data_size); + ret = mkv_update_codecprivate(s, mkv, side_data, side_data_size, + par, mkv->track.bc, track); if (ret < 0) return ret; - memcpy(par->extradata, side_data, side_data_size); - avio_seek(mkv->track.bc, track->codecpriv_offset, SEEK_SET); - mkv_write_codecprivate(s, mkv, par, side_data, side_data_size, - 1, 0, mkv->track.bc); - filler = MAX_PCE_SIZE + 2 + 4 - (avio_tell(mkv->track.bc) - track->codecpriv_offset); - if (filler) - put_ebml_void(mkv->track.bc, filler); avio_seek(mkv->track.bc, track->sample_rate_offset, SEEK_SET); put_ebml_float(mkv->track.bc, MATROSKA_ID_AUDIOSAMPLINGFREQ, track->sample_rate); put_ebml_float(mkv->track.bc, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, output_sample_rate); @@ -2678,9 +2721,10 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) pkt->stream_index); return AVERROR(EINVAL); } - avio_seek(mkv->track.bc, track->codecpriv_offset, SEEK_SET); - mkv_write_codecprivate(s, mkv, par, side_data, side_data_size, - 1, 0, mkv->track.bc); + ret = mkv_update_codecprivate(s, mkv, side_data, side_data_size, + par, mkv->track.bc, track); + if (ret < 0) + return ret; } break; #endif diff --git a/tests/ref/fate/aac-autobsf-adtstoasc b/tests/ref/fate/aac-autobsf-adtstoasc index 8b6d9d96ee..57bfcae18b 100644 --- a/tests/ref/fate/aac-autobsf-adtstoasc +++ b/tests/ref/fate/aac-autobsf-adtstoasc @@ -1,5 +1,5 @@ -29daa1e1985dac4baae0774a0b56149d *tests/data/fate/aac-autobsf-adtstoasc.matroska -6644 tests/data/fate/aac-autobsf-adtstoasc.matroska +4342e4f3f93b16514bda511b3b7fd93a *tests/data/fate/aac-autobsf-adtstoasc.matroska +6642 tests/data/fate/aac-autobsf-adtstoasc.matroska #extradata 0: 2, 0x0030001c #tb 0: 1/1000 #media_type 0: audio