RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/hevc_ps: Fix offset for yuv422 and yuv444. 

Fixes ticket #4980.
Analyzed-by: kurosu and Hendrik
Reviewed-by: Ronald
This commit is contained in:
Carl Eugen Hoyos 2016-03-09 14:00:57 +01:00
parent 144ef773c7
commit a6a52ef29a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/hevc_ps.c
View File

@ -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,