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

Showing the changes to libavfilter (2 of 3 files). Show all

Unified · Split

2 files
  1. libavfilter/vf_overlay.c +79 −0
  2. libavfilter/vf_overlay.h +2 −0
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
154 154
155static const enum AVPixelFormat alpha_pix_fmts[] = {155static const enum AVPixelFormat alpha_pix_fmts[] = {
156 AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P,156 AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P,
157 AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10,
157 AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, AV_PIX_FMT_RGBA,158 AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, AV_PIX_FMT_RGBA,
158 AV_PIX_FMT_BGRA, AV_PIX_FMT_GBRAP, AV_PIX_FMT_NONE159 AV_PIX_FMT_BGRA, AV_PIX_FMT_GBRAP, AV_PIX_FMT_NONE
159};160};
@@ -172,6 +173,14 @@ static int query_formats(AVFilterContext *ctx) · 12 unmodified lines
172 AV_PIX_FMT_YUVA420P, AV_PIX_FMT_NONE173 AV_PIX_FMT_YUVA420P, AV_PIX_FMT_NONE
173 };174 };
174 175
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
175 static const enum AVPixelFormat main_pix_fmts_yuv422[] = {184 static const enum AVPixelFormat main_pix_fmts_yuv422[] = {
176 AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_NONE185 AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_NONE
177 };186 };
@@ -179,6 +188,13 @@ static int query_formats(AVFilterContext *ctx) · 1 unmodified line
179 AV_PIX_FMT_YUVA422P, AV_PIX_FMT_NONE188 AV_PIX_FMT_YUVA422P, AV_PIX_FMT_NONE
180 };189 };
181 190
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
182 static const enum AVPixelFormat main_pix_fmts_yuv444[] = {198 static const enum AVPixelFormat main_pix_fmts_yuv444[] = {
183 AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_NONE199 AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_NONE
184 };200 };
@@ -217,6 +233,13 @@ static int query_formats(AVFilterContext *ctx) · 32 unmodified lines
217 goto fail;233 goto fail;
218 }234 }
219 break;235 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;
220 case OVERLAY_FORMAT_YUV422:243 case OVERLAY_FORMAT_YUV422:
221 if (!(main_formats = ff_make_format_list(main_pix_fmts_yuv422)) ||244 if (!(main_formats = ff_make_format_list(main_pix_fmts_yuv422)) ||
222 !(overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv422))) {245 !(overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv422))) {
@@ -224,6 +247,13 @@ static int query_formats(AVFilterContext *ctx) · 1 unmodified line
224 goto fail;247 goto fail;
225 }248 }
226 break;249 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;
227 case OVERLAY_FORMAT_YUV444:257 case OVERLAY_FORMAT_YUV444:
228 if (!(main_formats = ff_make_format_list(main_pix_fmts_yuv444)) ||258 if (!(main_formats = ff_make_format_list(main_pix_fmts_yuv444)) ||
229 !(overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv444))) {259 !(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
566 } \596 } \
567}597}
568DEFINE_BLEND_PLANE(8, 8);598DEFINE_BLEND_PLANE(8, 8);
599DEFINE_BLEND_PLANE(16, 10);
569 600
570#define DEFINE_ALPHA_COMPOSITE(depth, nbits) \601#define DEFINE_ALPHA_COMPOSITE(depth, nbits) \
571static inline void alpha_composite_##depth##_##nbits##bits(const AVFrame *src, const AVFrame *dst, \602static 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
617 } \648 } \
618}649}
619DEFINE_ALPHA_COMPOSITE(8, 8);650DEFINE_ALPHA_COMPOSITE(8, 8);
651DEFINE_ALPHA_COMPOSITE(16, 10);
620 652
621#define DEFINE_BLEND_SLICE_YUV(depth, nbits) \653#define DEFINE_BLEND_SLICE_YUV(depth, nbits) \
622static av_always_inline void blend_slice_yuv_##depth##_##nbits##bits(AVFilterContext *ctx, \654static 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
648 jobnr, nb_jobs); \680 jobnr, nb_jobs); \
649}681}
650DEFINE_BLEND_SLICE_YUV(8, 8);682DEFINE_BLEND_SLICE_YUV(8, 8);
683DEFINE_BLEND_SLICE_YUV(16, 10);
651 684
652static av_always_inline void blend_slice_planar_rgb(AVFilterContext *ctx,685static av_always_inline void blend_slice_planar_rgb(AVFilterContext *ctx,
653 AVFrame *dst, const AVFrame *src,686 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
694 return 0;727 return 0;
695}728}
696 729
730static 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
738static 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
746static 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
754static 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
697static int blend_slice_yuv422(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)762static int blend_slice_yuv422(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
698{763{
699 OverlayContext *s = ctx->priv;764 OverlayContext *s = ctx->priv;
@@ -857,9 +922,15 @@ static int config_input_main(AVFilterLink *inlink) · 157 unmodified lines
857 case OVERLAY_FORMAT_YUV420:922 case OVERLAY_FORMAT_YUV420:
858 s->blend_slice = s->main_has_alpha ? blend_slice_yuva420 : blend_slice_yuv420;923 s->blend_slice = s->main_has_alpha ? blend_slice_yuva420 : blend_slice_yuv420;
859 break;924 break;
925 case OVERLAY_FORMAT_YUV420P10:
926 s->blend_slice = s->main_has_alpha ? blend_slice_yuva420p10 : blend_slice_yuv420p10;
927 break;
860 case OVERLAY_FORMAT_YUV422:928 case OVERLAY_FORMAT_YUV422:
861 s->blend_slice = s->main_has_alpha ? blend_slice_yuva422 : blend_slice_yuv422;929 s->blend_slice = s->main_has_alpha ? blend_slice_yuva422 : blend_slice_yuv422;
862 break;930 break;
931 case OVERLAY_FORMAT_YUV422P10:
932 s->blend_slice = s->main_has_alpha ? blend_slice_yuva422p10 : blend_slice_yuv422p10;
933 break;
863 case OVERLAY_FORMAT_YUV444:934 case OVERLAY_FORMAT_YUV444:
864 s->blend_slice = s->main_has_alpha ? blend_slice_yuva444 : blend_slice_yuv444;935 s->blend_slice = s->main_has_alpha ? blend_slice_yuva444 : blend_slice_yuv444;
865 break;936 break;
@@ -874,9 +945,15 @@ static int config_input_main(AVFilterLink *inlink) · 8 unmodified lines
874 case AV_PIX_FMT_YUVA420P:945 case AV_PIX_FMT_YUVA420P:
875 s->blend_slice = blend_slice_yuva420;946 s->blend_slice = blend_slice_yuva420;
876 break;947 break;
948 case AV_PIX_FMT_YUVA420P10:
949 s->blend_slice = blend_slice_yuva420p10;
950 break;
877 case AV_PIX_FMT_YUVA422P:951 case AV_PIX_FMT_YUVA422P:
878 s->blend_slice = blend_slice_yuva422;952 s->blend_slice = blend_slice_yuva422;
879 break;953 break;
954 case AV_PIX_FMT_YUVA422P10:
955 s->blend_slice = blend_slice_yuva422p10;
956 break;
880 case AV_PIX_FMT_YUVA444P:957 case AV_PIX_FMT_YUVA444P:
881 s->blend_slice = blend_slice_yuva444;958 s->blend_slice = blend_slice_yuva444;
882 break;959 break;
@@ -1028,7 +1105,9 @@ static const AVOption overlay_options[] = { · 145 unmodified lines
1028 { "shortest", "force termination when the shortest input terminates", OFFSET(fs.opt_shortest), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },1105 { "shortest", "force termination when the shortest input terminates", OFFSET(fs.opt_shortest), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
1029 { "format", "set output format", OFFSET(format), AV_OPT_TYPE_INT, {.i64=OVERLAY_FORMAT_YUV420}, 0, OVERLAY_FORMAT_NB-1, FLAGS, "format" },1106 { "format", "set output format", OFFSET(format), AV_OPT_TYPE_INT, {.i64=OVERLAY_FORMAT_YUV420}, 0, OVERLAY_FORMAT_NB-1, FLAGS, "format" },
1030 { "yuv420", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV420}, .flags = FLAGS, .unit = "format" },1107 { "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" },
1031 { "yuv422", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV422}, .flags = FLAGS, .unit = "format" },1109 { "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" },
1032 { "yuv444", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV444}, .flags = FLAGS, .unit = "format" },1111 { "yuv444", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV444}, .flags = FLAGS, .unit = "format" },
1033 { "rgb", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_RGB}, .flags = FLAGS, .unit = "format" },1112 { "rgb", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_RGB}, .flags = FLAGS, .unit = "format" },
1034 { "gbrp", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_GBRP}, .flags = FLAGS, .unit = "format" },1113 { "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
41 41
42enum OverlayFormat {42enum OverlayFormat {
43 OVERLAY_FORMAT_YUV420,43 OVERLAY_FORMAT_YUV420,
44 OVERLAY_FORMAT_YUV420P10,
44 OVERLAY_FORMAT_YUV422,45 OVERLAY_FORMAT_YUV422,
46 OVERLAY_FORMAT_YUV422P10,
45 OVERLAY_FORMAT_YUV444,47 OVERLAY_FORMAT_YUV444,
46 OVERLAY_FORMAT_RGB,48 OVERLAY_FORMAT_RGB,
47 OVERLAY_FORMAT_GBRP,49 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