diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:13 +0100 |
| commit | b063582e0c4f775a8ba377488bd085595e0e7fae (patch) | |
| tree | 2ea6b975d859df7d1357d79b1d29d67c5d7efbf4 /libavcodec/h264_mb_template.c | |
| parent | 95eb35f30513e335990ad0d5dca6ddc318477291 (diff) | |
h264: move intra_pcm_ptr into the per-slice context
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 7ce72baa00..c4e549326d 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -104,7 +104,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) const int bit_depth = h->sps.bit_depth_luma; int j; GetBitContext gb; - init_get_bits(&gb, h->intra_pcm_ptr, + init_get_bits(&gb, sl->intra_pcm_ptr, ff_h264_mb_sizes[h->sps.chroma_format_idc] * bit_depth); for (i = 0; i < 16; i++) { @@ -139,7 +139,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) } } else { for (i = 0; i < 16; i++) - memcpy(dest_y + i * linesize, h->intra_pcm_ptr + i * 16, 16); + memcpy(dest_y + i * linesize, sl->intra_pcm_ptr + i * 16, 16); if (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) { if (!h->sps.chroma_format_idc) { for (i = 0; i < block_h; i++) { @@ -147,8 +147,8 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) memset(dest_cr + i * uvlinesize, 128, 8); } } else { - const uint8_t *src_cb = h->intra_pcm_ptr + 256; - const uint8_t *src_cr = h->intra_pcm_ptr + 256 + block_h * 8; + const uint8_t *src_cb = sl->intra_pcm_ptr + 256; + const uint8_t *src_cr = sl->intra_pcm_ptr + 256 + block_h * 8; for (i = 0; i < block_h; i++) { memcpy(dest_cb + i * uvlinesize, src_cb + i * 8, 8); memcpy(dest_cr + i * uvlinesize, src_cr + i * 8, 8); @@ -326,7 +326,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext if (PIXEL_SHIFT) { const int bit_depth = h->sps.bit_depth_luma; GetBitContext gb; - init_get_bits(&gb, h->intra_pcm_ptr, 768 * bit_depth); + init_get_bits(&gb, sl->intra_pcm_ptr, 768 * bit_depth); for (p = 0; p < plane_count; p++) for (i = 0; i < 16; i++) { @@ -338,7 +338,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext for (p = 0; p < plane_count; p++) for (i = 0; i < 16; i++) memcpy(dest[p] + i * linesize, - h->intra_pcm_ptr + p * 256 + i * 16, 16); + sl->intra_pcm_ptr + p * 256 + i * 16, 16); } } else { if (IS_INTRA(mb_type)) { |