]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/av1_parser: add missing parsing for RGB pixel format signaling
authorJames Almer <jamrial@gmail.com>
Fri, 19 Jun 2020 13:56:20 +0000 (10:56 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 19 Jun 2020 14:05:30 +0000 (11:05 -0300)
Signed-off-by: James Almer <jamrial@gmail.com>
libavcodec/av1_parser.c

index ce447a67e9430a8a6fe30d052c83d8a5b8cc5d9b..c5bdc6b25ffbab5c0307a4f0e387ec8969603003 100644 (file)
@@ -45,6 +45,10 @@ static const enum AVPixelFormat pix_fmts_12bit[2][2] = {
     { AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV420P12 },
 };
 
+static const enum AVPixelFormat pix_fmts_rgb[3] = {
+    AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12,
+};
+
 static int av1_parser_parse(AVCodecParserContext *ctx,
                             AVCodecContext *avctx,
                             const uint8_t **out_data, int *out_size,
@@ -161,6 +165,12 @@ static int av1_parser_parse(AVCodecParserContext *ctx,
     }
     av_assert2(ctx->format != AV_PIX_FMT_NONE);
 
+    if (!color->subsampling_x && !color->subsampling_y &&
+        color->matrix_coefficients       == AVCOL_SPC_RGB &&
+        color->color_primaries           == AVCOL_PRI_BT709 &&
+        color->transfer_characteristics  == AVCOL_TRC_IEC61966_2_1)
+        ctx->format = pix_fmts_rgb[color->high_bitdepth + color->twelve_bit];
+
     avctx->profile = seq->seq_profile;
     avctx->level   = seq->seq_level_idx[0];