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 ESMTPS id 9989F4C593 for ; Tue, 6 May 2025 14:20:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABA9F68B63D; Tue, 6 May 2025 17:19:48 +0300 (EEST) Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90D5A68B44A for ; Tue, 6 May 2025 17:19:40 +0300 (EEST) Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-2d522f699bcso2761439fac.2 for ; Tue, 06 May 2025 07:19:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746541179; x=1747145979; 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=SAFZuFFlCqsQ2octjyRwPBtUKTOFcQc0KpxYK3aMszw=; b=F1qWJmBel0i2fqGZxdLzSFJSdwEYGddLfzMoxrhrvxgJto9cTF6Dimk24cnMOuwiGT wq05ktMuZXPz7IJVsS5hkCTxJNZcMs/Isi33dHZOhWx1tu22D+zLghf87XD2TuPPocRB 91p8cCJUkgpigV1Cv2/j1+5bXIAbHc1x9eKHyfLAyqxo/ulIExkVJbn0aTuNSFVMiJcS GUVZ0Rhn0FOgBIrxSO08i3Sxy2glYwt4ymfUhw4vBKod6bgGXdMXwYakOoVUq5O0V3W8 V3RA5VCDU9HxeJvw7dNgBnNqkEhF40FqVybr9XgDeFkhwGPRF3k5hDzGZcUXEbnIZjwM VjPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746541179; x=1747145979; 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=SAFZuFFlCqsQ2octjyRwPBtUKTOFcQc0KpxYK3aMszw=; b=HzBqe+pF4O1nHbgGcsmVH3TPv/b0AUq4pwypBNQiN1/0O7GCUKVaA/3M3yWo4HvmGF +2D0w0HXAUuhYd7elknL9uKi+g6I3I+qDr5phBk9QzauvmAgq+xG1DJ2HCoSWgL5v26W daZo/j9il8HgfsWyS98gZ0Dqb2ADz7nGhgBDUPpGxkYstHLlAiaG59XWUrOs2Vn6Ujz4 cPM7Zfz+AJXoxHQgZKFxsBLmEGYfs1XbSFjrrzbDu06FSwpqqGnO4lzc6UFD71ELvkv3 9kwTpzG9LZDnV3bO8vYRbNRlcAvkLLC5Zc5KXEA9gLg1979shZF3HQ9nXmBTdIUwDqFS uDiQ== X-Gm-Message-State: AOJu0Yz7kaXZ+GE8LKP0d1gLUU6bvat+vdCxmOP002dztPJB2VnoxeQd yfTxcVDuVMIw6u3rG+8FSLTIaekk+2HGXnF/qOqj05gARgmegUdwslXKSr7v X-Gm-Gg: ASbGncvELiscONwPbjJpkPrLPBWtJMEXgjGmbkjOiur1dV4uZzjG4elYgFY81Zu0Gg8 600oRvzCnxxY4gCsen7dItjL3KnnM8JgULQAuuukNQjpkqo0ddmk0stmax0EojWhFoROoXOKPow xiiyQd+02cDmXE8Sf9c9Mf5v/GQdbfubjIiyctmm+555p4RVlICZC062C9pDR1S6ZVYlhQs5SPd MF46rk8jMSn4nsQTUaQz1sV1JS50jb9YhuT4mvkdpscxDtPDVxKhK7VfWzxpIvloiw9IYDRO5ox kJQW2TgFeItjpHRAMIt989DXUgpzScSXcc986rWHZ4lo4R5qKUmN+jcKsrBhfszZW/P5qSN74D4 a7aWAt3NIzK9mt96GPQ== X-Google-Smtp-Source: AGHT+IF+V86SHODakqBGrKkxBjugi1/SBsGyr9GNBpTnUmDjBsk4HvbDyTOdUYQaQSfInx71IAEL4w== X-Received: by 2002:a05:6871:14a:b0:2c1:51f7:e648 with SMTP id 586e51a60fabf-2db39146fcdmr2381637fac.35.1746541178915; Tue, 06 May 2025 07:19:38 -0700 (PDT) Received: from macbookpro.lan (ip72-211-125-114.no.no.cox.net. [72.211.125.114]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-2daa12508ccsm2713442fac.43.2025.05.06.07.19.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:19:38 -0700 (PDT) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 May 2025 09:19:29 -0500 Message-Id: <20250506141932.73142-4-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250506141932.73142-1-romain.beauxis@gmail.com> References: <20250506141932.73142-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 3/6] ogg/opus: 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: --- libavformat/oggdec.c | 4 ---- libavformat/oggparseopus.c | 11 +++++++++++ tests/ref/fate/ogg-opus-chained-meta.txt | 1 - 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 9baf8040a9..5557eb4a14 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -239,10 +239,6 @@ static int ogg_replace_stream(AVFormatContext *s, uint32_t serial, char *magic, os->start_trimming = 0; os->end_trimming = 0; - /* Chained files have extradata as a new packet */ - if (codec == &ff_opus_codec) - os->header = -1; - return i; } diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c index 218e9df581..f54a9711df 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -125,6 +125,17 @@ static int opus_packet(AVFormatContext *avf, int idx) return AVERROR_INVALIDDATA; } + if (os->psize > 8 && !memcmp(packet, "OpusHead", 8)) { + if ((ret = ff_alloc_extradata(st->codecpar, os->psize)) < 0) + return ret; + + memcpy(st->codecpar->extradata, packet, os->psize); + return 1; + } + + if (os->psize > 8 && !memcmp(packet, "OpusTags", 8)) + return 1; + if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS)) { int seg, d; int duration; diff --git a/tests/ref/fate/ogg-opus-chained-meta.txt b/tests/ref/fate/ogg-opus-chained-meta.txt index fc84b8b703..addc41c1eb 100644 --- a/tests/ref/fate/ogg-opus-chained-meta.txt +++ b/tests/ref/fate/ogg-opus-chained-meta.txt @@ -13,7 +13,6 @@ Stream ID: 0, frame PTS: 3528, metadata: N/A Stream ID: 0, packet PTS: 4488, packet DTS: 4488 Stream ID: 0, frame PTS: 4488, metadata: N/A Stream ID: 0, packet PTS: -312, packet DTS: -312 -Stream ID: 0, new metadata: encoder=Lavc61.19.100 libopus;Lavc61.19.100 libopus:title=First Stream;Second Stream Stream ID: 0, frame PTS: -312, metadata: N/A Stream ID: 0, packet PTS: 648, packet DTS: 648 Stream ID: 0, frame PTS: 648, 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".