Merge commit '95eb35f30513e335990ad0d5dca6ddc318477291'

* commit '95eb35f30513e335990ad0d5dca6ddc318477291':
  h264: move the ref lists variables into the per-slice context

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_direct.c
	libavcodec/h264_mb.c
	libavcodec/h264_picture.c
	libavcodec/h264_refs.c
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 54 insertions, 52 deletions

diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 39f4ae3ec9..cee83cd6cc 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -34,11 +34,12 @@
 
 #include <assert.h>
 
-static int get_scale_factor(H264Context *const h, int poc, int poc1, int i)
+static int get_scale_factor(H264Context *const h, H264SliceContext *sl,
+                            int poc, int poc1, int i)
 {
-    int poc0 = h->ref_list[0][i].poc;
+    int poc0 = sl->ref_list[0][i].poc;
     int td = av_clip_int8(poc1 - poc0);
-    if (td == 0 || h->ref_list[0][i].long_ref) {
+    if (td == 0 || sl->ref_list[0][i].long_ref) {
         return 256;
     } else {
         int tb = av_clip_int8(poc - poc0);
@@ -52,29 +53,30 @@ void ff_h264_direct_dist_scale_factor(H264Context *const h,
 {
     const int poc  = FIELD_PICTURE(h) ? h->cur_pic_ptr->field_poc[h->picture_structure == PICT_BOTTOM_FIELD]
                                       : h->cur_pic_ptr->poc;
-    const int poc1 = h->ref_list[1][0].poc;
+    const int poc1 = sl->ref_list[1][0].poc;
     int i, field;
 
     if (FRAME_MBAFF(h))
         for (field = 0; field < 2; field++) {
             const int poc  = h->cur_pic_ptr->field_poc[field];
-            const int poc1 = h->ref_list[1][0].field_poc[field];
-            for (i = 0; i < 2 * h->ref_count[0]; i++)
+            const int poc1 = sl->ref_list[1][0].field_poc[field];
+            for (i = 0; i < 2 * sl->ref_count[0]; i++)
                 sl->dist_scale_factor_field[field][i ^ field] =
-                    get_scale_factor(h, poc, poc1, i + 16);
+                    get_scale_factor(h, sl, poc, poc1, i + 16);
         }
 
-    for (i = 0; i < h->ref_count[0]; i++)
-        sl->dist_scale_factor[i] = get_scale_factor(h, poc, poc1, i);
+    for (i = 0; i < sl->ref_count[0]; i++)
+        sl->dist_scale_factor[i] = get_scale_factor(h, sl, poc, poc1, i);
 }
 
-static void fill_colmap(H264Context *h, int map[2][16 + 32], int list,
+static void fill_colmap(H264Context *h, H264SliceContext *sl,
+                        int map[2][16 + 32], int list,
                         int field, int colfield, int mbafi)
 {
-    H264Picture *const ref1 = &h->ref_list[1][0];
+    H264Picture *const ref1 = &sl->ref_list[1][0];
     int j, old_ref, rfield;
     int start  = mbafi ? 16                       : 0;
-    int end    = mbafi ? 16 + 2 * h->ref_count[0] : h->ref_count[0];
+    int end    = mbafi ? 16 + 2 * sl->ref_count[0] : sl->ref_count[0];
     int interl = mbafi || h->picture_structure != PICT_FRAME;
 
     /* bogus; fills in for missing frames */
@@ -91,8 +93,8 @@ static void fill_colmap(H264Context *h, int map[2][16 + 32], int list,
                 poc = (poc & ~3) + rfield + 1;
 
             for (j = start; j < end; j++) {
-                if (4 * h->ref_list[0][j].frame_num +
-                    (h->ref_list[0][j].reference & 3) == poc) {
+                if (4 * sl->ref_list[0][j].frame_num +
+                    (sl->ref_list[0][j].reference & 3) == poc) {
                     int cur_ref = mbafi ? (j - 16) ^ field : j;
                     if (ref1->mbaff)
                         map[list][2 * old_ref + (rfield ^ field) + 16] = cur_ref;
@@ -107,17 +109,17 @@ static void fill_colmap(H264Context *h, int map[2][16 + 32], int list,
 
 void ff_h264_direct_ref_list_init(H264Context *const h, H264SliceContext *sl)
 {
-    H264Picture *const ref1 = &h->ref_list[1][0];
+    H264Picture *const ref1 = &sl->ref_list[1][0];
     H264Picture *const cur = h->cur_pic_ptr;
     int list, j, field;
     int sidx     = (h->picture_structure & 1) ^ 1;
     int ref1sidx = (ref1->reference      & 1) ^ 1;
 
     for (list = 0; list < 2; list++) {
-        cur->ref_count[sidx][list] = h->ref_count[list];
-        for (j = 0; j < h->ref_count[list]; j++)
-            cur->ref_poc[sidx][list][j] = 4 * h->ref_list[list][j].frame_num +
-                                          (h->ref_list[list][j].reference & 3);
+        cur->ref_count[sidx][list] = sl->ref_count[list];
+        for (j = 0; j < sl->ref_count[list]; j++)
+            cur->ref_poc[sidx][list][j] = 4 * sl->ref_list[list][j].frame_num +
+                                          (sl->ref_list[list][j].reference & 3);
     }
 
     if (h->picture_structure == PICT_FRAME) {
@@ -130,25 +132,25 @@ void ff_h264_direct_ref_list_init(H264Context *const h, H264SliceContext *sl)
     sl->col_fieldoff = 0;
     if (h->picture_structure == PICT_FRAME) {
         int cur_poc  = h->cur_pic_ptr->poc;
-        int *col_poc = h->ref_list[1]->field_poc;
+        int *col_poc = sl->ref_list[1]->field_poc;
         sl->col_parity = (FFABS(col_poc[0] - cur_poc) >=
                           FFABS(col_poc[1] - cur_poc));
         ref1sidx =
         sidx     = sl->col_parity;
     // FL -> FL & differ parity
-    } else if (!(h->picture_structure & h->ref_list[1][0].reference) &&
-               !h->ref_list[1][0].mbaff) {
-        sl->col_fieldoff = 2 * h->ref_list[1][0].reference - 3;
+    } else if (!(h->picture_structure & sl->ref_list[1][0].reference) &&
+               !sl->ref_list[1][0].mbaff) {
+        sl->col_fieldoff = 2 * sl->ref_list[1][0].reference - 3;
     }
 
     if (sl->slice_type_nos != AV_PICTURE_TYPE_B || sl->direct_spatial_mv_pred)
         return;
 
     for (list = 0; list < 2; list++) {
-        fill_colmap(h, sl->map_col_to_list0, list, sidx, ref1sidx, 0);
+        fill_colmap(h, sl, sl->map_col_to_list0, list, sidx, ref1sidx, 0);
         if (FRAME_MBAFF(h))
             for (field = 0; field < 2; field++)
-                fill_colmap(h, sl->map_col_to_list0_field[field], list, field,
+                fill_colmap(h, sl, sl->map_col_to_list0_field[field], list, field,
                             field, 1);
     }
 }
@@ -188,9 +190,9 @@ static void pred_spatial_direct_motion(H264Context *const h, H264SliceContext *s
     int mv[2];
     int list;
 
-    assert(h->ref_list[1][0].reference & 3);
+    assert(sl->ref_list[1][0].reference & 3);
 
-    await_reference_mb_row(h, &h->ref_list[1][0],
+    await_reference_mb_row(h, &sl->ref_list[1][0],
                            h->mb_y + !!IS_INTERLACED(*mb_type));
 
 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16 | MB_TYPE_INTRA4x4 | \
@@ -231,7 +233,7 @@ static void pred_spatial_direct_motion(H264Context *const h, H264SliceContext *s
                 else
                     mv[list] = AV_RN32A(C);
             }
-            av_assert2(ref[list] < (h->ref_count[list] << !!FRAME_MBAFF(h)));
+            av_assert2(ref[list] < (sl->ref_count[list] << !!FRAME_MBAFF(h)));
         } else {
             int mask = ~(MB_TYPE_L0 << (2 * list));
             mv[list]  = 0;
@@ -259,7 +261,7 @@ static void pred_spatial_direct_motion(H264Context *const h, H264SliceContext *s
         return;
     }
 
-    if (IS_INTERLACED(h->ref_list[1][0].mb_type[mb_xy])) { // AFL/AFR/FR/FL -> AFL/FL
+    if (IS_INTERLACED(sl->ref_list[1][0].mb_type[mb_xy])) { // AFL/AFR/FR/FL -> AFL/FL
         if (!IS_INTERLACED(*mb_type)) {                    //     AFR/FR    -> AFL/FL
             mb_y  = (h->mb_y & ~1) + sl->col_parity;
             mb_xy = h->mb_x +
@@ -274,8 +276,8 @@ static void pred_spatial_direct_motion(H264Context *const h, H264SliceContext *s
         if (IS_INTERLACED(*mb_type)) {                   // AFL       /FL -> AFR/FR
             mb_y           =  h->mb_y & ~1;
             mb_xy          = (h->mb_y & ~1) * h->mb_stride + h->mb_x;
-            mb_type_col[0] = h->ref_list[1][0].mb_type[mb_xy];
-            mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy + h->mb_stride];
+            mb_type_col[0] = sl->ref_list[1][0].mb_type[mb_xy];
+            mb_type_col[1] = sl->ref_list[1][0].mb_type[mb_xy + h->mb_stride];
             b8_stride      = 2 + 4 * h->mb_stride;
             b4_stride     *= 6;
             if (IS_INTERLACED(mb_type_col[0]) !=
@@ -295,7 +297,7 @@ static void pred_spatial_direct_motion(H264Context *const h, H264SliceContext *s
         } else {                                         //     AFR/FR    -> AFR/FR
 single_col:
             mb_type_col[0] =
-            mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy];
+            mb_type_col[1] = sl->ref_list[1][0].mb_type[mb_xy];
 
             sub_mb_type |= MB_TYPE_16x16 | MB_TYPE_DIRECT2; /* B_SUB_8x8 */
             if (!is_b8x8 && (mb_type_col[0] & MB_TYPE_16x16_OR_INTRA)) {
@@ -315,12 +317,12 @@ single_col:
         }
     }
 
-    await_reference_mb_row(h, &h->ref_list[1][0], mb_y);
+    await_reference_mb_row(h, &sl->ref_list[1][0], mb_y);
 
-    l1mv0  = (void*)&h->ref_list[1][0].motion_val[0][h->mb2b_xy[mb_xy]];
-    l1mv1  = (void*)&h->ref_list[1][0].motion_val[1][h->mb2b_xy[mb_xy]];
-    l1ref0 = &h->ref_list[1][0].ref_index[0][4 * mb_xy];
-    l1ref1 = &h->ref_list[1][0].ref_index[1][4 * mb_xy];
+    l1mv0  = (void*)&sl->ref_list[1][0].motion_val[0][h->mb2b_xy[mb_xy]];
+    l1mv1  = (void*)&sl->ref_list[1][0].motion_val[1][h->mb2b_xy[mb_xy]];
+    l1ref0 = &sl->ref_list[1][0].ref_index[0][4 * mb_xy];
+    l1ref1 = &sl->ref_list[1][0].ref_index[1][4 * mb_xy];
     if (!b8_stride) {
         if (h->mb_y & 1) {
             l1ref0 += 2;
@@ -347,7 +349,7 @@ single_col:
                            (uint8_t)ref[0], 1);
             fill_rectangle(&sl->ref_cache[1][scan8[i8 * 4]], 2, 2, 8,
                            (uint8_t)ref[1], 1);
-            if (!IS_INTRA(mb_type_col[y8]) && !h->ref_list[1][0].long_ref &&
+            if (!IS_INTRA(mb_type_col[y8]) && !sl->ref_list[1][0].long_ref &&
                 ((l1ref0[xy8] == 0 &&
                   FFABS(l1mv0[xy4][0]) <= 1 &&
                   FFABS(l1mv0[xy4][1]) <= 1) ||
@@ -378,7 +380,7 @@ single_col:
 
         fill_rectangle(&sl->ref_cache[0][scan8[0]], 4, 4, 8, (uint8_t)ref[0], 1);
         fill_rectangle(&sl->ref_cache[1][scan8[0]], 4, 4, 8, (uint8_t)ref[1], 1);
-        if (!IS_INTRA(mb_type_col[0]) && !h->ref_list[1][0].long_ref &&
+        if (!IS_INTRA(mb_type_col[0]) && !sl->ref_list[1][0].long_ref &&
             ((l1ref0[0] == 0 &&
               FFABS(l1mv0[0][0]) <= 1 &&
               FFABS(l1mv0[0][1]) <= 1) ||
@@ -416,7 +418,7 @@ single_col:
 
             assert(b8_stride == 2);
             /* col_zero_flag */
-            if (!IS_INTRA(mb_type_col[0]) && !h->ref_list[1][0].long_ref &&
+            if (!IS_INTRA(mb_type_col[0]) && !sl->ref_list[1][0].long_ref &&
                 (l1ref0[i8] == 0 ||
                  (l1ref0[i8] < 0 &&
                   l1ref1[i8] == 0 &&
@@ -472,12 +474,12 @@ static void pred_temp_direct_motion(H264Context *const h, H264SliceContext *sl,
     unsigned int sub_mb_type;
     int i8, i4;
 
-    assert(h->ref_list[1][0].reference & 3);
+    assert(sl->ref_list[1][0].reference & 3);
 
-    await_reference_mb_row(h, &h->ref_list[1][0],
+    await_reference_mb_row(h, &sl->ref_list[1][0],
                            h->mb_y + !!IS_INTERLACED(*mb_type));
 
-    if (IS_INTERLACED(h->ref_list[1][0].mb_type[mb_xy])) { // AFL/AFR/FR/FL -> AFL/FL
+    if (IS_INTERLACED(sl->ref_list[1][0].mb_type[mb_xy])) { // AFL/AFR/FR/FL -> AFL/FL
         if (!IS_INTERLACED(*mb_type)) {                    //     AFR/FR    -> AFL/FL
             mb_y  = (h->mb_y & ~1) + sl->col_parity;
             mb_xy = h->mb_x +
@@ -492,8 +494,8 @@ static void pred_temp_direct_motion(H264Context *const h, H264SliceContext *sl,
         if (IS_INTERLACED(*mb_type)) {              // AFL       /FL -> AFR/FR
             mb_y           = h->mb_y & ~1;
             mb_xy          = h->mb_x + (h->mb_y & ~1) * h->mb_stride;
-            mb_type_col[0] = h->ref_list[1][0].mb_type[mb_xy];
-            mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy + h->mb_stride];
+            mb_type_col[0] = sl->ref_list[1][0].mb_type[mb_xy];
+            mb_type_col[1] = sl->ref_list[1][0].mb_type[mb_xy + h->mb_stride];
             b8_stride      = 2 + 4 * h->mb_stride;
             b4_stride     *= 6;
             if (IS_INTERLACED(mb_type_col[0]) !=
@@ -516,7 +518,7 @@ static void pred_temp_direct_motion(H264Context *const h, H264SliceContext *sl,
         } else {                                    //     AFR/FR    -> AFR/FR
 single_col:
             mb_type_col[0]     =
-                mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy];
+                mb_type_col[1] = sl->ref_list[1][0].mb_type[mb_xy];
 
             sub_mb_type = MB_TYPE_16x16 | MB_TYPE_P0L0 | MB_TYPE_P0L1 |
                           MB_TYPE_DIRECT2;                  /* B_SUB_8x8 */
@@ -539,12 +541,12 @@ single_col:
         }
     }
 
-    await_reference_mb_row(h, &h->ref_list[1][0], mb_y);
+    await_reference_mb_row(h, &sl->ref_list[1][0], mb_y);
 
-    l1mv0  = (void*)&h->ref_list[1][0].motion_val[0][h->mb2b_xy[mb_xy]];
-    l1mv1  = (void*)&h->ref_list[1][0].motion_val[1][h->mb2b_xy[mb_xy]];
-    l1ref0 = &h->ref_list[1][0].ref_index[0][4 * mb_xy];
-    l1ref1 = &h->ref_list[1][0].ref_index[1][4 * mb_xy];
+    l1mv0  = (void*)&sl->ref_list[1][0].motion_val[0][h->mb2b_xy[mb_xy]];
+    l1mv1  = (void*)&sl->ref_list[1][0].motion_val[1][h->mb2b_xy[mb_xy]];
+    l1ref0 = &sl->ref_list[1][0].ref_index[0][4 * mb_xy];
+    l1ref1 = &sl->ref_list[1][0].ref_index[1][4 * mb_xy];
     if (!b8_stride) {
         if (h->mb_y & 1) {
             l1ref0 += 2;
@@ -565,7 +567,7 @@ single_col:
             map_col_to_list0[1] = sl->map_col_to_list0_field[h->mb_y & 1][1];
             dist_scale_factor   = sl->dist_scale_factor_field[h->mb_y & 1];
         }
-        ref_offset = (h->ref_list[1][0].mbaff << 4) & (mb_type_col[0] >> 3);
+        ref_offset = (sl->ref_list[1][0].mbaff << 4) & (mb_type_col[0] >> 3);
 
         if (IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])) {
             int y_shift = 2 * !IS_INTERLACED(*mb_type);