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 69BDE4BC5A for ; Mon, 28 Apr 2025 23:32:11 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C4F9568B3F9; Tue, 29 Apr 2025 02:32:00 +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 0C667687D99; Tue, 29 Apr 2025 02:31:45 +0300 (EEST) Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-2cc82edcf49so1267548fac.1; Mon, 28 Apr 2025 16:31:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745883103; x=1746487903; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5X34mASin0AUJXXvbuv/4dJGakFBXStFuhjycsrz8kY=; b=nNZrdD2+qYDKA4w00EJc/dU9N0UAFh26EWvHAe87SP5e7W0SyMRCwQ+6D7SUBEMJXv jL5yhF2I96LIbyNV4L27qEarGLichz9Jub+4Po3340XbO6951rDCrwotKAtNsurVoCkE oobGwiwVPnC2ZLvLUirIGSCvnL7xS37JV6fKq2zO18WBUBmEOa8CVaVWC3HzHtHainAO wE5rPgu9s6x2GgsO2tQa6B670Pl91EUUrP5+BlYQlZG8kUBIjHDjiW6V89+9hCIl/6wX AyuW5Z+rKIfjrJN1eXbZ1JBwvOSj4IHxI6IKvKWEi1RF+GPowCXz7XR4TqBNdlGPwuSe Afew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745883103; x=1746487903; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5X34mASin0AUJXXvbuv/4dJGakFBXStFuhjycsrz8kY=; b=Xwoyjp0KQR3p6LU9pFsY5zWpWV5ogYnbeFLmO/lDgttrgQZAP+okO/8KnoljY3ko15 fnFdmli60jBsk0kaGthvxlP6dsvIgOhGYfXRgeBWGnaEV2sQwhkkXeXM8EB8dyxbWIGo OKb3MzR38X5XZCCneCKAeuD0fCU8r4djjTSxozvBjm9k5g6+7lGkgMFM/zezk1HTeRtZ kprCsGfWnrVMvcUtS9x5FqameoeoEj5m7UOLVB50Or2Tb9mVD0SODI+I4BE+tTHsqeVW QyvU3AZ4HmEGWvZwANhEbO6/sqr5c6iFJjg5nZx3RlmW52kl08Y1rAfkrt77rwQFZJ7F La9A== X-Forwarded-Encrypted: i=1; AJvYcCXZpRo5lwcb8vEJlZVVW1fOfescC4RahrAmzSZV61SZFrfA9OFCiBQ2c4lauCObQR6zzpScQJ0SwK0Rqf5jLeU=@ffmpeg.org X-Gm-Message-State: AOJu0YybO9CeJIoa0oGnbjdU4QcKKmNfelc+c6gHm2qx7q1TIASb+rhO B558ftUh8Mv0HdwGv9L3IvWX8VRcTuUfrUJABLKGfkmW1xjuzfNd4Cd24ldm X-Gm-Gg: ASbGncvDFN+TZvBJcyKr2jjlewOF8anIM8ln3rb022cuX2Bux9PAbyxYE62m2fIdQe0 fb751uyYIy3/tcrZlKJBBwf5Re/9RM6SZ/pe/m6mbYJCpOEpIbEAVr8QIj+5LvvrFFXS01b1CMV f0fqb0cgHwDYOOm49YqzjbFwFnzGCDr7pE+4MPNWNHI4ctf2h120N+yYzjXwUKU8JGqxuKAHJzv VB+Acbzuw+0qVnFBqXRjeYReqwqi7Met5SHbK8/YI3lruhDZpinz7S23qQXyj8UJYTg8DmmCyG3 +sQ6HhcmuSyTkdoSXdDfn73xd8ycM4+ofZx6r2mni059nWbFLGdvgz1rnjZOPhhf5GA5EwBLEhp lauJqOJVYDhRMJOUtGfW6ELN/r76QFeNItA== X-Google-Smtp-Source: AGHT+IEwB1uwfWLgRbfw7j9S+fn+wUZ6Urh6EtpzWa3sTJA/2TBr1vRlfTCOOebclCsLuMkVzvY92Q== X-Received: by 2002:a05:6871:7424:b0:2d4:d07c:7cb2 with SMTP id 586e51a60fabf-2d9be546c01mr5340760fac.11.1745883102892; Mon, 28 Apr 2025 16:31:42 -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-2d973b7d7f9sm2550537fac.33.2025.04.28.16.31.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 28 Apr 2025 16:31:42 -0700 (PDT) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Apr 2025 18:31:34 -0500 Message-Id: <20250428233136.37007-1-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 0/2] Remove chained ogg stream header packets from demuxer 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: samples-request@ffmpeg.org, 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: These patches remove the ogg header packets from secondary chainged ogg streams from the demuxer. First, a test utility is added to track what is currently happening with chained streams. Then the changes are introduced: the packet demuxing function is used to explicitely tell the demuxer to skip header packets. Also, the packet demuxing functions are adapted to properly copy extra data from the new chained streams so that decoding can keep happening. The diff from the test output makes it possible to follow what the changes do to the extracted streams. Test samples are available at: https://www.dropbox.com/scl/fo/xrtrna2rxr1j354hrtymq/AGwemlxHYecBLNmQ8Fsy--4?rlkey=lzilr4m9w4gfdqygoe172vvy8&dl=0 # Changes since last version: * Fixed api-dump-stream-meta-test.c frame decoding logic * Fixed oggparsevorbis.c packet skipping logic. Romain Beauxis (2): tests: Add stream dump test API util, use it to dump stream data for chained ogg/{vorbis,opus,flac} streams. ogg/{vorbis,flac,opus}: Remove header packets from subsequent ogg streams from the demuxer output. libavformat/oggdec.c | 26 +-- libavformat/oggdec.h | 6 + libavformat/oggparseflac.c | 28 +++- libavformat/oggparseopus.c | 12 ++ libavformat/oggparsevorbis.c | 12 +- tests/Makefile | 4 + tests/api/Makefile | 2 +- tests/api/api-dump-stream-meta-test.c | 182 +++++++++++++++++++++ tests/fate/ogg-flac.mak | 11 ++ tests/fate/ogg-opus.mak | 11 ++ tests/fate/ogg-vorbis.mak | 11 ++ tests/ref/fate/ogg-flac-chained-meta.txt | 10 ++ tests/ref/fate/ogg-opus-chained-meta.txt | 26 +++ tests/ref/fate/ogg-vorbis-chained-meta.txt | 14 ++ 14 files changed, 338 insertions(+), 17 deletions(-) create mode 100644 tests/api/api-dump-stream-meta-test.c create mode 100644 tests/fate/ogg-flac.mak create mode 100644 tests/fate/ogg-opus.mak create mode 100644 tests/fate/ogg-vorbis.mak create mode 100644 tests/ref/fate/ogg-flac-chained-meta.txt create mode 100644 tests/ref/fate/ogg-opus-chained-meta.txt create mode 100644 tests/ref/fate/ogg-vorbis-chained-meta.txt -- 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".