/**
* @file
- * H.264 / AVC / MPEG4 part10 direct mb/block decoding.
+ * H.264 / AVC / MPEG-4 part10 direct mb/block decoding.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
#include "internal.h"
#include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
+#include "h264_ps.h"
#include "mpegutils.h"
#include "rectangle.h"
#include "thread.h"
#include <assert.h>
-static int get_scale_factor(H264Context *const h, int poc, int poc1, int i)
+static int get_scale_factor(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].parent->long_ref) {
return 256;
} else {
int tb = av_clip_int8(poc - poc0);
}
}
-void ff_h264_direct_dist_scale_factor(H264Context *const h)
+void ff_h264_direct_dist_scale_factor(const H264Context *const h,
+ H264SliceContext *sl)
{
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++)
- h->dist_scale_factor_field[field][i ^ field] =
- get_scale_factor(h, poc, poc1, i + 16);
+ const int poc1 = sl->ref_list[1][0].parent->field_poc[field];
+ for (i = 0; i < 2 * sl->ref_count[0]; i++)
+ sl->dist_scale_factor_field[field][i ^ field] =
+ get_scale_factor(sl, poc, poc1, i + 16);
}
- for (i = 0; i < h->ref_count[0]; i++)
- h->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(sl, poc, poc1, i);
}
-static void fill_colmap(H264Context *h, int map[2][16 + 32], int list,
+static void fill_colmap(const 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].parent;
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 */
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].parent->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;
}
}
-void ff_h264_direct_ref_list_init(H264Context *const h, H264SliceContext *sl)
+void ff_h264_direct_ref_list_init(const H264Context *const h, H264SliceContext *sl)
{
- H264Picture *const ref1 = &h->ref_list[1][0];
+ H264Ref *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);
+ for (list = 0; list < sl->list_count; list++) {
+ 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].parent->frame_num +
+ (sl->ref_list[list][j].reference & 3);
}
if (h->picture_structure == PICT_FRAME) {
cur->mbaff = FRAME_MBAFF(h);
- h->col_fieldoff = 0;
+ sl->col_fieldoff = 0;
+
+ if (sl->list_count != 2 || !sl->ref_count[1])
+ return;
+
if (h->picture_structure == PICT_FRAME) {
int cur_poc = h->cur_pic_ptr->poc;
- int *col_poc = h->ref_list[1]->field_poc;
- h->col_parity = (FFABS(col_poc[0] - cur_poc) >=
- FFABS(col_poc[1] - cur_poc));
+ int *col_poc = sl->ref_list[1][0].parent->field_poc;
+ sl->col_parity = (FFABS(col_poc[0] - cur_poc) >=
+ FFABS(col_poc[1] - cur_poc));
ref1sidx =
- sidx = h->col_parity;
+ 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) {
- h->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].parent->mbaff) {
+ sl->col_fieldoff = 2 * sl->ref_list[1][0].reference - 3;
}
- if (sl->slice_type_nos != AV_PICTURE_TYPE_B || h->direct_spatial_mv_pred)
+ if (sl->slice_type_nos != AV_PICTURE_TYPE_B || sl->direct_spatial_mv_pred)
return;
for (list = 0; list < 2; list++) {
- fill_colmap(h, h->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, h->map_col_to_list0_field[field], list, field,
+ fill_colmap(h, sl, sl->map_col_to_list0_field[field], list, field,
field, 1);
}
}
-static void await_reference_mb_row(H264Context *const h, H264Picture *ref,
+static void await_reference_mb_row(const H264Context *const h, H264Ref *ref,
int mb_y)
{
int ref_field = ref->reference - 1;
- int ref_field_picture = ref->field_picture;
+ int ref_field_picture = ref->parent->field_picture;
int ref_height = 16 * h->mb_height >> ref_field_picture;
if (!HAVE_THREADS || !(h->avctx->active_thread_type & FF_THREAD_FRAME))
/* FIXME: It can be safe to access mb stuff
* even if pixels aren't deblocked yet. */
- ff_thread_await_progress(&ref->tf,
+ ff_thread_await_progress(&ref->parent->tf,
FFMIN(16 * mb_y >> ref_field_picture,
ref_height - 1),
ref_field_picture && ref_field);
}
-static void pred_spatial_direct_motion(H264Context *const h, H264SliceContext *sl,
+static void pred_spatial_direct_motion(const H264Context *const h, H264SliceContext *sl,
int *mb_type)
{
int b8_stride = 2;
int b4_stride = h->b_stride;
- int mb_xy = h->mb_xy, mb_y = h->mb_y;
+ int mb_xy = sl->mb_xy, mb_y = sl->mb_y;
int mb_type_col[2];
const int16_t (*l1mv0)[2], (*l1mv1)[2];
const int8_t *l1ref0, *l1ref1;
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],
- h->mb_y + !!IS_INTERLACED(*mb_type));
+ await_reference_mb_row(h, &sl->ref_list[1][0],
+ sl->mb_y + !!IS_INTERLACED(*mb_type));
#define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16 | MB_TYPE_INTRA4x4 | \
MB_TYPE_INTRA16x16 | MB_TYPE_INTRA_PCM)
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].parent->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) + h->col_parity;
- mb_xy = h->mb_x +
- ((h->mb_y & ~1) + h->col_parity) * h->mb_stride;
+ mb_y = (sl->mb_y & ~1) + sl->col_parity;
+ mb_xy = sl->mb_x +
+ ((sl->mb_y & ~1) + sl->col_parity) * h->mb_stride;
b8_stride = 0;
} else {
- mb_y += h->col_fieldoff;
- mb_xy += h->mb_stride * h->col_fieldoff; // non-zero for FL -> FL & differ parity
+ mb_y += sl->col_fieldoff;
+ mb_xy += h->mb_stride * sl->col_fieldoff; // non-zero for FL -> FL & differ parity
}
goto single_col;
} else { // AFL/AFR/FR/FL -> AFR/FR
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_y = sl->mb_y & ~1;
+ mb_xy = (sl->mb_y & ~1) * h->mb_stride + sl->mb_x;
+ mb_type_col[0] = sl->ref_list[1][0].parent->mb_type[mb_xy];
+ mb_type_col[1] = sl->ref_list[1][0].parent->mb_type[mb_xy + h->mb_stride];
b8_stride = 2 + 4 * h->mb_stride;
b4_stride *= 6;
if (IS_INTERLACED(mb_type_col[0]) !=
} 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].parent->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)) {
*mb_type |= MB_TYPE_DIRECT2 |
(mb_type_col[0] & (MB_TYPE_16x8 | MB_TYPE_8x16));
} else {
- if (!h->sps.direct_8x8_inference_flag) {
+ if (!h->ps.sps->direct_8x8_inference_flag) {
/* FIXME: Save sub mb types from previous frames (or derive
* from MVs) so we know exactly what block size to use. */
sub_mb_type += (MB_TYPE_8x8 - MB_TYPE_16x16); /* B_SUB_4x4 */
}
}
- 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 = &h->ref_list[1][0].motion_val[0][h->mb2b_xy[mb_xy]];
- l1mv1 = &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 = &sl->ref_list[1][0].parent->motion_val[0][h->mb2b_xy[mb_xy]];
+ l1mv1 = &sl->ref_list[1][0].parent->motion_val[1][h->mb2b_xy[mb_xy]];
+ l1ref0 = &sl->ref_list[1][0].parent->ref_index[0][4 * mb_xy];
+ l1ref1 = &sl->ref_list[1][0].parent->ref_index[1][4 * mb_xy];
if (!b8_stride) {
- if (h->mb_y & 1) {
+ if (sl->mb_y & 1) {
l1ref0 += 2;
l1ref1 += 2;
l1mv0 += 2 * b4_stride;
(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].parent->long_ref &&
((l1ref0[xy8] == 0 &&
FFABS(l1mv0[xy4][0]) <= 1 &&
FFABS(l1mv0[xy4][1]) <= 1) ||
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].parent->long_ref &&
((l1ref0[0] == 0 &&
FFABS(l1mv0[0][0]) <= 1 &&
FFABS(l1mv0[0][1]) <= 1) ||
(l1ref0[0] < 0 && !l1ref1[0] &&
FFABS(l1mv1[0][0]) <= 1 &&
FFABS(l1mv1[0][1]) <= 1 &&
- h->x264_build > 33U))) {
+ h->sei.unregistered.x264_build > 33U))) {
a = b = 0;
if (ref[0] > 0)
a = mv[0];
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].parent->long_ref &&
(l1ref0[i8] == 0 ||
(l1ref0[i8] < 0 &&
l1ref1[i8] == 0 &&
- h->x264_build > 33U))) {
+ h->sei.unregistered.x264_build > 33U))) {
const int16_t (*l1mv)[2] = l1ref0[i8] == 0 ? l1mv0 : l1mv1;
if (IS_SUB_8X8(sub_mb_type)) {
const int16_t *mv_col = l1mv[x8 * 3 + y8 * 3 * b4_stride];
}
}
-static void pred_temp_direct_motion(H264Context *const h, H264SliceContext *sl,
+static void pred_temp_direct_motion(const H264Context *const h, H264SliceContext *sl,
int *mb_type)
{
int b8_stride = 2;
int b4_stride = h->b_stride;
- int mb_xy = h->mb_xy, mb_y = h->mb_y;
+ int mb_xy = sl->mb_xy, mb_y = sl->mb_y;
int mb_type_col[2];
const int16_t (*l1mv0)[2], (*l1mv1)[2];
const int8_t *l1ref0, *l1ref1;
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],
- h->mb_y + !!IS_INTERLACED(*mb_type));
+ await_reference_mb_row(h, &sl->ref_list[1][0],
+ sl->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].parent->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) + h->col_parity;
- mb_xy = h->mb_x +
- ((h->mb_y & ~1) + h->col_parity) * h->mb_stride;
+ mb_y = (sl->mb_y & ~1) + sl->col_parity;
+ mb_xy = sl->mb_x +
+ ((sl->mb_y & ~1) + sl->col_parity) * h->mb_stride;
b8_stride = 0;
} else {
- mb_y += h->col_fieldoff;
- mb_xy += h->mb_stride * h->col_fieldoff; // non-zero for FL -> FL & differ parity
+ mb_y += sl->col_fieldoff;
+ mb_xy += h->mb_stride * sl->col_fieldoff; // non-zero for FL -> FL & differ parity
}
goto single_col;
} else { // AFL/AFR/FR/FL -> AFR/FR
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_y = sl->mb_y & ~1;
+ mb_xy = sl->mb_x + (sl->mb_y & ~1) * h->mb_stride;
+ mb_type_col[0] = sl->ref_list[1][0].parent->mb_type[mb_xy];
+ mb_type_col[1] = sl->ref_list[1][0].parent->mb_type[mb_xy + h->mb_stride];
b8_stride = 2 + 4 * h->mb_stride;
b4_stride *= 6;
if (IS_INTERLACED(mb_type_col[0]) !=
} 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].parent->mb_type[mb_xy];
sub_mb_type = MB_TYPE_16x16 | MB_TYPE_P0L0 | MB_TYPE_P0L1 |
MB_TYPE_DIRECT2; /* B_SUB_8x8 */
*mb_type |= MB_TYPE_L0L1 | MB_TYPE_DIRECT2 |
(mb_type_col[0] & (MB_TYPE_16x8 | MB_TYPE_8x16));
} else {
- if (!h->sps.direct_8x8_inference_flag) {
+ if (!h->ps.sps->direct_8x8_inference_flag) {
/* FIXME: save sub mb types from previous frames (or derive
* from MVs) so we know exactly what block size to use */
sub_mb_type = MB_TYPE_8x8 | MB_TYPE_P0L0 | MB_TYPE_P0L1 |
}
}
- 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 = &h->ref_list[1][0].motion_val[0][h->mb2b_xy[mb_xy]];
- l1mv1 = &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 = &sl->ref_list[1][0].parent->motion_val[0][h->mb2b_xy[mb_xy]];
+ l1mv1 = &sl->ref_list[1][0].parent->motion_val[1][h->mb2b_xy[mb_xy]];
+ l1ref0 = &sl->ref_list[1][0].parent->ref_index[0][4 * mb_xy];
+ l1ref1 = &sl->ref_list[1][0].parent->ref_index[1][4 * mb_xy];
if (!b8_stride) {
- if (h->mb_y & 1) {
+ if (sl->mb_y & 1) {
l1ref0 += 2;
l1ref1 += 2;
l1mv0 += 2 * b4_stride;
}
{
- const int *map_col_to_list0[2] = { h->map_col_to_list0[0],
- h->map_col_to_list0[1] };
- const int *dist_scale_factor = h->dist_scale_factor;
+ const int *map_col_to_list0[2] = { sl->map_col_to_list0[0],
+ sl->map_col_to_list0[1] };
+ const int *dist_scale_factor = sl->dist_scale_factor;
int ref_offset;
if (FRAME_MBAFF(h) && IS_INTERLACED(*mb_type)) {
- map_col_to_list0[0] = h->map_col_to_list0_field[h->mb_y & 1][0];
- map_col_to_list0[1] = h->map_col_to_list0_field[h->mb_y & 1][1];
- dist_scale_factor = h->dist_scale_factor_field[h->mb_y & 1];
+ map_col_to_list0[0] = sl->map_col_to_list0_field[sl->mb_y & 1][0];
+ map_col_to_list0[1] = sl->map_col_to_list0_field[sl->mb_y & 1][1];
+ dist_scale_factor = sl->dist_scale_factor_field[sl->mb_y & 1];
}
- ref_offset = (h->ref_list[1][0].mbaff << 4) & (mb_type_col[0] >> 3);
+ ref_offset = (sl->ref_list[1][0].parent->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);
- assert(h->sps.direct_8x8_inference_flag);
+ assert(h->ps.sps->direct_8x8_inference_flag);
for (i8 = 0; i8 < 4; i8++) {
const int x8 = i8 & 1;
}
}
-void ff_h264_pred_direct_motion(H264Context *const h, H264SliceContext *sl,
+void ff_h264_pred_direct_motion(const H264Context *const h, H264SliceContext *sl,
int *mb_type)
{
- if (h->direct_spatial_mv_pred)
+ if (sl->direct_spatial_mv_pred)
pred_spatial_direct_motion(h, sl, mb_type);
else
pred_temp_direct_motion(h, sl, mb_type);
projects / ffmpeg / blobdiff