diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:35:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:35:38 +0100 |
| commit | a2740a060b36f6612043fa3128f4eb6197d0ce13 (patch) | |
| tree | f8420993f59d3f5e6fc1a3284862aea4ae6cac3d /libavcodec/h264_mb_template.c | |
| parent | c07b7e483af6a0bee49c0ac46030d9b10be4913b (diff) | |
| parent | 4bd5ac200d15b4f458a50f66006549825f9fc865 (diff) | |
| download | ffmpeg-a2740a060b36f6612043fa3128f4eb6197d0ce13.tar.gz | |
Merge commit '4bd5ac200d15b4f458a50f66006549825f9fc865'
* commit '4bd5ac200d15b4f458a50f66006549825f9fc865':
h264: move {chroma,intra16x16}_pred_mode into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb_template.c')
| -rw-r--r-- | libavcodec/h264_mb_template.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index 26af1c6bc3..52e06c8aab 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -160,8 +160,8 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) uvlinesize, 1, 0, SIMPLE, PIXEL_SHIFT); if (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) { - h->hpc.pred8x8[h->chroma_pred_mode](dest_cb, uvlinesize); - h->hpc.pred8x8[h->chroma_pred_mode](dest_cr, uvlinesize); + h->hpc.pred8x8[sl->chroma_pred_mode](dest_cb, uvlinesize); + h->hpc.pred8x8[sl->chroma_pred_mode](dest_cr, uvlinesize); } hl_decode_mb_predict_luma(h, sl, mb_type, is_h264, SIMPLE, @@ -195,13 +195,13 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) uint8_t *dest[2] = { dest_cb, dest_cr }; if (transform_bypass) { if (IS_INTRA(mb_type) && h->sps.profile_idc == 244 && - (h->chroma_pred_mode == VERT_PRED8x8 || - h->chroma_pred_mode == HOR_PRED8x8)) { - h->hpc.pred8x8_add[h->chroma_pred_mode](dest[0], + (sl->chroma_pred_mode == VERT_PRED8x8 || + sl->chroma_pred_mode == HOR_PRED8x8)) { + h->hpc.pred8x8_add[sl->chroma_pred_mode](dest[0], block_offset + 16, h->mb + (16 * 16 * 1 << PIXEL_SHIFT), uvlinesize); - h->hpc.pred8x8_add[h->chroma_pred_mode](dest[1], + h->hpc.pred8x8_add[sl->chroma_pred_mode](dest[1], block_offset + 32, h->mb + (16 * 16 * 2 << PIXEL_SHIFT), uvlinesize); |