[FFmpeg-cvslog] lavfi/scale: add nb_slices debug option
Clément Bœsch
git at videolan.org
Mon Dec 21 10:37:44 CET 2015
ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Fri Dec 18 15:44:33 2015 +0100| [244766e407fbed6944ada01e9b57bc6c62e36a0d] | committer: Clément Bœsch
lavfi/scale: add nb_slices debug option
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=244766e407fbed6944ada01e9b57bc6c62e36a0d
---
libavfilter/vf_scale.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index f2f475e..ce410e9 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -110,6 +110,8 @@ typedef struct ScaleContext {
int in_v_chr_pos;
int force_original_aspect_ratio;
+
+ int nb_slices;
} ScaleContext;
AVFilter ff_vf_scale2ref;
@@ -575,6 +577,15 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
if(scale->interlaced>0 || (scale->interlaced<0 && in->interlaced_frame)){
scale_slice(link, out, in, scale->isws[0], 0, (link->h+1)/2, 2, 0);
scale_slice(link, out, in, scale->isws[1], 0, link->h /2, 2, 1);
+ }else if (scale->nb_slices) {
+ int i, slice_h, slice_start, slice_end = 0;
+ const int nb_slices = FFMIN(scale->nb_slices, link->h);
+ for (i = 0; i < nb_slices; i++) {
+ slice_start = slice_end;
+ slice_end = (link->h * (i+1)) / nb_slices;
+ slice_h = slice_end - slice_start;
+ scale_slice(link, out, in, scale->sws, slice_start, slice_h, 1, 0);
+ }
}else{
scale_slice(link, out, in, scale->sws, 0, link->h, 1, 0);
}
@@ -651,6 +662,7 @@ static const AVOption scale_options[] = {
{ "increase", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 2 }, 0, 0, FLAGS, "force_oar" },
{ "param0", "Scaler param 0", OFFSET(param[0]), AV_OPT_TYPE_DOUBLE, { .dbl = SWS_PARAM_DEFAULT }, INT_MIN, INT_MAX, FLAGS },
{ "param1", "Scaler param 1", OFFSET(param[1]), AV_OPT_TYPE_DOUBLE, { .dbl = SWS_PARAM_DEFAULT }, INT_MIN, INT_MAX, FLAGS },
+ { "nb_slices", "set the number of slices (debug purpose only)", OFFSET(nb_slices), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS },
{ NULL }
};
More information about the ffmpeg-cvslog
mailing list