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 6E76C4BEB8 for ; Tue, 4 Feb 2025 12:32:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 80F6E68B806; Tue, 4 Feb 2025 14:32:24 +0200 (EET) Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C5D368B7B5 for ; Tue, 4 Feb 2025 14:32:18 +0200 (EET) Received: by mail-qv1-f49.google.com with SMTP id 6a1803df08f44-6d92e457230so50238426d6.1 for ; Tue, 04 Feb 2025 04:32:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738672336; x=1739277136; 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=HkoPbbRQiyujR7p0t9MwiG59om0plQ58zTYpnA3qbw4=; b=kKtLb6Ge53ON1aATLHnUVeDmTHKiJ/0gbv7Nu/6lPAIqs53s87V3367YR63xcLrP9/ 2xbpayIB08G7SOpISGbes9lcaCR4eEELkMb6RN1qvb9RY7Mqe/lgFFshsCGOreILm+3A Jr/i9R17Gco912FebLW7gGtaE0AFkmvB1vvkHWYaY4t3IjszpNSmPkTfCA5ur6b33ftT ueoUsejccclI09KW4Dfr9WKdrcbKX9r1YpWWNIymyYWcJ/qMMdDOdu7EidEOgSMijwKa Y8hFp9uCRoRv7XicGWbqRFQbFYWtlMPJSK/OG+kqI8/9REXbD3tFovU+EqIqRI2mhD4v pJ9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738672336; x=1739277136; 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=HkoPbbRQiyujR7p0t9MwiG59om0plQ58zTYpnA3qbw4=; b=UIIfbesRmj8t7HdrztC/R8FNm3k7Idsa2zLKXrG9R7/CKztzoSepHCZP2SEl5Tc+8e 9+emgXdZR5DnEGmTquFdR1lr+hWKdTCMK4keZHcMNX/zWQK1cHPue83eVFVQCyyJi1I/ oitouyUEmgeaY5VTIL8ajsE4kgYcGJj+xiuUOeVOy854fQ2vbNMzHTZXdTWCoKQ8odqj 8uJwFqEChXHTZ5CchDNALmnuB4tkm3i54EtGsJIYc573C8le4dD3lFYJUE4DUGQflbJ2 zalBo92QB4wc/g74MEsDV7iLrcZUAL9s+0GsMGnseL0/GVwIbgjLNBF1RT+KKubHfDZc KBfw== X-Gm-Message-State: AOJu0YyzE414zPjE3x66xE3oUsUNkmehhQy2T9jvRe1gfcabqUiuylOn 4kcDNy301oWFKcoCNv7phH7FIXY+hrKFwRwIdGxVUgoYf/+Vu9EOLIHLzUpTLmG2ew== X-Gm-Gg: ASbGnctoqcjFDbi/DHCVEBAmKJT5Ff4jZmSY2BDLI1RHTstWPZvjk5+r30EhWmeKz+j kwKGpWFsIwDY47QeC1vnJEhNWfslTuwBuK4zsn3dnCTv73TOx2t2oaJN9+dKi6yOxNN6u8CTmkb lZekp1RV5caUA/vv668lB1x5IWBRkUh5m/5Qis0a6mcFU35+CyUBzdT3Q0ZASa+pKL0CQKyyR/E pDapCLUVMsdi9+xKQiuahM+2XivhxXxZTVJD1XVGG1dXrdgYH/EFTwJ45pvxRN8jc8jdfjSi3Cu uuUBUt1dHUDK7W4Vv+AvuTt4ftXLCavW4ubqHtqE5EV9q5XcydpI9tDUmH/uUSZEOBa66ho= X-Google-Smtp-Source: AGHT+IG3PnniUbOJdzzVUo1mU2hx5gHW1/Tua8cTId01gStY0oAUyDpVk9pfmmiELv9ZifVhbnzwpA== X-Received: by 2002:a05:6214:411c:b0:6d8:7fe2:8b31 with SMTP id 6a1803df08f44-6e243bf7fabmr414495786d6.23.1738672336118; Tue, 04 Feb 2025 04:32:16 -0800 (PST) Received: from localhost.localdomain ([148.59.171.204]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e2547f2c78sm61366766d6.6.2025.02.04.04.32.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Feb 2025 04:32:15 -0800 (PST) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Feb 2025 07:31:45 -0500 Message-Id: <20250204123145.53059-3-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250204123145.53059-1-romain.beauxis@gmail.com> References: <20250204123145.53059-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: epirat07@gmail.com, 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 is the new FATE test. Test samples are available here: https://www.dropbox.com/scl/fo/fxt2edwkyj2mjc9qubku5/AICHxJyxMMAK8MIJqWLcvk4?rlkey=mlt12lsu741ejukz0p5qtn9rq&dl=0 Output prior to the changes is: Stream ID: 0, codec name: flac, metadata: encoder=Lavc61.19.100 flac:title=First Stream Stream ID: 0, packet PTS: 0, packet DTS: 0 Stream ID: 0, frame PTS: 0, metadata: Stream ID: 0, packet PTS: 4608, packet DTS: 4608 Stream ID: 0, frame PTS: 4608, metadata: Stream ID: 0, packet PTS: 0, packet DTS: 0 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: Stream ID: 0, packet PTS: 4608, packet DTS: 4608 Stream ID: 0, frame PTS: 4608, metadata: Output after the changes: Stream ID: 0, codec name: flac, metadata: encoder=Lavc61.19.100 flac:title=First Stream Stream ID: 0, packet PTS: 0, packet DTS: 0 Stream ID: 0, frame PTS: 0, metadata: Stream ID: 0, packet PTS: 4608, packet DTS: 4608 Stream ID: 0, frame PTS: 4608, metadata: Stream ID: 0, packet PTS: 0, packet DTS: 0 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: encoder=Lavc61.19.100 flac:title=Second Stream Stream ID: 0, packet PTS: 4608, packet DTS: 4608 Stream ID: 0, frame PTS: 4608, metadata: --- tests/Makefile | 2 + tests/api/Makefile | 2 +- tests/api/api-dump-stream-meta-test.c | 169 ++++++++++++++++++++++++++ tests/fate/api.mak | 5 + tests/fate/ogg-flac.mak | 11 ++ 5 files changed, 188 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..4ffdfe8213 --- /dev/null +++ b/tests/api/api-dump-stream-meta-test.c @@ -0,0 +1,169 @@ +/* + * 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 "libavcodec/avcodec.h" +#include "libavformat/avformat.h" +#include "libavutil/timestamp.h" + +static int dump_stream_meta(const char *input_filename) +{ + const AVCodec *codec = NULL; + AVPacket *pkt = NULL; + AVFrame *fr = NULL; + AVFormatContext *fmt_ctx = NULL; + AVCodecContext *ctx = NULL; + AVCodecParameters *origin_par = NULL; + int audio_stream; + 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; + } + + // TODO: add ability to work with video format + audio_stream = + av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_AUDIO, -1, -1, NULL, 0); + if (audio_stream < 0) { + av_log(NULL, AV_LOG_ERROR, "Can't find audio stream in input file\n"); + result = audio_stream; + goto end; + } + + origin_par = fmt_ctx->streams[audio_stream]->codecpar; + + result = av_dict_get_string( + fmt_ctx->streams[audio_stream]->metadata, &metadata, '=', ':'); + if (result < 0) + goto end; + + printf("Stream ID: %d, codec name: %s, metadata: %s\n", audio_stream, + avcodec_get_name(origin_par->codec_id), metadata); + + codec = avcodec_find_decoder(origin_par->codec_id); + if (!codec) { + av_log(NULL, AV_LOG_ERROR, "Can't find decoder\n"); + result = AVERROR_DECODER_NOT_FOUND; + goto end; + } + + ctx = avcodec_alloc_context3(codec); + if (!ctx) { + av_log(NULL, AV_LOG_ERROR, "Can't allocate decoder context\n"); + result = AVERROR(ENOMEM); + goto end; + } + + result = avcodec_parameters_to_context(ctx, origin_par); + if (result) { + av_log(NULL, AV_LOG_ERROR, "Can't copy decoder context\n"); + goto end; + } + + result = avcodec_open2(ctx, codec, NULL); + if (result < 0) { + av_log(ctx, AV_LOG_ERROR, "Can't open decoder\n"); + goto end; + } + + pkt = av_packet_alloc(); + if (!pkt) { + av_log(NULL, AV_LOG_ERROR, "Cannot allocate packet\n"); + result = AVERROR(ENOMEM); + goto end; + } + + fr = av_frame_alloc(); + if (!fr) { + av_log(NULL, AV_LOG_ERROR, "Can't allocate frame\n"); + result = AVERROR(ENOMEM); + goto end; + } + + for (;;) { + result = av_read_frame(fmt_ctx, pkt); + if (result) + goto end; + + if (pkt->stream_index != audio_stream) { + av_packet_unref(pkt); + continue; + } + + printf("Stream ID: %d, packet PTS: %s, packet DTS: %s\n", + pkt->stream_index, av_ts2str(pkt->pts), av_ts2str(pkt->dts)); + + result = avcodec_send_packet(ctx, pkt); + av_packet_unref(pkt); + + if (result < 0) + goto end; + + result = avcodec_receive_frame(ctx, fr); + if (result == AVERROR_EOF) { + result = 0; + goto end; + } + + if (result == AVERROR(EAGAIN)) + continue; + + result = av_dict_get_string(fr->metadata, &metadata, '=', ':'); + if (result < 0) + goto end; + + printf("Stream ID: %d, frame PTS: %s, metadata: %s\n", + pkt->stream_index, av_ts2str(fr->pts), metadata); + } + +end: + av_packet_free(&pkt); + av_frame_free(&fr); + avformat_close_input(&fmt_ctx); + avcodec_free_context(&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".