[FFmpeg-devel] [PATCH 06/12] vf_pp: drop the option to use frame-attached QP tables

[Anton Khirnov]

This API has been deprecated for five years.
---
 libavfilter/vf_pp.c         |  8 ++------
 tests/fate/filter-video.mak |  3 +--
 tests/ref/fate/filter-pp    | 10 ----------
 3 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 tests/ref/fate/filter-pp

diff --git a/libavfilter/vf_pp.c b/libavfilter/vf_pp.c
index 524ef1bb0a..efc558db8a 100644
--- a/libavfilter/vf_pp.c
+++ b/libavfilter/vf_pp.c
@@ -126,8 +126,6 @@ static int pp_filter_frame(AVFilterLink *inlink, AVFrame *inbuf)
     const int aligned_w = FFALIGN(outlink->w, 8);
     const int aligned_h = FFALIGN(outlink->h, 8);
     AVFrame *outbuf;
-    int qstride, qp_type;
-    int8_t *qp_table ;
 
     outbuf = ff_get_video_buffer(outlink, aligned_w, aligned_h);
     if (!outbuf) {
@@ -137,16 +135,14 @@ static int pp_filter_frame(AVFilterLink *inlink, AVFrame *inbuf)
     av_frame_copy_props(outbuf, inbuf);
     outbuf->width  = inbuf->width;
     outbuf->height = inbuf->height;
-    qp_table = av_frame_get_qp_table(inbuf, &qstride, &qp_type);
 
     pp_postprocess((const uint8_t **)inbuf->data, inbuf->linesize,
                    outbuf->data,                 outbuf->linesize,
                    aligned_w, outlink->h,
-                   qp_table,
-                   qstride,
+                   NULL, 0,
                    pp->modes[pp->mode_id],
                    pp->pp_ctx,
-                   outbuf->pict_type | (qp_type ? PP_PICT_TYPE_QP2 : 0));
+                   outbuf->pict_type);
 
     av_frame_free(&inbuf);
     return ff_filter_frame(outlink, outbuf);
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index 5f4fd75b40..c7b60ed94a 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@ -531,11 +531,10 @@ fate-filter-idet: CMD = framecrc -flags bitexact -idct simple -i $(SRC) -vf idet
 FATE_FILTER_VSYNTH-$(CONFIG_PAD_FILTER) += fate-filter-pad
 fate-filter-pad: CMD = video_filter "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2"
 
-FATE_FILTER_PP = fate-filter-pp fate-filter-pp1 fate-filter-pp4 fate-filter-pp5 fate-filter-pp6
+FATE_FILTER_PP = fate-filter-pp1 fate-filter-pp4 fate-filter-pp5 fate-filter-pp6
 FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += $(FATE_FILTER_PP)
 $(FATE_FILTER_PP): fate-vsynth1-mpeg4-qprd
 
-fate-filter-pp:  CMD = framecrc -flags bitexact -idct simple -i $(TARGET_PATH)/tests/data/fate/vsynth1-mpeg4-qprd.avi -frames:v 5 -flags +bitexact -vf "pp=be/hb/vb/tn/l5/al"
 fate-filter-pp1: CMD = video_filter "pp=fq|4/be/hb/vb/tn/l5/al"
 fate-filter-pp4: CMD = video_filter "pp=be/ci"
 fate-filter-pp5: CMD = video_filter "pp=md"
diff --git a/tests/ref/fate/filter-pp b/tests/ref/fate/filter-pp
deleted file mode 100644
index 5c0e2994c6..0000000000
--- a/tests/ref/fate/filter-pp
+++ /dev/null
@@ -1,10 +0,0 @@
-#tb 0: 1/25
-#media_type 0: video
-#codec_id 0: rawvideo
-#dimensions 0: 352x288
-#sar 0: 1/1
-0,          1,          1,        1,   152064, 0x0af8a873
-0,          2,          2,        1,   152064, 0xaeb99897
-0,          3,          3,        1,   152064, 0x8f3712c8
-0,          4,          4,        1,   152064, 0x5bf6a64c
-0,          5,          5,        1,   152064, 0x262de352
-- 
2.24.1