summaryrefslogtreecommitdiffstats
path: root/video/decode/vd_lavc.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-08 02:15:24 +0200
committerwm4 <wm4@nowhere>2013-06-28 21:20:41 +0200
commitac266da6588f25a449a739f7a6a3d2c69ca80e19 (patch)
tree6fc863452bec6fd07b05d057d093946772ba96c7 /video/decode/vd_lavc.c
parent3382a6f6e48c7e093c2b7e0e4a0e28b60a084358 (diff)
downloadmpv-ac266da6588f25a449a739f7a6a3d2c69ca80e19.tar.bz2
mpv-ac266da6588f25a449a739f7a6a3d2c69ca80e19.tar.xz
vo_opengl: handle chroma location
Use the video decoder chroma location flags and render chroma locations other than centered. Until now, we've always used the intuitive and obvious centered chroma location, but H.264 uses something else. FFmpeg provides a small overview in libavcodec/avcodec.h: ----------- /** * X X 3 4 X X are luma samples, * 1 2 1-6 are possible chroma positions * X X 5 6 X 0 is undefined/unknown position */ enum AVChromaLocation{ AVCHROMA_LOC_UNSPECIFIED = 0, AVCHROMA_LOC_LEFT = 1, ///< mpeg2/4, h264 default AVCHROMA_LOC_CENTER = 2, ///< mpeg1, jpeg, h263 AVCHROMA_LOC_TOPLEFT = 3, ///< DV AVCHROMA_LOC_TOP = 4, AVCHROMA_LOC_BOTTOMLEFT = 5, AVCHROMA_LOC_BOTTOM = 6, AVCHROMA_LOC_NB , ///< Not part of ABI }; ----------- The visual difference is literally minimal, but since videophiles apparently consider this detail as quality mark of a video renderer, support it anyway. We don't bother with chroma locations other than centered and left, though. Not sure about correctness, but it's probably ok.
Diffstat (limited to 'video/decode/vd_lavc.c')
-rw-r--r--video/decode/vd_lavc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index f67e6dfbe6..ff1565f38f 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -446,6 +446,8 @@ static int init_vo(sh_video_t *sh, AVFrame *frame)
.d_h = height,
.colorspace = avcol_spc_to_mp_csp(ctx->avctx->colorspace),
.colorlevels = avcol_range_to_mp_csp_levels(ctx->avctx->color_range),
+ .chroma_location =
+ avchroma_location_to_mp(ctx->avctx->chroma_sample_location),
};
if (mpcodecs_reconfig_vo(sh, &ctx->image_params) < 0)
@@ -701,6 +703,7 @@ static int decode(struct sh_video *sh, struct demux_packet *packet,
mpi->colorspace = ctx->image_params.colorspace;
mpi->levels = ctx->image_params.colorlevels;
+ mpi->chroma_location = ctx->image_params.chroma_location;
*out_image = mpi;
return 1;