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 1FD7A48A54 for ; Mon, 19 May 2025 14:47:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 6788C68D630; Mon, 19 May 2025 17:46:56 +0300 (EEST) Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C390068D619 for ; Mon, 19 May 2025 17:46:47 +0300 (EEST) Received: by mail-oi1-f173.google.com with SMTP id 5614622812f47-3f8ae3ed8f4so3033352b6e.3 for ; Mon, 19 May 2025 07:46:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747666006; x=1748270806; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YCnHbHjHG5L7k3gt1p9C38D/2pBf8fvJea35F4EbgNI=; b=HC5vT9mfLnb1aM+xmGDUt9qkCsjavXPzadCqmDSyq1G5w+SahcJQ3TdHJL0N3z1OdT YF6XOA+Ho6OoJGXro4nl6n/KoJixjEXrAuK6wfdUG+0yrgHLyY8V0/4Eorw8cq6pEv9E Pu1Ilx26OudzXozhWHSXeQVd2RtIgfWR1PjSWZhCfzA08HrnfJ3YVPbgkTEiAKbSXQLy xFyEoLuxcpo8mra0GDAxnFFe47NpOLFSTdSm2L22SDY0phM+ujFhEhkK9BxK0h/rO/WH 9jSrf5Mj2t+wlU6MfPp5XQgRVK98st8J0ciW8468HvTzLTwUM4qc77wRn/+YS4DJSVTG srdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747666006; x=1748270806; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YCnHbHjHG5L7k3gt1p9C38D/2pBf8fvJea35F4EbgNI=; b=emYvswGbLr09BG2noDR5WRyPEB4Cgzd0hhelL9u/20XgErsNMhAKvm+x+uaI+v3jIx DM7hqI1Ud1xHYxZ8KL7ZVfxDJrME42zB3QDfVxFr+L1uB5nJjXvCZW9zq7R0XoeINRMp 8gzoWLVClvScWNNUNzx1sFyn8CmbLym5X+c42As4R6yM/3KRx3qBsej1jn/09Awmfdp9 GrFlmn69/wafw7tHuQ4cGGtf1Pg/7e0CC58e+6RKL8n/2WREr+vUb31X90lsDyK/zNny +RR50ejEdiLi09Wy/ebERzHhWaqr2lEe9ZL6KsqWpXHv1vA3fg9f1EOz/v5A18s19hfL FM3A== X-Gm-Message-State: AOJu0YzGF9Q8HtcRfe4Gsp15hitvjfsCkYksccZZX3jMG2qlngG/vt3t JB/wlvZWbnunbUxlEzzcni1yVJmAtie2NQ+FkttbGWlv3psDTVYPIEhr9cAK8/Im X-Gm-Gg: ASbGncubDYM1W/n78zH8VJEZrtsqAs1KTXfw+EmrYrWg8JI4icDltQ2PyNtgMtiUIzx qAAwrcX9dXEuVoxysAWLurslMgjRuvwViHpgmV79FCaswrqoVt588WGp+WGbX8PAs7iGE3SIIkP CPfBrXswNIFwylZEaW+MwBluCTrN79NAzft2tiXGpbZTvbP2xZS/t5eZlENFThTPavPQjOUOMu6 BckPIWhCNdL0nv0RcaKVMbx87z3HRMtV+3jlvboKG30KY98N2FCfHF54YG0+3nwYjfmqyntcwX2 AN/nkBQ95qbKtkKcE9NHI/TxLGyvaG0T9DNKW55RsnyIS0Stpl0gRr+MIudSiL3pE5/2KjIV8pS W7nVbpIN5tDvP49UEQks= X-Google-Smtp-Source: AGHT+IF2RAgnS6rkxU+EXCMOY47XQ1UxuXuHPae0CcWH9ypf/Uf9A7AiCcaEqD57L2X7AuO8no3iYA== X-Received: by 2002:a05:6808:6b96:b0:404:c04:b2d6 with SMTP id 5614622812f47-404d8802b9amr7201879b6e.29.1747666006078; Mon, 19 May 2025 07:46:46 -0700 (PDT) Received: from mac.lan (ip72-211-125-114.no.no.cox.net. [72.211.125.114]) by smtp.gmail.com with ESMTPSA id 5614622812f47-404d9809667sm1413322b6e.30.2025.05.19.07.46.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 19 May 2025 07:46:45 -0700 (PDT) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 May 2025 09:46:38 -0500 Message-Id: <20250519144639.36733-4-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250519144639.36733-1-romain.beauxis@gmail.com> References: <20250519144639.36733-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 3/4] 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 Cc: Romain Beauxis 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: --- libavcodec/vorbis_parser.h | 11 ++++ libavcodec/vorbisdec.c | 76 +++++++++++++--------- libavformat/oggparsevorbis.c | 63 +++++++++++++++++- tests/ref/fate/ogg-vorbis-chained-meta.txt | 3 - 4 files changed, 116 insertions(+), 37 deletions(-) diff --git a/libavcodec/vorbis_parser.h b/libavcodec/vorbis_parser.h index 789932ac49..b176fe536c 100644 --- a/libavcodec/vorbis_parser.h +++ b/libavcodec/vorbis_parser.h @@ -30,6 +30,17 @@ 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 adbd726183..c9bbc60b49 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -43,6 +43,7 @@ #include "vorbis.h" #include "vorbisdsp.h" #include "vorbis_data.h" +#include "vorbis_parser.h" #include "xiph.h" #define V_NB_BITS 8 @@ -1778,47 +1779,60 @@ 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); - if (*buf == 1 && buf_size > 7) { - if ((ret = init_get_bits8(gb, buf + 1, buf_size - 1)) < 0) - return ret; + new_extradata = (vorbis_new_extradata *)av_packet_get_side_data( + avpkt, AV_PKT_DATA_NEW_EXTRADATA, &new_extradata_size); - 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; - } + if (new_extradata) { + header = new_extradata->header; + setup = new_extradata->setup; - 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 (header && *header == 1 && new_extradata->header_size > 7) { + if ((ret = init_get_bits8( + gb, header + 1, + new_extradata->header_size - 1)) < 0) + return ret; - avctx->sample_rate = vc->audio_samplerate; - return buf_size; - } + 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; + } - if (*buf == 3 && buf_size > 7) { - av_log(avctx, AV_LOG_DEBUG, "Ignoring comment header\n"); - return buf_size; - } + 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 (*buf == 5 && buf_size > 7 && vc->channel_residues && !vc->modes) { - if ((ret = init_get_bits8(gb, buf + 1, buf_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 (setup && *setup == 5 && new_extradata->setup_size > 7 && + vc->channel_residues && !vc->modes) { + if ((ret = init_get_bits8( + gb, setup + 1, + new_extradata->setup_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 62cc2da6de..ee2e01f468 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -255,12 +255,19 @@ 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) @@ -433,7 +440,10 @@ 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; @@ -496,10 +506,57 @@ static int vorbis_packet(AVFormatContext *s, int idx) if (duration < 0) { os->pflags |= AV_PKT_FLAG_CORRUPT; return 0; - } else if (flags & VORBIS_FLAG_COMMENT) { - vorbis_update_metadata(s, idx); + } + + if (flags & VORBIS_FLAG_HEADER) { + ret = vorbis_parse_header(s, s->streams[idx], os->buf + os->pstart, os->psize); + if (ret < 0) + return ret; + + ret = av_reallocp(&os->new_extradata, sizeof(vorbis_new_extradata)); + if (ret < 0) + return ret; + + 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; + flags = 0; + skip_packet = 1; } + + if (flags & VORBIS_FLAG_SETUP) { + ret = av_reallocp(&os->new_extradata, sizeof(vorbis_new_extradata)); + if (ret < 0) + return ret; + + 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; } @@ -521,7 +578,7 @@ static int vorbis_packet(AVFormatContext *s, int idx) priv->final_duration += os->pduration; } - return 0; + return skip_packet; } 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 b7a97c90e2..1206f86c1f 100644 --- a/tests/ref/fate/ogg-vorbis-chained-meta.txt +++ b/tests/ref/fate/ogg-vorbis-chained-meta.txt @@ -6,10 +6,7 @@ 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 -- 2.39.5 (Apple Git-154) _______________________________________________ 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".