Browse code

colormatrix: Accept bt601 aliases as input

As far as matrix coefficients are concerned, BT470BG and SMPTE170M
match BT601. This is similar to the check performed in vf_scale.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Vittorio Giovara authored on 2015/02/25 03:05:41
Showing 1 changed files
... ...
@@ -82,6 +82,8 @@ static const AVOption colormatrix_options[] = {
82 82
     { "bt709",     "set BT.709 colorspace",      0, AV_OPT_TYPE_CONST, {.i64=COLOR_MODE_BT709},       .flags=FLAGS, .unit="color_mode" },
83 83
     { "fcc",       "set FCC colorspace   ",      0, AV_OPT_TYPE_CONST, {.i64=COLOR_MODE_FCC},         .flags=FLAGS, .unit="color_mode" },
84 84
     { "bt601",     "set BT.601 colorspace",      0, AV_OPT_TYPE_CONST, {.i64=COLOR_MODE_BT601},       .flags=FLAGS, .unit="color_mode" },
85
+    { "bt470",     "set BT.470 colorspace",      0, AV_OPT_TYPE_CONST, {.i64=COLOR_MODE_BT601},       .flags=FLAGS, .unit="color_mode" },
86
+    { "smpte170m", "set SMTPE-170M colorspace",  0, AV_OPT_TYPE_CONST, {.i64=COLOR_MODE_BT601},       .flags=FLAGS, .unit="color_mode" },
85 87
     { "smpte240m", "set SMPTE-240M colorspace",  0, AV_OPT_TYPE_CONST, {.i64=COLOR_MODE_SMPTE240M},   .flags=FLAGS, .unit="color_mode" },
86 88
     { NULL }
87 89
 };
... ...
@@ -351,6 +353,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
351 351
         case AVCOL_SPC_FCC       : source = COLOR_MODE_FCC       ; break;
352 352
         case AVCOL_SPC_SMPTE240M : source = COLOR_MODE_SMPTE240M ; break;
353 353
         case AVCOL_SPC_BT470BG   : source = COLOR_MODE_BT601     ; break;
354
+        case AVCOL_SPC_SMPTE170M : source = COLOR_MODE_BT601     ; break;
354 355
         default :
355 356
             av_log(ctx, AV_LOG_ERROR, "Input frame does not specify a supported colorspace, and none has been specified as source either\n");
356 357
             av_frame_free(&out);