On Tuesday 08 March 2016 07:26:31 pm Ronald S. Bultje wrote:
> On Tue, Mar 8, 2016 at 12:56 PM, Carl Eugen Hoyos wrote:
> > Attached patch fixes ticket #4980 for me.
> > Debugged by Kurosu and Hendrik.
>
> That fixes 444, but not 422. For 422 (idc_fmt=2), horiz_mult (for l/r)
> should be 2, but vert_mult (for t/b) should be 1.
New patch attached.
Thank you for the review, Carl Eugen
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 64d6e2f..bcb63a3 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -856,11 +856,12 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb,
unsigned int *sps_id,
return ret;
if (get_bits1(gb)) { // pic_conformance_flag
- //TODO: * 2 is only valid for 420
- sps->pic_conf_win.left_offset = get_ue_golomb_long(gb) * 2;
- sps->pic_conf_win.right_offset = get_ue_golomb_long(gb) * 2;
- sps->pic_conf_win.top_offset = get_ue_golomb_long(gb) * 2;
- sps->pic_conf_win.bottom_offset = get_ue_golomb_long(gb) * 2;
+ int vert_mult = 1 + (sps->chroma_format_idc < 2);
+ int horiz_mult = 1 + (sps->chroma_format_idc < 3);
+ sps->pic_conf_win.left_offset = get_ue_golomb_long(gb) * horiz_mult;
+ sps->pic_conf_win.right_offset = get_ue_golomb_long(gb) * horiz_mult;
+ sps->pic_conf_win.top_offset = get_ue_golomb_long(gb) * vert_mult;
+ sps->pic_conf_win.bottom_offset = get_ue_golomb_long(gb) * vert_mult;
if (avctx->flags2 & AV_CODEC_FLAG2_IGNORE_CROP) {
av_log(avctx, AV_LOG_DEBUG,
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
