Browse Source

pgssubdec: fix subpicture output colorspace and range

Functionality used before didn't widen the values from limited to
full range. Additionally, now the decoder uses BT.709 where it
should be used according to the video resolution.

Default for not yet set colorimetry is BT.709 due to most observed
HDMV content being HD.

BT.709 coefficients were gathered from the first two parts of BT.709
to BT.2020 conversion guide in ARIB STD-B62 (Pt. 1, Chapter 6.2.2).
They were additionally confirmed by manually calculating values.

Fixes #4637
(cherry picked from commit 9779b62624)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n2.4.14
Jan Ekström Michael Niedermayer 9 years ago
parent
commit
d445a2e7d8
2 changed files with 18 additions and 2 deletions
  1. +8
    -2
      libavcodec/pgssubdec.c
  2. +10
    -0
      libavutil/colorspace.h

+ 8
- 2
libavcodec/pgssubdec.c View File

@@ -354,8 +354,14 @@ static int parse_palette_segment(AVCodecContext *avctx,
cb = bytestream_get_byte(&buf); cb = bytestream_get_byte(&buf);
alpha = bytestream_get_byte(&buf); alpha = bytestream_get_byte(&buf);


YUV_TO_RGB1(cb, cr);
YUV_TO_RGB2(r, g, b, y);
/* Default to BT.709 colorimetry. In case of <= 576 height use BT.601 */
if (avctx->height <= 0 || avctx->height > 576) {
YUV_TO_RGB1_CCIR_BT709(cb, cr);
} else {
YUV_TO_RGB1_CCIR(cb, cr);
}

YUV_TO_RGB2_CCIR(r, g, b, y);


av_dlog(avctx, "Color %d := (%d,%d,%d,%d)\n", color_id, r, g, b, alpha); av_dlog(avctx, "Color %d := (%d,%d,%d,%d)\n", color_id, r, g, b, alpha);




+ 10
- 0
libavutil/colorspace.h View File

@@ -41,6 +41,16 @@
b_add = FIX(1.77200*255.0/224.0) * cb + ONE_HALF;\ b_add = FIX(1.77200*255.0/224.0) * cb + ONE_HALF;\
} }


#define YUV_TO_RGB1_CCIR_BT709(cb1, cr1)\
{\
cb = (cb1) - 128;\
cr = (cr1) - 128;\
r_add = FIX(1.5747*255.0/224.0) * cr + ONE_HALF;\
g_add = - FIX(0.1873*255.0/224.0) * cb - FIX(0.4682*255.0/224.0) * cr + \
ONE_HALF;\
b_add = FIX(1.8556*255.0/224.0) * cb + ONE_HALF;\
}

#define YUV_TO_RGB2_CCIR(r, g, b, y1)\ #define YUV_TO_RGB2_CCIR(r, g, b, y1)\
{\ {\
y = ((y1) - 16) * FIX(255.0/219.0);\ y = ((y1) - 16) * FIX(255.0/219.0);\


Loading…
Cancel
Save