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 E46B64D26C for ; Wed, 19 Feb 2025 05:25:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A909B68C0D2; Wed, 19 Feb 2025 07:25:11 +0200 (EET) Received: from mail-yw1-f179.google.com (mail-yw1-f179.google.com [209.85.128.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C21868C0D4 for ; Wed, 19 Feb 2025 07:25:08 +0200 (EET) Received: by mail-yw1-f179.google.com with SMTP id 00721157ae682-6f6715734d9so55320007b3.3 for ; Tue, 18 Feb 2025 21:25:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739942707; x=1740547507; 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=nuPzXxodXu/OlFqLGZKkSp4jcwgffSToQjj+2y7PS5E=; b=ja1e+qPdanGzIGsfJnd3cWTBso/9z7hOL108rc85KyiZT+9EubokubXwEP8+035kt7 QFEW5tq3FvcZ4/lXpHNOatzLgN9S7alImBh4BrDUH1O/T2ZeX6ndwsxbVbZXlKDSdQpI VKrH5btRI45ZZpbxM2z667rQuNfIQUmc3ciWfVi5zJED4zxxZiVZi0FFKn7Hxyo4RxrJ IB4vNknUNVsAkt6cJY0aN4HHFbMOlNxDq4On32tsZezyYeHpPuNZd7u4z/SNMCLaB+6O oXAH0QimoBJLBI423FejcTWeenXl1bG7CKIAr7FVZFLXQ8N36EtA4Aps0K0fHYpUA8LZ pSIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739942707; x=1740547507; 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=nuPzXxodXu/OlFqLGZKkSp4jcwgffSToQjj+2y7PS5E=; b=sARGA+h3nn6qwSq5hLlkNDy/Ze35sOVQdUL9d3b6YYs3FBiOSN7JPA4MSf9HsUMeaX TUHsEshVoAI9muTzrm38EZ/LsMhJBB1dRevL4ALyXPhWv3/9bgKYkwSRTdydl1BmPX4K 5n4wH+lFX/z6PCNbl2TRUJxt1igEFfesftoeEVq/adGIB7IAT57GO6D9RvXWeqGZiAHq my/grefMyOdT23wIB2u8tuQ6igBFRQ1zstu10dTD55IVRomsaE/ogz5Bj9z+K58otony Jb50NprpDiBmpwF7yufaTSjjL/rd4M8imlQvBEvFhocoenECdzh6CaCw/RSf4cXIQmJ4 dPRQ== X-Gm-Message-State: AOJu0YyFIZ1XhEU5NKTsS+jqsAXaEe0luu/J2o26qopq8UbOh8mRe519 oQqqGUTwjMXOz42yd+Lq0LEZn8izgUVwv1WQY/EikyEia/9HTzOpRqZ8Og== X-Gm-Gg: ASbGncv0yv6W+BGogCqSKDSkxx7GZ3N+eSEjH95OFgpkKYiRGQqiEjf9C4BXL231L4V 4f+EpX5/Myt44OuceeEmsniqapdTQ6FtPkIc7CjEpjNlvGTYc09U4DQMM0PQ12pX5hWtzi9Fk5K 26bWqbwVb94etUWcasieLBOxqPDcNOguhG+lv6TnQwrr9e/TxPf2cVy7J/Gqd6Y0W94fa/erfA7 Skm3t9W3CAlLTUwOhVAJg6DaD/HHCot1EYh125vfu6ql3dow+d5uzFqeubiT/5RhDWOL8QsRxWA AgbE+n0+//DDTsIO2geviitGLZTGZNuFP3bPg+h57asq1g8Wnx/D X-Google-Smtp-Source: AGHT+IFxT0vTU8w25GubPIDNk/ctpHV81FcsA7+8+F7pMPNahDrtifv1b9t0NoNYsmSLL0Zyd4ob/Q== X-Received: by 2002:a05:690c:480a:b0:6f7:ae31:fdf with SMTP id 00721157ae682-6fb58293a79mr140699987b3.12.1739942706798; Tue, 18 Feb 2025 21:25:06 -0800 (PST) Received: from localhost.localdomain ([2607:fb91:fe2:71a6:2854:c007:54e:fca]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6fb5a15f082sm20783537b3.54.2025.02.18.21.25.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Feb 2025 21:25:05 -0800 (PST) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Feb 2025 23:24:40 -0600 Message-Id: <20250219052445.86383-5-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250219052445.86383-1-romain.beauxis@gmail.com> References: <20250219052445.86383-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 4/9] tests: Add chained ogg/vorbis stream dump test. 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: Samples available at: https://www.dropbox.com/scl/fo/xrtrna2rxr1j354hrtymq/AGwemlxHYecBLNmQ8Fsy--4?rlkey=lzilr4m9w4gfdqygoe172vvy8&dl=0 Before the changes: Stream ID: 0, codec name: vorbis, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream Stream ID: 0, packet PTS: 128, packet DTS: 128, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream Stream ID: 0, frame PTS: 128, metadata: Stream ID: 0, packet PTS: 704, packet DTS: 704, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream Stream ID: 0, frame PTS: 704, metadata: Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis:title=First Stream;Second Stream;Second Stream Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis:title=First Stream;Second Stream;Second Stream Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis:title=First Stream;Second Stream;Second Stream Stream ID: 0, frame PTS: 0, metadata: Stream ID: 0, packet PTS: 128, packet DTS: 128, metadata: encoder=Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis:title=First Stream;Second Stream;Second Stream Stream ID: 0, frame PTS: 128, metadata: Stream ID: 0, packet PTS: 704, packet DTS: 704, metadata: encoder=Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis:title=First Stream;Second Stream;Second Stream Stream ID: 0, frame PTS: 704, metadata: After the changes: Stream ID: 0, codec name: vorbis, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream Stream ID: 0, packet PTS: 128, packet DTS: 128, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream Stream ID: 0, frame PTS: 128, metadata: Stream ID: 0, packet PTS: 704, packet DTS: 704, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream Stream ID: 0, frame PTS: 704, metadata: Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream Stream ID: 0, frame PTS: 0, metadata: Stream ID: 0, packet PTS: 128, packet DTS: 128, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream Stream ID: 0, frame PTS: 128, metadata: Stream ID: 0, packet PTS: 704, packet DTS: 704, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream Stream ID: 0, frame PTS: 704, metadata: --- tests/Makefile | 1 + tests/api/api-dump-stream-meta-test.c | 14 ++++++++++---- tests/fate/ogg-vorbis.mak | 11 +++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 tests/fate/ogg-vorbis.mak diff --git a/tests/Makefile b/tests/Makefile index 1f7e5003c2..cffa586e8d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -219,6 +219,7 @@ include $(SRC_PATH)/tests/fate/mpeg4.mak include $(SRC_PATH)/tests/fate/mpegps.mak include $(SRC_PATH)/tests/fate/mpegts.mak include $(SRC_PATH)/tests/fate/mxf.mak +include $(SRC_PATH)/tests/fate/ogg-vorbis.mak include $(SRC_PATH)/tests/fate/oma.mak include $(SRC_PATH)/tests/fate/opus.mak include $(SRC_PATH)/tests/fate/pcm.mak diff --git a/tests/api/api-dump-stream-meta-test.c b/tests/api/api-dump-stream-meta-test.c index 4ffdfe8213..10570fa495 100644 --- a/tests/api/api-dump-stream-meta-test.c +++ b/tests/api/api-dump-stream-meta-test.c @@ -36,6 +36,7 @@ static int dump_stream_meta(const char *input_filename) AVFormatContext *fmt_ctx = NULL; AVCodecContext *ctx = NULL; AVCodecParameters *origin_par = NULL; + AVStream *st; int audio_stream; int result; char *metadata; @@ -62,9 +63,9 @@ static int dump_stream_meta(const char *input_filename) } origin_par = fmt_ctx->streams[audio_stream]->codecpar; + st = fmt_ctx->streams[audio_stream]; - result = av_dict_get_string( - fmt_ctx->streams[audio_stream]->metadata, &metadata, '=', ':'); + result = av_dict_get_string(st->metadata, &metadata, '=', ':'); if (result < 0) goto end; @@ -121,8 +122,13 @@ static int dump_stream_meta(const char *input_filename) continue; } - printf("Stream ID: %d, packet PTS: %s, packet DTS: %s\n", - pkt->stream_index, av_ts2str(pkt->pts), av_ts2str(pkt->dts)); + result = av_dict_get_string(st->metadata, &metadata, '=', ':'); + if (result < 0) + goto end; + + printf("Stream ID: %d, packet PTS: %s, packet DTS: %s, metadata: %s\n", + pkt->stream_index, av_ts2str(pkt->pts), av_ts2str(pkt->dts), + metadata); result = avcodec_send_packet(ctx, pkt); av_packet_unref(pkt); diff --git a/tests/fate/ogg-vorbis.mak b/tests/fate/ogg-vorbis.mak new file mode 100644 index 0000000000..55052fe3d1 --- /dev/null +++ b/tests/fate/ogg-vorbis.mak @@ -0,0 +1,11 @@ +FATE_OGG_VORBIS += fate-ogg-vorbis-chained-meta +fate-ogg-vorbis-chained-meta: REF = $(SAMPLES)/ogg-vorbis/chained-meta.txt +fate-ogg-vorbis-chained-meta: CMD = $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-vorbis/chained-meta.ogg + +FATE_OGG_VORBIS-$(call DEMDEC, OGG, VORBIS) += $(FATE_OGG_VORBIS) + +FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_VORBIS-yes) + +FATE_EXTERN += $(FATE_OGG_VORBIS-yes) + +fate-ogg-vorbis: $(FATE_OGG_VORBIS-yes) -- 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".