diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-07-01 15:23:38 +0300 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-07-01 15:23:38 +0300 |
| commit | 5565e271116215a968eec2ac260b91ebe1768f0f (patch) | |
| tree | d0db6c39a7e9cbc05174da4109d19125946544e2 /libavcodec/h264_slice.c | |
| parent | 2021326f995ff2eda5cd2aae600853f6eddb507d (diff) | |
| parent | 6e92181bf836f48627a4733b6fd240a99fd36365 (diff) | |
Merge commit '6e92181bf836f48627a4733b6fd240a99fd36365'
* commit '6e92181bf836f48627a4733b6fd240a99fd36365':
h264: pass just the PPS to get_chroma_qp()
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 30594c1ef6..427554c44e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1593,8 +1593,8 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) return AVERROR_INVALIDDATA; } sl->qscale = tmp; - sl->chroma_qp[0] = get_chroma_qp(h, 0, sl->qscale); - sl->chroma_qp[1] = get_chroma_qp(h, 1, sl->qscale); + sl->chroma_qp[0] = get_chroma_qp(pps, 0, sl->qscale); + sl->chroma_qp[1] = get_chroma_qp(pps, 1, sl->qscale); // FIXME qscale / qp ... stuff if (sl->slice_type == AV_PICTURE_TYPE_SP) get_bits1(&sl->gb); /* sp_for_switch_flag */ @@ -2085,8 +2085,8 @@ static void loop_filter(const H264Context *h, H264SliceContext *sl, int start_x, uvlinesize, 0); if (fill_filter_caches(h, sl, mb_type)) continue; - sl->chroma_qp[0] = get_chroma_qp(h, 0, h->cur_pic.qscale_table[mb_xy]); - sl->chroma_qp[1] = get_chroma_qp(h, 1, h->cur_pic.qscale_table[mb_xy]); + sl->chroma_qp[0] = get_chroma_qp(h->ps.pps, 0, h->cur_pic.qscale_table[mb_xy]); + sl->chroma_qp[1] = get_chroma_qp(h->ps.pps, 1, h->cur_pic.qscale_table[mb_xy]); if (FRAME_MBAFF(h)) { ff_h264_filter_mb(h, sl, mb_x, mb_y, dest_y, dest_cb, dest_cr, @@ -2100,8 +2100,8 @@ static void loop_filter(const H264Context *h, H264SliceContext *sl, int start_x, sl->slice_type = old_slice_type; sl->mb_x = end_x; sl->mb_y = end_mb_y - FRAME_MBAFF(h); - sl->chroma_qp[0] = get_chroma_qp(h, 0, sl->qscale); - sl->chroma_qp[1] = get_chroma_qp(h, 1, sl->qscale); + sl->chroma_qp[0] = get_chroma_qp(h->ps.pps, 0, sl->qscale); + sl->chroma_qp[1] = get_chroma_qp(h->ps.pps, 1, sl->qscale); } static void predict_field_decoding_flag(const H264Context *h, H264SliceContext *sl) |