---
libavfilter/vf_pp.c | 54 ++++++++++++++++++++++++++++++++++---
tests/fate/filter-video.mak | 2 +-
2 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/libavfilter/vf_pp.c b/libavfilter/vf_pp.c
index 524ef1bb0a..87eef4561f 100644
--- a/libavfilter/vf_pp.c
+++ b/libavfilter/vf_pp.c
@@ -26,6 +26,8 @@
#include "libavutil/avassert.h"
#include "libavutil/opt.h"
+#include "libavutil/video_enc_params.h"
+
#include "internal.h"
#include "libpostproc/postprocess.h"
@@ -118,6 +120,41 @@ static int pp_config_props(AVFilterLink *inlink)
return 0;
}
+static int get_qp_table(AVFrame *in, int8_t **table, int *stride)
+{
+ AVFrameSideData *sd;
+ AVVideoEncParams *par;
+ unsigned int mb_h = (in->height + 15) / 16;
+ unsigned int mb_w = (in->width + 15) / 16;
+ unsigned int nb_mb = mb_h * mb_w;
+ unsigned int block_idx;
+
+ sd = av_frame_get_side_data(in, AV_FRAME_DATA_VIDEO_ENC_PARAMS);
+ if (!sd)
+ return 0;
+ par = (AVVideoEncParams*)sd->data;
+ if (par->type != AV_VIDEO_ENC_PARAMS_MPEG2 ||
+ (par->nb_blocks != 0 && par->nb_blocks != nb_mb))
+ return 0;
+
+ *table = av_malloc(nb_mb);
+ if (!*table)
+ return AVERROR(ENOMEM);
+ *stride = mb_w;
+
+ if (par->nb_blocks == 0) {
+ memset(*table, par->qp, nb_mb);
+ return 0;
+ }
+
+ for (block_idx = 0; block_idx < nb_mb; block_idx++) {
+ AVVideoBlockParams *b = av_video_enc_params_block(par, block_idx);
+ (*table)[block_idx] = par->qp + b->delta_qp;
+ }
+
+ return 0;
+}
+
static int pp_filter_frame(AVFilterLink *inlink, AVFrame *inbuf)
{
AVFilterContext *ctx = inlink->dst;
@@ -126,8 +163,9 @@ 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 ;
+ int qstride = 0;
+ int8_t *qp_table = NULL;
+ int ret;
outbuf = ff_get_video_buffer(outlink, aligned_w, aligned_h);
if (!outbuf) {
@@ -137,7 +175,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);
+
+ ret = get_qp_table(inbuf, &qp_table, &qstride);
+ if (ret < 0) {
+ av_frame_free(&inbuf);
+ av_frame_free(&outbuf);
+ av_freep(&qp_table);
+ return ret;
+ }
pp_postprocess((const uint8_t **)inbuf->data, inbuf->linesize,
outbuf->data, outbuf->linesize,
@@ -146,9 +191,10 @@ static int pp_filter_frame(AVFilterLink *inlink, AVFrame
*inbuf)
qstride,
pp->modes[pp->mode_id],
pp->pp_ctx,
- outbuf->pict_type | (qp_type ? PP_PICT_TYPE_QP2 : 0));
+ outbuf->pict_type | (qp_table ? PP_PICT_TYPE_QP2 : 0));
av_frame_free(&inbuf);
+ av_freep(&qp_table);
return ff_filter_frame(outlink, outbuf);
}
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index 3d0d4969b8..cb7ce7a158 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@ -535,7 +535,7 @@ FATE_FILTER_PP = fate-filter-pp fate-filter-pp1
fate-filter-pp2 fate-filter-pp3
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-pp: CMD = framecrc -flags bitexact -export_side_data venc_params
-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-pp2: CMD = video_filter "qp=2*(x+y),pp=be/h1/v1/lb"
fate-filter-pp3: CMD = video_filter "qp=2*(x+y),pp=be/ha|128|7/va/li"
--
2.25.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-requ...@ffmpeg.org with subject "unsubscribe".
