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 | ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6 (patch) | |
| tree | 151e633149b373656c8119b058efb6d6083f3386 /libavcodec/h264_direct.c | |
| parent | 56febc993b928ccc039a32158ca60b234c311875 (diff) | |
h264: move sub_mb_type into the per-slice context
Diffstat (limited to 'libavcodec/h264_direct.c')
| -rw-r--r-- | libavcodec/h264_direct.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 0700724dd3..f94469522d 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -337,9 +337,9 @@ single_col: int xy4 = x8 * 3 + y8 * b4_stride; int a, b; - if (is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) + if (is_b8x8 && !IS_DIRECT(sl->sub_mb_type[i8])) continue; - h->sub_mb_type[i8] = sub_mb_type; + sl->sub_mb_type[i8] = sub_mb_type; fill_rectangle(&sl->ref_cache[0][scan8[i8 * 4]], 2, 2, 8, (uint8_t)ref[0], 1); @@ -401,9 +401,9 @@ single_col: const int x8 = i8 & 1; const int y8 = i8 >> 1; - if (is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) + if (is_b8x8 && !IS_DIRECT(sl->sub_mb_type[i8])) continue; - h->sub_mb_type[i8] = sub_mb_type; + sl->sub_mb_type[i8] = sub_mb_type; fill_rectangle(&sl->mv_cache[0][scan8[i8 * 4]], 2, 2, 8, mv[0], 4); fill_rectangle(&sl->mv_cache[1][scan8[i8 * 4]], 2, 2, 8, mv[1], 4); @@ -445,7 +445,7 @@ single_col: } } if (!(m & 3)) - h->sub_mb_type[i8] += MB_TYPE_16x16 - MB_TYPE_8x8; + sl->sub_mb_type[i8] += MB_TYPE_16x16 - MB_TYPE_8x8; n += m; } } @@ -575,9 +575,9 @@ single_col: int ref0, scale; const int16_t (*l1mv)[2] = l1mv0; - if (is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) + if (is_b8x8 && !IS_DIRECT(sl->sub_mb_type[i8])) continue; - h->sub_mb_type[i8] = sub_mb_type; + sl->sub_mb_type[i8] = sub_mb_type; fill_rectangle(&sl->ref_cache[1][scan8[i8 * 4]], 2, 2, 8, 0, 1); if (IS_INTRA(mb_type_col[y8])) { @@ -643,9 +643,9 @@ single_col: int ref0, scale; const int16_t (*l1mv)[2] = l1mv0; - if (is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) + if (is_b8x8 && !IS_DIRECT(sl->sub_mb_type[i8])) continue; - h->sub_mb_type[i8] = sub_mb_type; + sl->sub_mb_type[i8] = sub_mb_type; fill_rectangle(&sl->ref_cache[1][scan8[i8 * 4]], 2, 2, 8, 0, 1); if (IS_INTRA(mb_type_col[0])) { fill_rectangle(&sl->ref_cache[0][scan8[i8 * 4]], 2, 2, 8, 0, 1); |