From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id B37194D1D9 for ; Sat, 31 May 2025 00:45:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A1A7768BFBB; Sat, 31 May 2025 03:45:34 +0300 (EEST) Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03olkn2044.outbound.protection.outlook.com [40.92.57.44]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 3C05268B5B9 for ; Sat, 31 May 2025 03:45:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=auWp1QHC0amBYhP1wHifb4rJq6xKb8oJEtVidfp/pe61EFxI1Xc4cHvzqPPqpng4SceuITA2EGYr4W4JyHEIydrk1WKcoZ1R5r5BPvKMpmd9HFNKDJxFEIiAkbsodagbFNt7tfVcsrxLk/VVYdJJnVTnRbisonzbGCi3JS4+4AcADWMDYaZHP3U+cwSEXHS11+5pRzvEg2o/nyYxbbqDOcI+Y6TAOKpedTFWeVZt+4yxT618CQclnccEZGTYE1kUut//efxJuTn5K2PGLyNCKMnIRZ2i+KhdNBd1gqwHTUHhTqmBA6Ltbbk4lGtUkiK48PlWZHRQ4f/0BuWwYbqWJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=lh1uOkwog/BBAzE/VMECCtiv4CsL/nWWNNhrEElT00c=; b=UGVfpzkGsgJped/g69XpmXfIoxcII7gIauXWq9nw99vsV9w81S5rK1Veih2tzgbz0yusrysgfayI3ifCkGiAGO98xIHr9JconGZJo8QlLZx+Jtt1zK+6jDa5VeBWWLkOTx+1eQJFRmhVkZXJ6VYGUakBZxSu8L4Wc68LP5FHaRvmjyM6ecq91RqgXkNz5Dugtsc3VLTXhtqpf+1IU97JTsGT9Y/OAmUa62kOxif5dxwNjPamj893FX9hDdKi8UgfoTTL7ORxh8Bg41z73nw0hHdyQfgwtWU6VPgqAKrtKD7WIsvttt6voqwGVUswrPJykm+u84wZg+3XvWcAhThIdg== 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=lh1uOkwog/BBAzE/VMECCtiv4CsL/nWWNNhrEElT00c=; b=YqHSrTkwseo6J+NtmGT+0HdAgWhBGujB5JKimQgkttj+2oqiQzjZr7gqU2+MeUfnlWtDIkLaqCHfX/S6Ze9yaKkwWZSiAMWtrLe2Wi3SOKhmW4ugz+sxPXgDaysIGYwEoQ83g1PjwSZ56cm52RiKWD6ZikFA8Gx1RkrwP/OI9ICHbbBbbGphRrz80woULNDO9xdafGG1TG/rCW4DzB9U77yG6SPVE/pSJhUJoIRSREZoBgfH0v7mwgnbiIPuxp/RCEp78YxNIb+tAfMOHcC7UG0CweOyVj0YlQu0B8JJ78Bo1Uwn2F+1scGUrC+FCtqwQVjtxdEWfTCpMsgPmys32g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0236.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.27; Sat, 31 May 2025 00:45:31 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%3]) with mapi id 15.20.8769.021; Sat, 31 May 2025 00:45:31 +0000 Message-ID: Date: Sat, 31 May 2025 02:45:30 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20250531003241.2942145-1-michael@niedermayer.cc> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20250531003241.2942145-1-michael@niedermayer.cc> X-ClientProxiedBy: FR4P281CA0030.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:c9::7) 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_|AS8P250MB0236:EE_ X-MS-Office365-Filtering-Correlation-Id: 0fb3d839-b6dc-477a-9b24-08dd9fdc7242 X-Microsoft-Antispam: BCL:0; ARA:14566002|6090799003|19110799006|15080799009|461199028|8060799009|41001999006|7092599006|5072599009|440099028|3412199025|12091999003; X-Microsoft-Antispam-Message-Info: =?utf-8?B?SVBsVUNxQkVCSlRId09VWk5FVWJSd3poczJFTHRtNXIvbVE3QjBEOERzWnJ6?= =?utf-8?B?d2Jsdi83NjFIRlJ1cS9TY0xlSDBtcUJCd1dpdW1QTGpnVnpRamQ0S3pFNWw2?= =?utf-8?B?RW9HWFZROGpKVlI2OUxWZGF2VVFuNDF4WFFjejZYUGIyaFBFYlExNVJ6bzA4?= =?utf-8?B?cmg0UkpJeldLNlFsVUF2cnBnZjFlenpZaWMreUU3N3VGbDJiamhzek9jc2ow?= =?utf-8?B?M3I3ejQyN09RejFGelBvWWh5V05LNTlrU2dMQXp4ZkZFZk8zdEl4VWNzY1B0?= =?utf-8?B?VjlJbEVpQWl6bEtIV09mVVJaVWNjYjc1bVhZZ3dqcjNnK0ljWUF4NUtFRDh3?= =?utf-8?B?Mjg2TVhEY3ZuUEJoazMxL0hZWjUwL2NZZC9mbUViZzNvaEEvKzBES1Z5b29j?= =?utf-8?B?UzN3ZXRXUUtIQkx0WXplVEZjS24wdlVBSE15bnRFRDdBeDZRbXg0SDJlNHEx?= =?utf-8?B?ZE9lQXd0TEFDcXRvdTRCeUxXZXBvaVE3Qk0rRHBrN3piT05MUm5RVlZKWk05?= =?utf-8?B?MlZzYlNRSklJSjZjVkZiVks4STdocG11STQxTXdEMXJJMURuMFllRWwraVhw?= =?utf-8?B?K3ZHUWxrMFFzVitSMmRlRkcxZ1MzZXFielJjSCtaQXBZL3JOYmhSS3JzKzRG?= =?utf-8?B?d01qZ3lrUGFsV2NGRC9sWjhNdGpJcGFlRzlXOTFpSXdRdmZwVDlDc1o2TzJv?= =?utf-8?B?bXNpaEljbk9FTFZRRmpOZDBhNkt5QUJoalBTdXBhcFBTK3IwcFMzekw3Z0Rv?= =?utf-8?B?S1ZyU2JsdHBNdTN0UVNIdmhrd0FSMkJZU1IzR25nbmxlaXFnU2xZVnpQeEhh?= =?utf-8?B?SFNvTXdmdHlUbDhnN2s3WUp1VlA0czRhZk14K3pyZGVlZ1QxVkh3NTRVQUYz?= =?utf-8?B?QVhrUzdRWlRQd2NDczBCZzFDOTFIWFk5Sy9ITUNSb3FNUTBLVlhUeENDWFFC?= =?utf-8?B?R1FXMHY5QXNsaFl1Yk1vK01xbUx1NFNhZURnb3FIeWduS3JxWHc5cXJPalFo?= =?utf-8?B?VXpnT1F3OWZIaTRIMFRmTUYvSEdocUNPb3NIU2JuZnUvRmNlTzRwWDg0M0xV?= =?utf-8?B?ZGREb2FRaUhZZTk0OEdMSnhUWmhKYysxekNSanhJVG9EZ3pqUnJxOGJKN0ZF?= =?utf-8?B?bSsyUjhBeVBXNHMzQ3k3L1pGbHZJKzBub2FVSlZqSHkxWmZqMERVbWxaYkMv?= =?utf-8?B?d2RmZTFmQnFPaFNsb3haK2lmSFBnczkrOXhVTlRtTmdDOVoyYWx6VnFESW9X?= =?utf-8?B?eTQvZWVDQ3ovYUN1ZWtRd1VIek1KVDc1SFdUajNjSWxJWG1YRWFhSFhGSFNE?= =?utf-8?B?UmdxOFlqRUwwMU9jN0ZNQVFGMk95ZDFWOTdRUHY5YkM2OWRxRlorRGl2TmtL?= =?utf-8?B?cTZ4VWw1ZFVaN2d3aFpSL0JQKzBFbXFMMkxrVHJ5bklNT3hza05QUk1sMTY2?= =?utf-8?B?a2oyek5GWUdiSEMvejJGbm42YmVUb3ZWc3dLRUZ4Vm92ZWZIbkdrR3M4bU9L?= =?utf-8?B?WmNwWEhkc0Mrc25tUE5NbFVuNXYyZGtmSVVpYU12Z09kcDNVcmVCUTIwYmpr?= =?utf-8?B?MkJQR2lzMkJqa01hejRBaklzbWdCVDJROGZTSnZrOEtzRnJ0ODU0UThaMUZn?= =?utf-8?B?cUdqL3NvdHFvblE2NXVGamhKcEhHSVE9PQ==?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UG8wVVRlY3N4SFliWVZ2R0lVSk5xRDgzcGQ2Sno3bEFZNUJLMW5nYlRpY0ox?= =?utf-8?B?VnVFaDZJa252SmN3TVVURURhUk5kbXFnUG1Edm5xOStPTE5Ea25ySEpZYWpC?= =?utf-8?B?RzBjTGpiTno2dGd1emVyZVpNWm92clIweHpwYTNvSmRuTXpxcXVMcllwQ3R1?= =?utf-8?B?dThNYXltaEErOWVEOXpXVVR4Q0w4WjZIc01paXUrRlc1YVpIckhqMTd1RGNU?= =?utf-8?B?K2NiK3cwTkRmSmNVWXl2eHRaa2dIaWhmS25vR2s2dGYvUy9KZjhWWFo3ckw0?= =?utf-8?B?RHd4cWRUeDRWeHVWTWNYWVRTbWhSVGxlRE1KYnpHbmZ5SFFobWNna2RXOTdo?= =?utf-8?B?ZnBKclBXMllhaFVuR05BS3h4WVpVR09jSncrMmNoZ0RxN0NlWGpDc2xMT2Fl?= =?utf-8?B?eVgwU1dqQjByMHdQZnNsNEdKRW1lMmxGWkJLamZVazBqbEZTeFhVMlo2R09T?= =?utf-8?B?N2E3UFIzRUlmTEhvOGxKb1A2VnUvRWtpRW55SWI4V3p4RUpFK3hRbjRLT2wz?= =?utf-8?B?dXErQldLUm4xUVNWLzdpQW5lRUl2aE5yam5rN1QyMVNLZENubzdqQkoyeWtX?= =?utf-8?B?eW1FRWNtcVN1V0R4RWw5bGhoMldIRm5zOXZSNE16ZmZmeTY5K1pIbFZiWWRC?= =?utf-8?B?NGZKdW9xU1gydmxqOHZ5elZacTR4bjNBMElSVGlLV2hicUZocEhkelFMZWlE?= =?utf-8?B?Y04vQXNNamg1TlRWcjQ2bzVQb1pnWThscHVtZm0zV2RxMi9WbTB3ZlY3VHJQ?= =?utf-8?B?b00xQ1BzbDloK0llVmF5SU41d3pSRGNwdnhkdnMrbU1rQnRQTExZR1BTNUlZ?= =?utf-8?B?dWJ2cnY5RStFWHBSZEIxYWt3Zy9mSy90UEJsTkg5a2JBTkl2YW1jUkpGTUZU?= =?utf-8?B?SEFLQktQbmIzMjFJL2JvM1ZZQkkzSmtobVBmSGViYmpSenpvSEppV2ZsK25z?= =?utf-8?B?eHBjSVpERFA3ODV2eUJPbUpXYkk1bStuMXJZcC9CakJ5OUUwbzAzSVV2M1Jx?= =?utf-8?B?aXcvZmNFa3NPSi9mMndkS1ROMkt6OXVDTFNxTkZCYTNsMzR4ZWpTOE90YTg4?= =?utf-8?B?aU1HQ0RFY0puQU0xdjE4ZkZXQ21ra1hQeitoVGw0Ni9kM2ZYTnlSUUc1aWJq?= =?utf-8?B?dXp3UEwyQTRXNEZHdFJ6MUN5VHp1ZmFyckY2UlBNbUtjVWV3UWhOMzdWcHBI?= =?utf-8?B?QTFXYlRKS0JrNFV4OHNCNlVKS2djdmswOXJRb0xaVWJHRmhXYXhGazlweEV4?= =?utf-8?B?cjJ3OUF6NFNhMm1NZ3k1cGg3TmR0LzE5VzNKaGV0QXp4RHE0RVQxZUpObUFi?= =?utf-8?B?NHNodGdvN0QvVnVVZlZnNkRJU3Y4cEVhRGh4cE5sZEJvcDc2eUhINkcybStu?= =?utf-8?B?NGtSckdrMjR4UnREbXI0ZE85VGFxeHV3NTR3NmJUSnRYNjN6WGVJTUZ2YnEv?= =?utf-8?B?d2dNMkdTaUpCdGROSUF4S0s4VVI4R2RPeXhUV0dlQ3J3MERRcUtpTUx3SmNS?= =?utf-8?B?MzZ6NEFpK25zTUdoSUY4MXlwbzhXYktFY1hjV0trWHhGZmRVM2FZU3NDV2tI?= =?utf-8?B?K0NFbFFCYmNHS1RwQ3lXdHZjSHlEVUdib3NuZHd1VC84SkFqdk50UUJVbXFi?= =?utf-8?B?NmVpWDhLVnMzMVVDR3g5dTBZTGtSeXk2bFgxWi9IUmZCRGp1SVFyZTgyNlNY?= =?utf-8?B?RGlUd2RycDNRWXh6Tzh3WE9QWU9OUTZPQStrNFB3aUQzM3Z4c2tReGE1SDZu?= =?utf-8?B?cEcyZjkwbDVZYnN0eE9uY1JCeGZmczRJOW4zSXV5eTB2ZjRGMjhnWGM1Mm5E?= =?utf-8?B?M2h3QTBkZW1VazU0alo1UT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0fb3d839-b6dc-477a-9b24-08dd9fdc7242 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2025 00:45:31.7430 (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: AS8P250MB0236 Subject: Re: [FFmpeg-devel] [PATCH] Revert "ogg/vorbis: implement header packet skip in chained ogg bitstreams." 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: Michael Niedermayer: > non flat extradata is problematic and was missed by reviewers > > Found-by: mkver and jamrial Actual patch LGTM, but I'd rather prefer to have my actual name here. > This reverts commit 574f634e49847e2225ee50013afebf0de03ef013. > --- > libavcodec/vorbis_parser.h | 11 ---- > libavcodec/vorbisdec.c | 75 +++++++++------------- > libavformat/oggparsevorbis.c | 67 +------------------ > tests/ref/fate/ogg-vorbis-chained-meta.txt | 3 + > 4 files changed, 37 insertions(+), 119 deletions(-) > > diff --git a/libavcodec/vorbis_parser.h b/libavcodec/vorbis_parser.h > index b176fe536c7..789932ac492 100644 > --- a/libavcodec/vorbis_parser.h > +++ b/libavcodec/vorbis_parser.h > @@ -30,17 +30,6 @@ > > typedef struct AVVorbisParseContext AVVorbisParseContext; > > -/** > - * Used by the vorbis parser to pass new chained stream headers > - * as extradata. > - */ > -typedef struct vorbis_new_extradata { > - uint8_t *header; > - size_t header_size; > - uint8_t *setup; > - size_t setup_size; > -} vorbis_new_extradata; > - > /** > * Allocate and initialize the Vorbis parser using headers in the extradata. > */ > diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c > index a4b159ba9b2..adbd7261832 100644 > --- a/libavcodec/vorbisdec.c > +++ b/libavcodec/vorbisdec.c > @@ -43,7 +43,6 @@ > #include "vorbis.h" > #include "vorbisdsp.h" > #include "vorbis_data.h" > -#include "vorbis_parser.h" > #include "xiph.h" > > #define V_NB_BITS 8 > @@ -1779,59 +1778,47 @@ static int vorbis_decode_frame(AVCodecContext *avctx, AVFrame *frame, > GetBitContext *gb = &vc->gb; > float *channel_ptrs[255]; > int i, len, ret; > - size_t new_extradata_size; > - vorbis_new_extradata *new_extradata; > - const uint8_t *header; > - const uint8_t *setup; > > ff_dlog(NULL, "packet length %d \n", buf_size); > > - new_extradata = (vorbis_new_extradata *)av_packet_get_side_data( > - avpkt, AV_PKT_DATA_NEW_EXTRADATA, &new_extradata_size); > - > - if (new_extradata) { > - header = new_extradata->header; > - setup = new_extradata->setup; > - > - if (new_extradata->header_size > 7 && *header == 1) { > - if ((ret = init_get_bits8( > - gb, header + 1, > - new_extradata->header_size - 1)) < 0) > - return ret; > + if (*buf == 1 && buf_size > 7) { > + if ((ret = init_get_bits8(gb, buf + 1, buf_size - 1)) < 0) > + return ret; > > + vorbis_free(vc); > + if ((ret = vorbis_parse_id_hdr(vc))) { > + av_log(avctx, AV_LOG_ERROR, "Id header corrupt.\n"); > vorbis_free(vc); > - if ((ret = vorbis_parse_id_hdr(vc))) { > - av_log(avctx, AV_LOG_ERROR, "Id header corrupt.\n"); > - vorbis_free(vc); > - return ret; > - } > - > - av_channel_layout_uninit(&avctx->ch_layout); > - if (vc->audio_channels > 8) { > - avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; > - avctx->ch_layout.nb_channels = vc->audio_channels; > - } else { > - av_channel_layout_copy( > - &avctx->ch_layout, > - &ff_vorbis_ch_layouts[vc->audio_channels - 1]); > - } > + return ret; > + } > > - avctx->sample_rate = vc->audio_samplerate; > + av_channel_layout_uninit(&avctx->ch_layout); > + if (vc->audio_channels > 8) { > + avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; > + avctx->ch_layout.nb_channels = vc->audio_channels; > + } else { > + av_channel_layout_copy(&avctx->ch_layout, &ff_vorbis_ch_layouts[vc->audio_channels - 1]); > } > > - if (new_extradata->setup_size > 7 && *setup == 5 && > - vc->channel_residues && !vc->modes) { > - if ((ret = init_get_bits8( > - gb, setup + 1, > - new_extradata->setup_size - 1)) < 0) > - return ret; > + avctx->sample_rate = vc->audio_samplerate; > + return buf_size; > + } > > - if ((ret = vorbis_parse_setup_hdr(vc))) { > - av_log(avctx, AV_LOG_ERROR, "Setup header corrupt.\n"); > - vorbis_free(vc); > - return ret; > - } > + if (*buf == 3 && buf_size > 7) { > + av_log(avctx, AV_LOG_DEBUG, "Ignoring comment header\n"); > + return buf_size; > + } > + > + if (*buf == 5 && buf_size > 7 && vc->channel_residues && !vc->modes) { > + if ((ret = init_get_bits8(gb, buf + 1, buf_size - 1)) < 0) > + return ret; > + > + if ((ret = vorbis_parse_setup_hdr(vc))) { > + av_log(avctx, AV_LOG_ERROR, "Setup header corrupt.\n"); > + vorbis_free(vc); > + return ret; > } > + return buf_size; > } > > if (!vc->channel_residues || !vc->modes) { > diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c > index f8e66e8127c..62cc2da6de7 100644 > --- a/libavformat/oggparsevorbis.c > +++ b/libavformat/oggparsevorbis.c > @@ -255,19 +255,12 @@ static void vorbis_cleanup(AVFormatContext *s, int idx) > struct ogg *ogg = s->priv_data; > struct ogg_stream *os = ogg->streams + idx; > struct oggvorbis_private *priv = os->private; > - vorbis_new_extradata *new_extradata; > int i; > if (os->private) { > av_vorbis_parse_free(&priv->vp); > for (i = 0; i < 3; i++) > av_freep(&priv->packet[i]); > } > - > - if (os->new_extradata) { > - new_extradata = (vorbis_new_extradata *)os->new_extradata; > - av_freep(&new_extradata->header); > - av_freep(&new_extradata->setup); > - } > } > > static int vorbis_update_metadata(AVFormatContext *s, int idx) > @@ -440,10 +433,7 @@ static int vorbis_packet(AVFormatContext *s, int idx) > struct ogg *ogg = s->priv_data; > struct ogg_stream *os = ogg->streams + idx; > struct oggvorbis_private *priv = os->private; > - vorbis_new_extradata *new_extradata; > int duration, flags = 0; > - int skip_packet = 0; > - int ret; > > if (!priv->vp) > return AVERROR_INVALIDDATA; > @@ -506,61 +496,10 @@ static int vorbis_packet(AVFormatContext *s, int idx) > if (duration < 0) { > os->pflags |= AV_PKT_FLAG_CORRUPT; > return 0; > - } > - > - if (flags & VORBIS_FLAG_HEADER) { > - ret = vorbis_parse_header(s, s->streams[idx], os->buf + os->pstart, os->psize); > - if (ret < 0) > - return ret; > - > - if (!os->new_extradata) { > - os->new_extradata = av_mallocz(sizeof(vorbis_new_extradata)); > - if (!os->new_extradata) > - return AVERROR(ENOMEM); > - } > - > - os->new_extradata_size = sizeof(vorbis_new_extradata); > - new_extradata = (vorbis_new_extradata *)os->new_extradata; > - > - ret = av_reallocp(&new_extradata->header, os->psize); > - if (ret < 0) > - return ret; > - > - memcpy(new_extradata->header, os->buf + os->pstart, os->psize); > - new_extradata->header_size = os->psize; > - > - skip_packet = 1; > - } > - > - if (flags & VORBIS_FLAG_COMMENT) { > - ret = vorbis_update_metadata(s, idx); > - if (ret < 0) > - return ret; > - > + } else if (flags & VORBIS_FLAG_COMMENT) { > + vorbis_update_metadata(s, idx); > flags = 0; > - skip_packet = 1; > - } > - > - if (flags & VORBIS_FLAG_SETUP) { > - if (!os->new_extradata) { > - os->new_extradata = av_mallocz(sizeof(vorbis_new_extradata)); > - if (!os->new_extradata) > - return AVERROR(ENOMEM); > - } > - > - os->new_extradata_size = sizeof(vorbis_new_extradata); > - new_extradata = (vorbis_new_extradata *)os->new_extradata; > - > - ret = av_reallocp(&new_extradata->setup, os->psize); > - if (ret < 0) > - return ret; > - > - memcpy(new_extradata->setup, os->buf + os->pstart, os->psize); > - new_extradata->setup_size = os->psize; > - > - skip_packet = 1; > } > - > os->pduration = duration; > } > > @@ -582,7 +521,7 @@ static int vorbis_packet(AVFormatContext *s, int idx) > priv->final_duration += os->pduration; > } > > - return skip_packet; > + return 0; > } > > const struct ogg_codec ff_vorbis_codec = { > diff --git a/tests/ref/fate/ogg-vorbis-chained-meta.txt b/tests/ref/fate/ogg-vorbis-chained-meta.txt > index 1206f86c1f3..b7a97c90e29 100644 > --- a/tests/ref/fate/ogg-vorbis-chained-meta.txt > +++ b/tests/ref/fate/ogg-vorbis-chained-meta.txt > @@ -6,7 +6,10 @@ Stream ID: 0, frame PTS: 128, metadata: N/A > Stream ID: 0, packet PTS: 704, packet DTS: 704 > Stream ID: 0, frame PTS: 704, metadata: N/A > Stream ID: 0, packet PTS: 0, packet DTS: 0 > +Stream ID: 0, packet PTS: 0, packet DTS: 0 > Stream ID: 0, new metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream > +Stream ID: 0, packet PTS: 0, packet DTS: 0 > +Stream ID: 0, packet PTS: 0, packet DTS: 0 > Stream ID: 0, frame PTS: 0, metadata: N/A > Stream ID: 0, packet PTS: 128, packet DTS: 128 > Stream ID: 0, frame PTS: 128, metadata: N/A _______________________________________________ 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".