RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi/vf_codecview: convert to the video_enc_params API

This commit is contained in:
Anton Khirnov 2020-04-17 10:32:12 +02:00
parent 3f0930387c
commit 7f7eb137d6
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/Makefile
View File

@ -193,7 +193,7 @@ OBJS-$(CONFIG_CHROMAKEY_FILTER) += vf_chromakey.o
OBJS-$(CONFIG_CHROMANR_FILTER) += vf_chromanr.o OBJS-$(CONFIG_CHROMANR_FILTER) += vf_chromanr.o
OBJS-$(CONFIG_CHROMASHIFT_FILTER) += vf_chromashift.o OBJS-$(CONFIG_CHROMASHIFT_FILTER) += vf_chromashift.o
OBJS-$(CONFIG_CIESCOPE_FILTER) += vf_ciescope.o OBJS-$(CONFIG_CIESCOPE_FILTER) += vf_ciescope.o
OBJS-$(CONFIG_CODECVIEW_FILTER) += vf_codecview.o OBJS-$(CONFIG_CODECVIEW_FILTER) += vf_codecview.o qp_table.o
OBJS-$(CONFIG_COLORBALANCE_FILTER) += vf_colorbalance.o OBJS-$(CONFIG_COLORBALANCE_FILTER) += vf_colorbalance.o
OBJS-$(CONFIG_COLORCHANNELMIXER_FILTER) += vf_colorchannelmixer.o OBJS-$(CONFIG_COLORCHANNELMIXER_FILTER) += vf_colorchannelmixer.o
OBJS-$(CONFIG_COLORKEY_FILTER) += vf_colorkey.o OBJS-$(CONFIG_COLORKEY_FILTER) += vf_colorkey.o

12
libavfilter/vf_codecview.c
View File

@ -33,6 +33,7 @@
#include "libavutil/motion_vector.h" #include "libavutil/motion_vector.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avfilter.h" #include "avfilter.h"
#include "qp_table.h"
#include "internal.h" #include "internal.h"
#define MV_P_FOR (1<<0) #define MV_P_FOR (1<<0)
@ -219,8 +220,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
if (s->qp) { if (s->qp) {
int qstride, qp_type; int qstride, qp_type, ret;
int8_t *qp_table = av_frame_get_qp_table(frame, &qstride, &qp_type); int8_t *qp_table;
ret = ff_qp_table_extract(frame, &qp_table, &qstride, NULL, &qp_type);
if (ret < 0) {
av_frame_free(&frame);
return ret;
}
if (qp_table) { if (qp_table) {
int x, y; int x, y;
@ -240,6 +247,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
pv += lzv; pv += lzv;
} }
} }
av_freep(&qp_table);
} }
if (s->mv || s->mv_type) { if (s->mv || s->mv_type) {