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 91D774AADA for ; Wed, 29 Jan 2025 14:43:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 026B968BB1E; Wed, 29 Jan 2025 16:43:36 +0200 (EET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D54468AF37 for ; Wed, 29 Jan 2025 16:43:30 +0200 (EET) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-437a92d7b96so70899705e9.2 for ; Wed, 29 Jan 2025 06:43:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738161808; x=1738766608; 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=nOURLn8cVJlWUhjUwWbzAGiI1/Eage/NiFuY4aOe3SU=; b=OGGRsp4JxKzI/Q0rpnECGPflXpIt2fUvybtGIAF4L7M6cHMPCMnpQ+9LELUsgm8RXb a8K6eQsEYP12HowrkVi28e7P+1ukOPE1yM03upaqph6B0zzNkRDrZ8KJuXS5zLyWvCi2 Nv3MEeRm1KygkfnObzA0ePMyVipZNsVpQiwxSJRUbW8jf6GviHr/n1gVtb6sEfJJ5Xob smYiH7N5rLmQo0+pUSIDOH0Jx96jjTOYxYPR10p/h7i6bnrjNAPiMqp3oz4t6wIOEkqy Pw5pN+7wFELmMS0jWbbFGP1ltKq1fqpvXBfGzYCxDGQcp0Sj6/LQ5ZaWXho5uXs4N1S7 Zgsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738161808; x=1738766608; 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=nOURLn8cVJlWUhjUwWbzAGiI1/Eage/NiFuY4aOe3SU=; b=ZwBWUhQk9zzrrPrkQhf0xhiooSmSBhi+0JCexqFKM1jmAoh13Y8H2UdrpLNoUkrTB0 4Qblkz75lX8hENKiorun0qvfPkcmmtc3AVRpWBWXqeMV0uSBpTtXEahOk+MFKKU83auA iA2p0KTdtW3FMTOmSlS9eyWcN9cJz+hNmFM/xKlH44s54Gw7aof0vwIbRV3/EiEfv2fQ hYYpkVgCGfQZYbgAgJv/Xd62SAF1GxhWVDmgUoolqAGB1x6p/BYfdUw7Le1HfhoOtcmo 5/ZuFgn98XrPZ4ydAQNr5KD3U8PLOcPavoKW6WbQMPqE6Opjh8jdDQL/Q0QloApo84E2 yPzg== X-Gm-Message-State: AOJu0YwZN8k5NUXhXjiA4EilA8jOYE+K9zW90jt/oxxw3vlM8NQMUab2 djFHjK8X8zxx9Z11gnWONeIGrAoXgxTNWdwwb17mcoeTsUXICOI5aLkG9aYq5sE= X-Gm-Gg: ASbGnctyCrN3cZ2wNmLSHyyOZcyr3qASSYt7ZaVq5V7dnU+hU72Nid3hGt7ZDdJ5rxa 3OPBRPVqRp4oCy6hrotqZYqwc/DY/EfZ9dcajDJhEw8Zs3cfrQRGOo4C8fC4DhKKyF0hQNYLw86 M/cnm7ckgQWILrsb6CaBPwuh8AdjNPtMNngR+SPgZC0oqMriuD+stHXgr7Gw6eiZZMurzoN4DKL NYwKEYDPgsnqNvzK97Q0HUFM2phd7MImxmqLyAoh07iPVnJRU7G6vzwpNvyYOzg3DoPbxTfFmFq eeuz7tReNxD9Rf3/a7X+xsruBhUgnkUu37bQc1ud/yL5b6Dza2dZ3LKN61cDExQwXGMtUZuDA0R 2Ho3dn6mUrgNPVUMYGrYXRtdf X-Google-Smtp-Source: AGHT+IGBWE2VO4+EWGW6EHoTcIxKDAlXqzvHLdSccF0OxZ4Ox/1WRd2nESkrBfFEUHGUH3LeB/TEdQ== X-Received: by 2002:a05:600c:4fd6:b0:434:ff30:a159 with SMTP id 5b1f17b1804b1-438dc3360b9mr31121995e9.0.1738161808186; Wed, 29 Jan 2025 06:43:28 -0800 (PST) Received: from mac.home (2a01cb0013c69e0054b75c70b01aef22.ipv6.abo.wanadoo.fr. [2a01:cb00:13c6:9e00:54b7:5c70:b01a:ef22]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438dcc23e91sm25205795e9.12.2025.01.29.06.43.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Jan 2025 06:43:27 -0800 (PST) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Jan 2025 15:40:02 +0100 Message-Id: <20250129144000.53579-2-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250129144000.53579-1-romain.beauxis@gmail.com> References: <20250129144000.53579-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 2/2] Add stream dump test with test for ogg/flac. 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: This patch adds a fate test for ogg/flac chained streams. First, a new api-dump-stream-meta-test utility is introduced then it is used to dump the metadata of a ogg/flac chained sample. Sample is available here: https://www.dropbox.com/scl/fo/fxt2edwkyj2mjc9qubku5/AICHxJyxMMAK8MIJqWLcvk4?rlkey=mlt12lsu741ejukz0p5qtn9rq&dl=0 Sample is very short so the dump output is: Stream ID: 0, PTS: 0, DTS: 0, metadata: encoder=Lavc61.19.100 flac:title=First Stream Stream ID: 0, PTS: 4608, DTS: 4608, metadata: encoder=Lavc61.19.100 flac:title=First Stream Stream ID: 0, PTS: 0, DTS: 0, metadata: encoder=Lavc61.19.100 flac:title=Second Stream Stream ID: 0, PTS: 4608, DTS: 4608, metadata: encoder=Lavc61.19.100 flac:title=Second Stream --- tests/Makefile | 2 + tests/api/Makefile | 2 +- tests/api/api-dump-stream-meta-test.c | 88 +++++++++++++++++++++++++++ tests/fate/api.mak | 5 ++ tests/fate/ogg-flac.mak | 11 ++++ 5 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 tests/api/api-dump-stream-meta-test.c create mode 100644 tests/fate/ogg-flac.mak diff --git a/tests/Makefile b/tests/Makefile index f9f5fc07f3..66e5189e6d 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-flac.mak include $(SRC_PATH)/tests/fate/oma.mak include $(SRC_PATH)/tests/fate/opus.mak include $(SRC_PATH)/tests/fate/pcm.mak @@ -277,6 +278,7 @@ $(FATE_FFPROBE) $(FATE_FFMPEG_FFPROBE) $(FATE_SAMPLES_FFPROBE) $(FATE_SAMPLES_FF $(FATE_SAMPLES_FASTSTART): tools/qt-faststart$(EXESUF) $(FATE_SAMPLES_DUMP_DATA) $(FATE_SAMPLES_DUMP_DATA-yes): tools/venc_data_dump$(EXESUF) $(FATE_SAMPLES_SCALE_SLICE): tools/scale_slice_test$(EXESUF) +$(FATE_SAMPLES_DUMP_STREAM_META): tests/api/api-dump-stream-meta-test$(EXESUF) ifdef SAMPLES FATE += $(FATE_EXTERN) diff --git a/tests/api/Makefile b/tests/api/Makefile index c96e636756..a2cb06a729 100644 --- a/tests/api/Makefile +++ b/tests/api/Makefile @@ -1,7 +1,7 @@ APITESTPROGS-$(call ENCDEC, FLAC, FLAC) += api-flac APITESTPROGS-$(call DEMDEC, H264, H264) += api-h264 APITESTPROGS-$(call DEMDEC, H264, H264) += api-h264-slice -APITESTPROGS-yes += api-seek +APITESTPROGS-yes += api-seek api-dump-stream-meta APITESTPROGS-$(call DEMDEC, H263, H263) += api-band APITESTPROGS-$(HAVE_THREADS) += api-threadmessage APITESTPROGS += $(APITESTPROGS-yes) diff --git a/tests/api/api-dump-stream-meta-test.c b/tests/api/api-dump-stream-meta-test.c new file mode 100644 index 0000000000..d750e0aecb --- /dev/null +++ b/tests/api/api-dump-stream-meta-test.c @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2025 Romain Beauxis + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * Dump stream metadata + */ + +#include "libavformat/avformat.h" + +static int dump_stream_meta(const char *input_filename) +{ + AVPacket *pkt = NULL; + AVFormatContext *fmt_ctx = NULL; + int result; + char *metadata; + + result = avformat_open_input(&fmt_ctx, input_filename, NULL, NULL); + if (result < 0) { + av_log(NULL, AV_LOG_ERROR, "Can't open file\n"); + return result; + } + + result = avformat_find_stream_info(fmt_ctx, NULL); + if (result < 0) { + av_log(NULL, AV_LOG_ERROR, "Can't get stream info\n"); + goto end; + } + + pkt = av_packet_alloc(); + if (!pkt) { + av_log(NULL, AV_LOG_ERROR, "Cannot allocate packet\n"); + result = AVERROR(ENOMEM); + goto end; + } + + for (;;) { + result = av_read_frame(fmt_ctx, pkt); + if (result) + goto end; + + result = av_dict_get_string( + fmt_ctx->streams[pkt->stream_index]->metadata, &metadata, '=', ':'); + if (result < 0) + goto end; + + printf("Stream ID: %d, PTS: %lld, DTS: %lld, metadata: %s\n", + pkt->stream_index, pkt->pts, pkt->dts, metadata); + av_free(metadata); + av_packet_unref(pkt); + } + +end: + av_packet_free(&pkt); + avformat_close_input(&fmt_ctx); + return result; +} + +int main(int argc, char **argv) +{ + if (argc < 2) { + av_log(NULL, AV_LOG_ERROR, "Incorrect input\n"); + return 1; + } + + if (dump_stream_meta(argv[1]) != AVERROR_EOF) + return 1; + + return 0; +} diff --git a/tests/fate/api.mak b/tests/fate/api.mak index d2868e57ac..a9872a5589 100644 --- a/tests/fate/api.mak +++ b/tests/fate/api.mak @@ -1,3 +1,8 @@ +FATE_API_LIBAVFORMAT-$(call ENCDEC, FLAC, FLAC) += api-dump-stream-meta +fate-api-ogg-flac-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) +fate-api-ogg-flac-meta: CMD = run $(APITESTSDIR)/api-flac-test$(EXESUF) +fate-api-ogg-flac-meta: CMP = null + FATE_API_LIBAVCODEC-$(call ENCDEC, FLAC, FLAC) += fate-api-flac fate-api-flac: $(APITESTSDIR)/api-flac-test$(EXESUF) fate-api-flac: CMD = run $(APITESTSDIR)/api-flac-test$(EXESUF) diff --git a/tests/fate/ogg-flac.mak b/tests/fate/ogg-flac.mak new file mode 100644 index 0000000000..22e2030534 --- /dev/null +++ b/tests/fate/ogg-flac.mak @@ -0,0 +1,11 @@ +FATE_OGG_FLAC += fate-ogg-flac-chained-meta +fate-ogg-flac-chained-meta: REF = $(SAMPLES)/ogg-flac/chained-meta.txt +fate-ogg-flac-chained-meta: CMD = $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-flac/chained-meta.ogg + +FATE_OGG_FLAC-$(call DEMDEC, OGG, FLAC) += $(FATE_OGG_FLAC) + +FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_FLAC-yes) + +FATE_EXTERN += $(FATE_OGG_FLAC-yes) + +fate-ogg-flac: $(FATE_OGG_FLAC-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".