Browse code

lavfi: add gbrap support to some filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Paul B Mahol authored on 2013/05/07 00:36:20
Showing 4 changed files
... ...
@@ -283,7 +283,7 @@ static int query_formats(AVFilterContext *ctx)
283 283
         AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA420P,
284 284
         AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ422P,AV_PIX_FMT_YUVJ420P,
285 285
         AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV410P,
286
-        AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE
286
+        AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE
287 287
     };
288 288
 
289 289
     ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
... ...
@@ -75,8 +75,9 @@ static int query_formats(AVFilterContext *ctx)
75 75
         AV_PIX_FMT_YUV444P16BE, AV_PIX_FMT_YUVA444P16BE,
76 76
         AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A,
77 77
         AV_PIX_FMT_GRAY16LE, AV_PIX_FMT_GRAY16BE,
78
-        AV_PIX_FMT_GBRP,
78
+        AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP,
79 79
         AV_PIX_FMT_GBRP16LE, AV_PIX_FMT_GBRP16BE,
80
+        AV_PIX_FMT_GBRAP16LE, AV_PIX_FMT_GBRAP16BE,
80 81
         AV_PIX_FMT_NONE,
81 82
     };
82 83
     static const enum AVPixelFormat out8_pixfmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE };
... ...
@@ -165,7 +165,7 @@ static int geq_query_formats(AVFilterContext *ctx)
165 165
         AV_PIX_FMT_NONE
166 166
     };
167 167
     static const enum PixelFormat rgb_pix_fmts[] = {
168
-        AV_PIX_FMT_GBRP,
168
+        AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP,
169 169
         AV_PIX_FMT_NONE
170 170
     };
171 171
     if (geq->is_rgb) {
... ...
@@ -80,7 +80,7 @@ static const enum AVPixelFormat color_pix_fmts[] = {
80 80
 
81 81
 static const enum AVPixelFormat levels_pix_fmts[] = {
82 82
     AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVJ444P,
83
-    AV_PIX_FMT_GRAY8, AV_PIX_FMT_GBRP, AV_PIX_FMT_NONE
83
+    AV_PIX_FMT_GRAY8, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_NONE
84 84
 };
85 85
 
86 86
 static int query_formats(AVFilterContext *ctx)
... ...
@@ -119,6 +119,7 @@ static int config_input(AVFilterLink *inlink)
119 119
     h->ncomp = desc->nb_components;
120 120
 
121 121
     switch (inlink->format) {
122
+    case AV_PIX_FMT_GBRAP:
122 123
     case AV_PIX_FMT_GBRP:
123 124
         h->bg_color = black_gbrp_color;
124 125
         h->fg_color = white_gbrp_color;