tests/fate/cbs: move redundant_pps tests to the proper location

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 <jamrial@gmail.com>

6 files changed, 27 insertions, 46 deletions

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
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
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
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
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