From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 655114CFB3 for ; Tue, 12 Aug 2025 15:32:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 43C9F68CC79; Tue, 12 Aug 2025 18:32:31 +0300 (EEST) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id ABB0968B80B for ; Tue, 12 Aug 2025 18:32:24 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-76bddb92dc1so7068757b3a.0 for ; Tue, 12 Aug 2025 08:32:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755012742; x=1755617542; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=XEQ3m8n+eHq/d4rDvSjJpP1CxLgPnt+HnQrxrZgwFuA=; b=bvhihGqn706uXqXuBeuYWM0+1LifLtIYK2hD4MIwJdVH6GUx1USZFLkJ+x8qC3U+8C dsomj9/k0xLrVGNOZsJPRQolATlKDotdfeIcLDIdNuZoGEvdgC4PT12fqDT5LV+xgyew n/6MErXw8n0frX9eL6R1cRwpKaW3Ki3ZOvFGMddFZBLM6MwOThCtBdh3+s6cTfnDTuDy dwdBce02X0jx9ODqVDHX5oxh3pFBOom50KXTBoyI+jdt+BnqtFiDfpBGkq9PebCwbxJV C/xVS0TOAse0WyNzB6rM8w7n+W/JCcEBGTWrxZ4ho6tZmXJ8IzdZ/LhqLSWrTTpg8dnw 4juQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755012742; x=1755617542; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XEQ3m8n+eHq/d4rDvSjJpP1CxLgPnt+HnQrxrZgwFuA=; b=Y1WEFFDytFwlXilvBkF4BinBA+PkPhlH/yaYJXz6RXDXNOlMMOhBn08hIaDD7zPojB wh7yBVVgOdrDhwUqgjfsIkQuuH2QdwndUu6H3FKh4ZAh29OddxeHxrqe0dNBtDTTDf2+ OSU3PyeQjSFPmFfNNAb3l4UiQ0dYqpjjfWE76HR75XZp4UT5e/lBzF4AS+eKHUNei+A1 A2BCUxu1gpu2Kr7YNhMfmjjtgXgSwMC1c7N8i2hwPq+DgT6A5wK3te2eazWNCUxZUzUt Z0RIe8lQtwEl7dicRxsdInKYPt/4FxvQNrf2V8Yt1twHnLKBAN2RrIrnNEw1E+5eR039 mU5w== X-Gm-Message-State: AOJu0YwdkopHfpr0Jb2QXNFl3urUbWD4kr6GjzOAUrrKrFM9duJ777Kd GdRZeMWFlYQXvfe4QVh1ybwaw/5C5UdiNngIGvcwKfb83tx2nx6f31WX/4g0Og== X-Gm-Gg: ASbGncs57+W0Q3faE3u35n+dCgVgaEy/mgYhhNetrFTdgWEzqZ59aqBiHXDx1IlOKfq G4pGISZ+1pXKUfErcDMbgUVYMmLhroPxyXLJ4Omm230s3RXvp2UTmo6hbftnRaF5oKqxF1eroac cPZWqA12XtyaDvXhCyC+AC8T4dpZJEb9auS9qDe7v+a/WPTZo+bLe6NKIfntk0xCE7G6I5Qv84i k1lNA3nhYbrCUkK6SHAH+Oxl7KThWxG1zPlqh9G8eJwHCe17nlGXdZ0ub66rg/APhdWQfomgoB1 u2wd8BKVxUPeMLw2H0Lcq/u9HpCKk8qsVZBMRw1o7vw2R3FyhO7n7et+1dUVfWUZK0lvo03ROsQ 3eQGsaBRMDUBk5VHZxIKBTZqeUNQDIa0= X-Google-Smtp-Source: AGHT+IHaNQVhjmJnFp3UUrYOqQP9bQZgRoDX68cd22nuWmlZGORHHkN8LdvfyxwkiDBB9hA8z7FIUg== X-Received: by 2002:a05:6a00:3cce:b0:74e:ac5b:17ff with SMTP id d2e1a72fcca58-76e0df6cef3mr5868899b3a.13.1755012741787; Tue, 12 Aug 2025 08:32:21 -0700 (PDT) Received: from Gryph ([2800:2121:b000:82e:9430:c1f5:69ea:fa5c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76bd1d4e312sm28902600b3a.17.2025.08.12.08.32.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Aug 2025 08:32:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Aug 2025 12:32:17 -0300 Message-ID: <20250812153217.9438-1-jamrial@gmail.com> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] testa/fate/cbs: move redundant_pps tests to the proper location 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 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: cbs.mak is meant to contain tests strictly for the CBS framework, not for any bsf that happens to use it under the hood. Signed-off-by: James Almer --- tests/fate/cbs.mak | 40 +------------------ tests/fate/h264.mak | 17 ++++++++ ...s-annexb => h264-bsf-redundant-pps-annexb} | 4 +- ...ant_pps-mov => h264-bsf-redundant-pps-mov} | 4 +- ..._data => h264-bsf-redundant-pps-side-data} | 4 +- ...ata2 => h264-bsf-redundant-pps-side-data2} | 4 +- 6 files changed, 27 insertions(+), 46 deletions(-) rename tests/ref/fate/{h264_redundant_pps-annexb => h264-bsf-redundant-pps-annexb} (99%) rename tests/ref/fate/{h264_redundant_pps-mov => h264-bsf-redundant-pps-mov} (97%) rename tests/ref/fate/{h264_redundant_pps-side_data => h264-bsf-redundant-pps-side-data} (86%) rename tests/ref/fate/{h264_redundant_pps-side_data2 => h264-bsf-redundant-pps-side-data2} (68%) diff --git a/tests/fate/cbs.mak b/tests/fate/cbs.mak index a4512355bf..d6a576b322 100644 --- a/tests/fate/cbs.mak +++ b/tests/fate/cbs.mak @@ -101,44 +101,8 @@ $(foreach N,$(FATE_CBS_DISCARD_TYPES),$(eval $(call FATE_CBS_DISCARD_TEST,h264,$ FATE_CBS_H264-$(call ALLYES, MOV_DEMUXER H264_MUXER H264_PARSER FILTER_UNITS_BSF H264_METADATA_BSF) += $(FATE_CBS_h264_DISCARD) - -FATE_H264_REDUNDANT_PPS-$(call REMUX, H264, MOV_DEMUXER H264_REDUNDANT_PPS_BSF \ - H264_DECODER H264_PARSER RAWVIDEO_ENCODER) \ - += fate-h264_redundant_pps-mov -fate-h264_redundant_pps-mov: CMD = transcode \ - mov $(TARGET_SAMPLES)/mov/frag_overlap.mp4 h264 \ - "-map 0:v -c copy -bsf h264_redundant_pps" - -# This file has changing pic_init_qp_minus26. -FATE_H264_REDUNDANT_PPS-$(call REMUX, H264, H264_PARSER H264_REDUNDANT_PPS_BSF \ - H264_DECODER RAWVIDEO_ENCODER) \ - += fate-h264_redundant_pps-annexb -fate-h264_redundant_pps-annexb: CMD = transcode \ - h264 $(TARGET_SAMPLES)/h264-conformance/CABA3_TOSHIBA_E.264 \ - h264 "-map 0:v -c copy -bsf h264_redundant_pps" - -# These two tests test that new extradata in packet side data is properly -# modified by h264_redundant_pps. nut is used as destination container -# because it can store extradata updates (in its experimental mode); -# setting -syncpoints none is a hack to use nut version 4. -FATE_H264_REDUNDANT_PPS-$(call REMUX, NUT, MOV_DEMUXER H264_REDUNDANT_PPS_BSF H264_DECODER) \ - += fate-h264_redundant_pps-side_data -fate-h264_redundant_pps-side_data: CMD = transcode \ - mov $(TARGET_SAMPLES)/h264/thezerotheorem-cut.mp4 nut \ - "-map 0:v -c copy -bsf h264_redundant_pps -syncpoints none -strict experimental" "-c copy" - -FATE_H264_REDUNDANT_PPS-$(call REMUX, NUT, MOV_DEMUXER H264_REDUNDANT_PPS_BSF \ - H264_DECODER SCALE_FILTER RAWVIDEO_ENCODER) \ - += fate-h264_redundant_pps-side_data2 -fate-h264_redundant_pps-side_data2: CMD = transcode \ - mov $(TARGET_SAMPLES)/h264/extradata-reload-multi-stsd.mov nut \ - "-map 0:v -c copy -bsf h264_redundant_pps -syncpoints none -strict experimental" - -fate-h264_redundant_pps: $(FATE_H264_REDUNDANT_PPS-yes) - - -FATE_SAMPLES_FFMPEG += $(FATE_CBS_H264-yes) $(FATE_H264_REDUNDANT_PPS-yes) -fate-cbs-h264: $(FATE_CBS_H264-yes) $(FATE_H264_REDUNDANT_PPS-yes) +FATE_SAMPLES_FFMPEG += $(FATE_CBS_H264-yes) +fate-cbs-h264: $(FATE_CBS_H264-yes) # H.265 read/write diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 3a0bd22a27..dacaaab274 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -235,6 +235,11 @@ FATE_H264-$(call FRAMECRC, MOV H264, H264, H264_PARSER H264_MUXER H264_MP4TOANNE FATE_H264-$(call FRAMECRC, MOV H264,, H264_PARSER MOV_MUXER DTS2PTS_BSF) += fate-h264-bsf-dts2pts +FATE_H264-$(call REMUX, H264, MOV_DEMUXER H264_REDUNDANT_PPS_BSF H264_DECODER H264_PARSER RAWVIDEO_ENCODER) += fate-h264-bsf-redundant-pps-mov +FATE_H264-$(call REMUX, H264, H264_PARSER H264_REDUNDANT_PPS_BSF H264_DECODER RAWVIDEO_ENCODER) += fate-h264-bsf-redundant-pps-annexb +FATE_H264-$(call REMUX, NUT, MOV_DEMUXER H264_REDUNDANT_PPS_BSF H264_DECODER) += fate-h264-bsf-redundant-pps-side-data +FATE_H264-$(call REMUX, NUT, MOV_DEMUXER H264_REDUNDANT_PPS_BSF H264_DECODER SCALE_FILTER RAWVIDEO_ENCODER) += fate-h264-bsf-redundant-pps-side-data2 + FATE_H264-$(call FRAMECRC, MATROSKA, H264) += fate-h264-direct-bff FATE_H264-$(call FRAMECRC, FLV, H264, SCALE_FILTER) += fate-h264-brokensps-2580 FATE_H264-$(call FRAMECRC, MXF, H264, PCM_S24LE_DECODER SCALE_FILTER ARESAMPLE_FILTER) += fate-h264-xavc-4389 @@ -478,5 +483,17 @@ fate-h264-afd: CMD = run ffprobe$(PROGSSUF)$( -show_entries frame=width,height,crop_top,crop_bottom,crop_left,crop_right:frame_side_data_list:stream=width,height,coded_width,coded_height \ $(TARGET_SAMPLES)/h264/bbc2.sample.h264 +fate-h264-bsf-redundant-pps-mov: CMD = transcode mov $(TARGET_SAMPLES)/mov/frag_overlap.mp4 h264 "-map 0:v -c copy -bsf h264_redundant_pps" + +# This file has changing pic_init_qp_minus26. +fate-h264-bsf-redundant-pps-annexb: CMD = transcode h264 $(TARGET_SAMPLES)/h264-conformance/CABA3_TOSHIBA_E.264 h264 "-map 0:v -c copy -bsf h264_redundant_pps" + +# These two tests test that new extradata in packet side data is properly +# modified by h264_redundant_pps. nut is used as destination container +# because it can store extradata updates (in its experimental mode); +# setting -syncpoints none is a hack to use nut version 4. +fate-h264-bsf-redundant-pps-side-data: CMD = transcode mov $(TARGET_SAMPLES)/h264/thezerotheorem-cut.mp4 nut "-map 0:v -c copy -bsf h264_redundant_pps -syncpoints none -strict experimental" "-c copy" +fate-h264-bsf-redundant-pps-side-data2: CMD = transcode mov $(TARGET_SAMPLES)/h264/extradata-reload-multi-stsd.mov nut "-map 0:v -c copy -bsf h264_redundant_pps -syncpoints none -strict experimental" + fate-h264-encparams: CMD = venc_data $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt_MMCO4_Sony_B.264 0 1 FATE_SAMPLES_DUMP_DATA += fate-h264-encparams diff --git a/tests/ref/fate/h264_redundant_pps-annexb b/tests/ref/fate/h264-bsf-redundant-pps-annexb similarity index 99% rename from tests/ref/fate/h264_redundant_pps-annexb rename to tests/ref/fate/h264-bsf-redundant-pps-annexb index 11d79f8b1f..a525c7bd59 100644 --- a/tests/ref/fate/h264_redundant_pps-annexb +++ b/tests/ref/fate/h264-bsf-redundant-pps-annexb @@ -1,5 +1,5 @@ -ce0890bd80342f8a3f6703f83b1c4959 *tests/data/fate/h264_redundant_pps-annexb.h264 -163967 tests/data/fate/h264_redundant_pps-annexb.h264 +ce0890bd80342f8a3f6703f83b1c4959 *tests/data/fate/h264-bsf-redundant-pps-annexb.h264 +163967 tests/data/fate/h264-bsf-redundant-pps-annexb.h264 #tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/h264_redundant_pps-mov b/tests/ref/fate/h264-bsf-redundant-pps-mov similarity index 97% rename from tests/ref/fate/h264_redundant_pps-mov rename to tests/ref/fate/h264-bsf-redundant-pps-mov index a8a1fae933..453cd47783 100644 --- a/tests/ref/fate/h264_redundant_pps-mov +++ b/tests/ref/fate/h264-bsf-redundant-pps-mov @@ -1,5 +1,5 @@ -ac2e8f528dae4e4d610fa3517d2c94fb *tests/data/fate/h264_redundant_pps-mov.h264 -187284 tests/data/fate/h264_redundant_pps-mov.h264 +ac2e8f528dae4e4d610fa3517d2c94fb *tests/data/fate/h264-bsf-redundant-pps-mov.h264 +187284 tests/data/fate/h264-bsf-redundant-pps-mov.h264 #tb 0: 1001/24000 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/h264_redundant_pps-side_data b/tests/ref/fate/h264-bsf-redundant-pps-side-data similarity index 86% rename from tests/ref/fate/h264_redundant_pps-side_data rename to tests/ref/fate/h264-bsf-redundant-pps-side-data index 1f4684bf5b..cecbe1acf9 100644 --- a/tests/ref/fate/h264_redundant_pps-side_data +++ b/tests/ref/fate/h264-bsf-redundant-pps-side-data @@ -1,5 +1,5 @@ -92fe70291f72acf94ba56b426bbaccb0 *tests/data/fate/h264_redundant_pps-side_data.nut -596100 tests/data/fate/h264_redundant_pps-side_data.nut +92fe70291f72acf94ba56b426bbaccb0 *tests/data/fate/h264-bsf-redundant-pps-side-data.nut +596100 tests/data/fate/h264-bsf-redundant-pps-side-data.nut #extradata 0: 34, 0x850408e3 #tb 0: 1/48000 #media_type 0: video diff --git a/tests/ref/fate/h264_redundant_pps-side_data2 b/tests/ref/fate/h264-bsf-redundant-pps-side-data2 similarity index 68% rename from tests/ref/fate/h264_redundant_pps-side_data2 rename to tests/ref/fate/h264-bsf-redundant-pps-side-data2 index 7484fbeb07..2a483144e7 100644 --- a/tests/ref/fate/h264_redundant_pps-side_data2 +++ b/tests/ref/fate/h264-bsf-redundant-pps-side-data2 @@ -1,5 +1,5 @@ -dd953f8d95d2927703ce9593a07fe2e7 *tests/data/fate/h264_redundant_pps-side_data2.nut -5162 tests/data/fate/h264_redundant_pps-side_data2.nut +dd953f8d95d2927703ce9593a07fe2e7 *tests/data/fate/h264-bsf-redundant-pps-side-data2.nut +5162 tests/data/fate/h264-bsf-redundant-pps-side-data2.nut #tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo -- 2.50.1 _______________________________________________ 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".