diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-03-22 13:31:21 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-04-24 10:06:23 +0200 |
| commit | 3176217c60ca7828712985092d9102d331ea4f3d (patch) | |
| tree | 1124709788c4b1b3ec4da9cd8e204cc63039cc8f /libavcodec/h264_mb.c | |
| parent | 44d16df413878588659dd8901bba016b5a869fd1 (diff) | |
h264: decouple h264_ps from the h264 decoder
Make the SPS/PPS parsing independent of the H264Context, to allow
decoupling the parser from the decoder. The change is modelled after the
one done earlier for HEVC.
Move the dequant buffers to the PPS to avoid complex checks whether they
changed and an expensive copy for frame threads.
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index 6006892919..b6773e63b6 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -634,7 +634,7 @@ static av_always_inline void hl_decode_mb_predict_luma(const H264Context *h, for (i = 0; i < 16; i += 4) { uint8_t *const ptr = dest_y + block_offset[i]; const int dir = sl->intra4x4_pred_mode_cache[scan8[i]]; - if (transform_bypass && h->sps.profile_idc == 244 && dir <= 1) { + if (transform_bypass && h->ps.sps->profile_idc == 244 && dir <= 1) { h->hpc.pred8x8l_add[dir](ptr, sl->mb + (i * 16 + p * 256 << pixel_shift), linesize); } else { const int nnz = sl->non_zero_count_cache[scan8[i + p * 16]]; @@ -660,7 +660,7 @@ static av_always_inline void hl_decode_mb_predict_luma(const H264Context *h, uint8_t *const ptr = dest_y + block_offset[i]; const int dir = sl->intra4x4_pred_mode_cache[scan8[i]]; - if (transform_bypass && h->sps.profile_idc == 244 && dir <= 1) { + if (transform_bypass && h->ps.sps->profile_idc == 244 && dir <= 1) { h->hpc.pred4x4_add[dir](ptr, sl->mb + (i * 16 + p * 256 << pixel_shift), linesize); } else { uint8_t *topright; @@ -699,7 +699,7 @@ static av_always_inline void hl_decode_mb_predict_luma(const H264Context *h, if (!transform_bypass) h->h264dsp.h264_luma_dc_dequant_idct(sl->mb + (p * 256 << pixel_shift), sl->mb_luma_dc[p], - h->dequant4_coeff[p][qscale][0]); + h->ps.pps->dequant4_coeff[p][qscale][0]); else { static const uint8_t dc_mapping[16] = { 0 * 16, 1 * 16, 4 * 16, 5 * 16, @@ -731,7 +731,7 @@ static av_always_inline void hl_decode_mb_idct_luma(const H264Context *h, H264Sl if (!IS_INTRA4x4(mb_type)) { if (IS_INTRA16x16(mb_type)) { if (transform_bypass) { - if (h->sps.profile_idc == 244 && + if (h->ps.sps->profile_idc == 244 && (sl->intra16x16_pred_mode == VERT_PRED8x8 || sl->intra16x16_pred_mode == HOR_PRED8x8)) { h->hpc.pred16x16_add[sl->intra16x16_pred_mode](dest_y, block_offset, |