ffmpeg | branch: master | Rodger Combs <rodger.co...@gmail.com> | Tue Oct 25 01:28:43 2016 -0500| [f53c26c694c94bb93fb49d72b6439b792b125fe8] | committer: Rodger Combs
lavfi/vf_overlay: support NV12 and NV21 Tested-by: Michael on x86-32/64 linux, mingw, mips/arm qemu linux > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f53c26c694c94bb93fb49d72b6439b792b125fe8 --- libavfilter/vf_overlay.c | 22 +++++++++++++++++----- tests/fate/filter-video.mak | 10 ++++++++++ tests/filtergraphs/overlay_nv12 | 5 +++++ tests/filtergraphs/overlay_nv21 | 5 +++++ 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index c592dca..b249ad7 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -125,6 +125,7 @@ typedef struct OverlayContext { int main_pix_step[4]; ///< steps per pixel for each plane of the main output int overlay_pix_step[4]; ///< steps per pixel for each plane of the overlay int hsub, vsub; ///< chroma subsampling values + const AVPixFmtDescriptor *main_desc; ///< format descriptor for main input double var_values[VAR_VARS_NB]; char *x_expr, *y_expr; @@ -215,7 +216,9 @@ static int query_formats(AVFilterContext *ctx) /* overlay formats contains alpha, for avoiding conversion with alpha information loss */ static const enum AVPixelFormat main_pix_fmts_yuv420[] = { - AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_NONE + AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVA420P, + AV_PIX_FMT_NV12, AV_PIX_FMT_NV21, + AV_PIX_FMT_NONE }; static const enum AVPixelFormat overlay_pix_fmts_yuv420[] = { AV_PIX_FMT_YUVA420P, AV_PIX_FMT_NONE @@ -470,6 +473,7 @@ static av_always_inline void blend_plane(AVFilterContext *ctx, int x, int y, int main_has_alpha) { + OverlayContext *ol = ctx->priv; int src_wp = AV_CEIL_RSHIFT(src_w, hsub); int src_hp = AV_CEIL_RSHIFT(src_h, vsub); int dst_wp = AV_CEIL_RSHIFT(dst_w, hsub); @@ -479,14 +483,20 @@ static av_always_inline void blend_plane(AVFilterContext *ctx, uint8_t *s, *sp, *d, *dp, *a, *ap; int jmax, j, k, kmax; + int dst_plane = ol->main_desc->comp[i].plane; + int dst_offset = ol->main_desc->comp[i].offset; + int dst_step = ol->main_desc->comp[i].step; + j = FFMAX(-yp, 0); sp = src->data[i] + j * src->linesize[i]; - dp = dst->data[i] + (yp+j) * dst->linesize[i]; + dp = dst->data[dst_plane] + + (yp+j) * dst->linesize[dst_plane] + + dst_offset; ap = src->data[3] + (j<<vsub) * src->linesize[3]; for (jmax = FFMIN(-yp + dst_hp, src_hp); j < jmax; j++) { k = FFMAX(-xp, 0); - d = dp + xp+k; + d = dp + (xp+k) * dst_step; s = sp + k; a = ap + (k<<hsub); @@ -525,10 +535,10 @@ static av_always_inline void blend_plane(AVFilterContext *ctx, } *d = FAST_DIV255(*d * (255 - alpha) + *s * alpha); s++; - d++; + d += dst_step; a += 1 << hsub; } - dp += dst->linesize[i]; + dp += dst->linesize[dst_plane]; sp += src->linesize[i]; ap += (1 << vsub) * src->linesize[3]; } @@ -626,6 +636,8 @@ static int config_input_main(AVFilterLink *inlink) s->hsub = pix_desc->log2_chroma_w; s->vsub = pix_desc->log2_chroma_h; + s->main_desc = pix_desc; + s->main_is_packed_rgb = ff_fill_rgba_map(s->main_rgba_map, inlink->format) >= 0; s->main_has_alpha = ff_fmt_is_in(inlink->format, alpha_pix_fmts); diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index e2513f5..ec22d25 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -172,6 +172,16 @@ FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_F fate-filter-overlay_yuv420: tests/data/filtergraphs/overlay_yuv420 fate-filter-overlay_yuv420: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_yuv420 +FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_nv12 +fate-filter-overlay_nv12: tests/data/filtergraphs/overlay_nv12 +fate-filter-overlay_nv12: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_nv12 +fate-filter-overlay_nv12: REF = $(SRC_PATH)/tests/ref/fate/filter-overlay_yuv420 + +FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_nv21 +fate-filter-overlay_nv21: tests/data/filtergraphs/overlay_nv21 +fate-filter-overlay_nv21: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_nv21 +fate-filter-overlay_nv21: REF = $(SRC_PATH)/tests/ref/fate/filter-overlay_yuv420 + FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv422 fate-filter-overlay_yuv422: tests/data/filtergraphs/overlay_yuv422 fate-filter-overlay_yuv422: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_yuv422 diff --git a/tests/filtergraphs/overlay_nv12 b/tests/filtergraphs/overlay_nv12 new file mode 100644 index 0000000..ec82cbe --- /dev/null +++ b/tests/filtergraphs/overlay_nv12 @@ -0,0 +1,5 @@ +sws_flags=+accurate_rnd+bitexact; +split [main][over]; +[over] scale=88:72, pad=96:80:4:4 [overf]; +[main] format=nv12 [mainf]; +[mainf][overf] overlay=240:16:format=yuv420, format=yuv420p diff --git a/tests/filtergraphs/overlay_nv21 b/tests/filtergraphs/overlay_nv21 new file mode 100644 index 0000000..9c30d07 --- /dev/null +++ b/tests/filtergraphs/overlay_nv21 @@ -0,0 +1,5 @@ +sws_flags=+accurate_rnd+bitexact; +split [main][over]; +[over] scale=88:72, pad=96:80:4:4 [overf]; +[main] format=nv21 [mainf]; +[mainf][overf] overlay=240:16:format=yuv420, format=yuv420p _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
