History

avfilter/vf_overlay: add yuv420p10 and yuv422p10 10bit format support

Limin Wang committed 6 years ago

Commit dacae401 parent 4d787c13 files · +87 −0Browse files

Unified · Split

3 files
  1. doc/filters.texi +6 −0
  2. libavfilter/vf_overlay.c +79 −0
  3. libavfilter/vf_overlay.h +2 −0
doc/filters.texi+6−0
@@ -14342,9 +14342,15 @@ It accepts the following values: · 14341 unmodified lines
1434214342 @item yuv420
1434314343 force YUV420 output
1434414344
14345+@item yuv420p10
14346+force YUV420p10 output
14347+
1434514348 @item yuv422
1434614349 force YUV422 output
1434714350
14351+@item yuv422p10
14352+force YUV422p10 output
14353+
1434814354 @item yuv444
1434914355 force YUV444 output
1435014356
libavfilter/vf_overlay.c+79−0
@@ -154,6 +154,7 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar · 153 unmodified lines
154154
155155 static const enum AVPixelFormat alpha_pix_fmts[] = {
156156 AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P,
157+ AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10,
157158 AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, AV_PIX_FMT_RGBA,
158159 AV_PIX_FMT_BGRA, AV_PIX_FMT_GBRAP, AV_PIX_FMT_NONE
159160 };
@@ -172,6 +173,14 @@ static int query_formats(AVFilterContext *ctx) · 12 unmodified lines
172173 AV_PIX_FMT_YUVA420P, AV_PIX_FMT_NONE
173174 };
174175
176+ static const enum AVPixelFormat main_pix_fmts_yuv420p10[] = {
177+ AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUVA420P10,
178+ AV_PIX_FMT_NONE
179+ };
180+ static const enum AVPixelFormat overlay_pix_fmts_yuv420p10[] = {
181+ AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_NONE
182+ };
183+
175184 static const enum AVPixelFormat main_pix_fmts_yuv422[] = {
176185 AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_NONE
177186 };
@@ -179,6 +188,13 @@ static int query_formats(AVFilterContext *ctx) · 1 unmodified line
179188 AV_PIX_FMT_YUVA422P, AV_PIX_FMT_NONE
180189 };
181190
191+ static const enum AVPixelFormat main_pix_fmts_yuv422p10[] = {
192+ AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_NONE
193+ };
194+ static const enum AVPixelFormat overlay_pix_fmts_yuv422p10[] = {
195+ AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_NONE
196+ };
197+
182198 static const enum AVPixelFormat main_pix_fmts_yuv444[] = {
183199 AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_NONE
184200 };
@@ -217,6 +233,13 @@ static int query_formats(AVFilterContext *ctx) · 32 unmodified lines
217233 goto fail;
218234 }
219235 break;
236+ case OVERLAY_FORMAT_YUV420P10:
237+ if (!(main_formats = ff_make_format_list(main_pix_fmts_yuv420p10)) ||
238+ !(overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv420p10))) {
239+ ret = AVERROR(ENOMEM);
240+ goto fail;
241+ }
242+ break;
220243 case OVERLAY_FORMAT_YUV422:
221244 if (!(main_formats = ff_make_format_list(main_pix_fmts_yuv422)) ||
222245 !(overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv422))) {
@@ -224,6 +247,13 @@ static int query_formats(AVFilterContext *ctx) · 1 unmodified line
224247 goto fail;
225248 }
226249 break;
250+ case OVERLAY_FORMAT_YUV422P10:
251+ if (!(main_formats = ff_make_format_list(main_pix_fmts_yuv422p10)) ||
252+ !(overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv422p10))) {
253+ ret = AVERROR(ENOMEM);
254+ goto fail;
255+ }
256+ break;
227257 case OVERLAY_FORMAT_YUV444:
228258 if (!(main_formats = ff_make_format_list(main_pix_fmts_yuv444)) ||
229259 !(overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv444))) {
@@ -566,6 +596,7 @@ static av_always_inline void blend_plane_##depth##_##nbits##bits(AVFilterContext · 336 unmodified lines
566596 } \
567597 }
568598 DEFINE_BLEND_PLANE(8, 8);
599+DEFINE_BLEND_PLANE(16, 10);
569600
570601 #define DEFINE_ALPHA_COMPOSITE(depth, nbits) \
571602 static inline void alpha_composite_##depth##_##nbits##bits(const AVFrame *src, const AVFrame *dst, \
@@ -617,6 +648,7 @@ static inline void alpha_composite_##depth##_##nbits##bits(const AVFrame *src, c · 45 unmodified lines
617648 } \
618649 }
619650 DEFINE_ALPHA_COMPOSITE(8, 8);
651+DEFINE_ALPHA_COMPOSITE(16, 10);
620652
621653 #define DEFINE_BLEND_SLICE_YUV(depth, nbits) \
622654 static av_always_inline void blend_slice_yuv_##depth##_##nbits##bits(AVFilterContext *ctx, \
@@ -648,6 +680,7 @@ static av_always_inline void blend_slice_yuv_##depth##_##nbits##bits(AVFilterCon · 25 unmodified lines
648680 jobnr, nb_jobs); \
649681 }
650682 DEFINE_BLEND_SLICE_YUV(8, 8);
683+DEFINE_BLEND_SLICE_YUV(16, 10);
651684
652685 static av_always_inline void blend_slice_planar_rgb(AVFilterContext *ctx,
653686 AVFrame *dst, const AVFrame *src,
@@ -694,6 +727,38 @@ static int blend_slice_yuva420(AVFilterContext *ctx, void *arg, int jobnr, int n · 40 unmodified lines
694727 return 0;
695728 }
696729
730+static int blend_slice_yuv420p10(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
731+{
732+ OverlayContext *s = ctx->priv;
733+ ThreadData *td = arg;
734+ blend_slice_yuv_16_10bits(ctx, td->dst, td->src, 1, 1, 0, s->x, s->y, 1, jobnr, nb_jobs);
735+ return 0;
736+}
737+
738+static int blend_slice_yuva420p10(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
739+{
740+ OverlayContext *s = ctx->priv;
741+ ThreadData *td = arg;
742+ blend_slice_yuv_16_10bits(ctx, td->dst, td->src, 1, 1, 1, s->x, s->y, 1, jobnr, nb_jobs);
743+ return 0;
744+}
745+
746+static int blend_slice_yuv422p10(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
747+{
748+ OverlayContext *s = ctx->priv;
749+ ThreadData *td = arg;
750+ blend_slice_yuv_16_10bits(ctx, td->dst, td->src, 1, 0, 0, s->x, s->y, 1, jobnr, nb_jobs);
751+ return 0;
752+}
753+
754+static int blend_slice_yuva422p10(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
755+{
756+ OverlayContext *s = ctx->priv;
757+ ThreadData *td = arg;
758+ blend_slice_yuv_16_10bits(ctx, td->dst, td->src, 1, 0, 1, s->x, s->y, 1, jobnr, nb_jobs);
759+ return 0;
760+}
761+
697762 static int blend_slice_yuv422(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
698763 {
699764 OverlayContext *s = ctx->priv;
@@ -857,9 +922,15 @@ static int config_input_main(AVFilterLink *inlink) · 157 unmodified lines
857922 case OVERLAY_FORMAT_YUV420:
858923 s->blend_slice = s->main_has_alpha ? blend_slice_yuva420 : blend_slice_yuv420;
859924 break;
925+ case OVERLAY_FORMAT_YUV420P10:
926+ s->blend_slice = s->main_has_alpha ? blend_slice_yuva420p10 : blend_slice_yuv420p10;
927+ break;
860928 case OVERLAY_FORMAT_YUV422:
861929 s->blend_slice = s->main_has_alpha ? blend_slice_yuva422 : blend_slice_yuv422;
862930 break;
931+ case OVERLAY_FORMAT_YUV422P10:
932+ s->blend_slice = s->main_has_alpha ? blend_slice_yuva422p10 : blend_slice_yuv422p10;
933+ break;
863934 case OVERLAY_FORMAT_YUV444:
864935 s->blend_slice = s->main_has_alpha ? blend_slice_yuva444 : blend_slice_yuv444;
865936 break;
@@ -874,9 +945,15 @@ static int config_input_main(AVFilterLink *inlink) · 8 unmodified lines
874945 case AV_PIX_FMT_YUVA420P:
875946 s->blend_slice = blend_slice_yuva420;
876947 break;
948+ case AV_PIX_FMT_YUVA420P10:
949+ s->blend_slice = blend_slice_yuva420p10;
950+ break;
877951 case AV_PIX_FMT_YUVA422P:
878952 s->blend_slice = blend_slice_yuva422;
879953 break;
954+ case AV_PIX_FMT_YUVA422P10:
955+ s->blend_slice = blend_slice_yuva422p10;
956+ break;
880957 case AV_PIX_FMT_YUVA444P:
881958 s->blend_slice = blend_slice_yuva444;
882959 break;
@@ -1028,7 +1105,9 @@ static const AVOption overlay_options[] = { · 145 unmodified lines
10281105 { "shortest", "force termination when the shortest input terminates", OFFSET(fs.opt_shortest), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
10291106 { "format", "set output format", OFFSET(format), AV_OPT_TYPE_INT, {.i64=OVERLAY_FORMAT_YUV420}, 0, OVERLAY_FORMAT_NB-1, FLAGS, "format" },
10301107 { "yuv420", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV420}, .flags = FLAGS, .unit = "format" },
1108+ { "yuv420p10", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV420P10}, .flags = FLAGS, .unit = "format" },
10311109 { "yuv422", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV422}, .flags = FLAGS, .unit = "format" },
1110+ { "yuv422p10", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV422P10}, .flags = FLAGS, .unit = "format" },
10321111 { "yuv444", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV444}, .flags = FLAGS, .unit = "format" },
10331112 { "rgb", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_RGB}, .flags = FLAGS, .unit = "format" },
10341113 { "gbrp", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_GBRP}, .flags = FLAGS, .unit = "format" },
libavfilter/vf_overlay.h+2−0
@@ -41,7 +41,9 @@ enum var_name { · 40 unmodified lines
4141
4242 enum OverlayFormat {
4343 OVERLAY_FORMAT_YUV420,
44+ OVERLAY_FORMAT_YUV420P10,
4445 OVERLAY_FORMAT_YUV422,
46+ OVERLAY_FORMAT_YUV422P10,
4547 OVERLAY_FORMAT_YUV444,
4648 OVERLAY_FORMAT_RGB,
4749 OVERLAY_FORMAT_GBRP,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t