/**
* @file
- * H.264 / AVC / MPEG4 part10 reference picture handling.
+ * H.264 / AVC / MPEG-4 part10 reference picture handling.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
+#include <inttypes.h>
+
#include "internal.h"
#include "avcodec.h"
#include "h264.h"
#include "golomb.h"
+#include "mpegutils.h"
#include <assert.h>
-#define COPY_PICTURE(dst, src) \
-do {\
- *(dst) = *(src);\
- (dst)->f.extended_data = (dst)->f.data;\
- (dst)->tf.f = &(dst)->f;\
-} while (0)
-
-
-static void pic_as_field(H264Picture *pic, const int parity){
+static void pic_as_field(H264Ref *pic, const int parity)
+{
int i;
- for (i = 0; i < 4; ++i) {
+ for (i = 0; i < FF_ARRAY_ELEMS(pic->data); ++i) {
if (parity == PICT_BOTTOM_FIELD)
- pic->f.data[i] += pic->f.linesize[i];
+ pic->data[i] += pic->linesize[i];
pic->reference = parity;
- pic->f.linesize[i] *= 2;
+ pic->linesize[i] *= 2;
}
- pic->poc= pic->field_poc[parity == PICT_BOTTOM_FIELD];
+ pic->poc = pic->parent->field_poc[parity == PICT_BOTTOM_FIELD];
+}
+
+static void ref_from_h264pic(H264Ref *dst, H264Picture *src)
+{
+ memcpy(dst->data, src->f->data, sizeof(dst->data));
+ memcpy(dst->linesize, src->f->linesize, sizeof(dst->linesize));
+ dst->reference = src->reference;
+ dst->poc = src->poc;
+ dst->pic_id = src->pic_id;
+ dst->parent = src;
}
-static int split_field_copy(H264Picture *dest, H264Picture *src, int parity, int id_add)
+static int split_field_copy(H264Ref *dest, H264Picture *src, int parity, int id_add)
{
int match = !!(src->reference & parity);
if (match) {
- COPY_PICTURE(dest, src);
+ ref_from_h264pic(dest, src);
if (parity != PICT_FRAME) {
pic_as_field(dest, parity);
dest->pic_id *= 2;
return match;
}
-static int build_def_list(H264Picture *def, int def_len,
- H264Picture **in, int len, int is_long, int sel)
+static int build_def_list(H264Ref *def, int def_len,
+ H264Picture * const *in, int len, int is_long, int sel)
{
int i[2] = { 0 };
int index = 0;
return index;
}
-static int add_sorted(H264Picture **sorted, H264Picture **src, int len, int limit, int dir)
+static int add_sorted(H264Picture **sorted, H264Picture * const *src,
+ int len, int limit, int dir)
{
int i, best_poc;
int out_i = 0;
return out_i;
}
-int ff_h264_fill_default_ref_list(H264Context *h)
+static void h264_initialise_ref_list(const H264Context *h, H264SliceContext *sl)
{
int i, len;
- if (h->slice_type_nos == AV_PICTURE_TYPE_B) {
+ if (sl->slice_type_nos == AV_PICTURE_TYPE_B) {
H264Picture *sorted[32];
int cur_poc, list;
int lens[2];
len += add_sorted(sorted + len, h->short_ref, h->short_ref_count, cur_poc, 0 ^ list);
assert(len <= 32);
- len = build_def_list(h->default_ref_list[list], FF_ARRAY_ELEMS(h->default_ref_list[0]),
+ len = build_def_list(sl->ref_list[list], FF_ARRAY_ELEMS(sl->ref_list[0]),
sorted, len, 0, h->picture_structure);
- len += build_def_list(h->default_ref_list[list] + len,
- FF_ARRAY_ELEMS(h->default_ref_list[0]) - len,
+ len += build_def_list(sl->ref_list[list] + len,
+ FF_ARRAY_ELEMS(sl->ref_list[0]) - len,
h->long_ref, 16, 1, h->picture_structure);
- if (len < h->ref_count[list])
- memset(&h->default_ref_list[list][len], 0, sizeof(H264Picture) * (h->ref_count[list] - len));
+ if (len < sl->ref_count[list])
+ memset(&sl->ref_list[list][len], 0, sizeof(H264Ref) * (sl->ref_count[list] - len));
lens[list] = len;
}
if (lens[0] == lens[1] && lens[1] > 1) {
for (i = 0; i < lens[0] &&
- h->default_ref_list[0][i].f.buf[0]->buffer ==
- h->default_ref_list[1][i].f.buf[0]->buffer; i++);
+ sl->ref_list[0][i].parent->f->buf[0]->buffer ==
+ sl->ref_list[1][i].parent->f->buf[0]->buffer; i++);
if (i == lens[0]) {
- H264Picture tmp;
- COPY_PICTURE(&tmp, &h->default_ref_list[1][0]);
- COPY_PICTURE(&h->default_ref_list[1][0], &h->default_ref_list[1][1]);
- COPY_PICTURE(&h->default_ref_list[1][1], &tmp);
+ FFSWAP(H264Ref, sl->ref_list[1][0], sl->ref_list[1][1]);
}
}
} else {
- len = build_def_list(h->default_ref_list[0], FF_ARRAY_ELEMS(h->default_ref_list[0]),
+ len = build_def_list(sl->ref_list[0], FF_ARRAY_ELEMS(sl->ref_list[0]),
h->short_ref, h->short_ref_count, 0, h->picture_structure);
- len += build_def_list(h->default_ref_list[0] + len,
- FF_ARRAY_ELEMS(h->default_ref_list[0]) - len,
+ len += build_def_list(sl->ref_list[0] + len,
+ FF_ARRAY_ELEMS(sl->ref_list[0]) - len,
h-> long_ref, 16, 1, h->picture_structure);
- if (len < h->ref_count[0])
- memset(&h->default_ref_list[0][len], 0, sizeof(H264Picture) * (h->ref_count[0] - len));
- }
-#ifdef TRACE
- for (i = 0; i < h->ref_count[0]; i++) {
- tprintf(h->avctx, "List0: %s fn:%d 0x%p\n",
- (h->default_ref_list[0][i].long_ref ? "LT" : "ST"),
- h->default_ref_list[0][i].pic_id,
- h->default_ref_list[0][i].f.data[0]);
+ if (len < sl->ref_count[0])
+ memset(&sl->ref_list[0][len], 0, sizeof(H264Ref) * (sl->ref_count[0] - len));
}
- if (h->slice_type_nos == AV_PICTURE_TYPE_B) {
- for (i = 0; i < h->ref_count[1]; i++) {
- tprintf(h->avctx, "List1: %s fn:%d 0x%p\n",
- (h->default_ref_list[1][i].long_ref ? "LT" : "ST"),
- h->default_ref_list[1][i].pic_id,
- h->default_ref_list[1][i].f.data[0]);
+}
+
+/**
+ * print short term list
+ */
+static void print_short_term(const H264Context *h)
+{
+ uint32_t i;
+ if (h->avctx->debug & FF_DEBUG_MMCO) {
+ av_log(h->avctx, AV_LOG_DEBUG, "short term list:\n");
+ for (i = 0; i < h->short_ref_count; i++) {
+ H264Picture *pic = h->short_ref[i];
+ av_log(h->avctx, AV_LOG_DEBUG, "%"PRIu32" fn:%d poc:%d %p\n",
+ i, pic->frame_num, pic->poc, pic->f->data[0]);
}
}
-#endif
- return 0;
}
-static void print_short_term(H264Context *h);
-static void print_long_term(H264Context *h);
+/**
+ * print long term list
+ */
+static void print_long_term(const H264Context *h)
+{
+ uint32_t i;
+ if (h->avctx->debug & FF_DEBUG_MMCO) {
+ av_log(h->avctx, AV_LOG_DEBUG, "long term list:\n");
+ for (i = 0; i < 16; i++) {
+ H264Picture *pic = h->long_ref[i];
+ if (pic) {
+ av_log(h->avctx, AV_LOG_DEBUG, "%"PRIu32" fn:%d poc:%d %p\n",
+ i, pic->frame_num, pic->poc, pic->f->data[0]);
+ }
+ }
+ }
+}
/**
* Extract structure information about the picture described by pic_num in
* @return frame number (short term) or long term index of picture
* described by pic_num
*/
-static int pic_num_extract(H264Context *h, int pic_num, int *structure)
+static int pic_num_extract(const H264Context *h, int pic_num, int *structure)
{
*structure = h->picture_structure;
if (FIELD_PICTURE(h)) {
return pic_num;
}
-int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
+int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl)
{
- int list, index, pic_structure, i;
+ int list, index, pic_structure;
print_short_term(h);
print_long_term(h);
- for (list = 0; list < h->list_count; list++) {
- for (i = 0; i < h->ref_count[list]; i++)
- COPY_PICTURE(&h->ref_list[list][i], &h->default_ref_list[list][i]);
+ h264_initialise_ref_list(h, sl);
- if (get_bits1(&h->gb)) { // ref_pic_list_modification_flag_l[01]
+ for (list = 0; list < sl->list_count; list++) {
+ if (get_bits1(&sl->gb)) { // ref_pic_list_modification_flag_l[01]
int pred = h->curr_pic_num;
for (index = 0; ; index++) {
- unsigned int modification_of_pic_nums_idc = get_ue_golomb_31(&h->gb);
+ unsigned int modification_of_pic_nums_idc = get_ue_golomb_31(&sl->gb);
unsigned int pic_id;
int i;
H264Picture *ref = NULL;
if (modification_of_pic_nums_idc == 3)
break;
- if (index >= h->ref_count[list]) {
+ if (index >= sl->ref_count[list]) {
av_log(h->avctx, AV_LOG_ERROR, "reference count overflow\n");
return -1;
}
switch (modification_of_pic_nums_idc) {
case 0:
case 1: {
- const unsigned int abs_diff_pic_num = get_ue_golomb(&h->gb) + 1;
+ const unsigned int abs_diff_pic_num = get_ue_golomb(&sl->gb) + 1;
int frame_num;
if (abs_diff_pic_num > h->max_pic_num) {
}
case 2: {
int long_idx;
- pic_id = get_ue_golomb(&h->gb); // long_term_pic_idx
+ pic_id = get_ue_golomb(&sl->gb); // long_term_pic_idx
long_idx = pic_num_extract(h, pic_id, &pic_structure);
if (i < 0) {
av_log(h->avctx, AV_LOG_ERROR,
"reference picture missing during reorder\n");
- memset(&h->ref_list[list][index], 0, sizeof(H264Picture)); // FIXME
+ memset(&sl->ref_list[list][index], 0, sizeof(sl->ref_list[0][0])); // FIXME
} else {
- for (i = index; i + 1 < h->ref_count[list]; i++) {
- if (ref->long_ref == h->ref_list[list][i].long_ref &&
- ref->pic_id == h->ref_list[list][i].pic_id)
+ for (i = index; i + 1 < sl->ref_count[list]; i++) {
+ if (sl->ref_list[list][i].parent &&
+ ref->long_ref == sl->ref_list[list][i].parent->long_ref &&
+ ref->pic_id == sl->ref_list[list][i].pic_id)
break;
}
for (; i > index; i--) {
- COPY_PICTURE(&h->ref_list[list][i], &h->ref_list[list][i - 1]);
+ sl->ref_list[list][i] = sl->ref_list[list][i - 1];
}
- COPY_PICTURE(&h->ref_list[list][index], ref);
+ ref_from_h264pic(&sl->ref_list[list][index], ref);
if (FIELD_PICTURE(h)) {
- pic_as_field(&h->ref_list[list][index], pic_structure);
+ pic_as_field(&sl->ref_list[list][index], pic_structure);
}
}
}
}
}
- for (list = 0; list < h->list_count; list++) {
- for (index = 0; index < h->ref_count[list]; index++) {
- if (!h->ref_list[list][index].f.buf[0]) {
+ for (list = 0; list < sl->list_count; list++) {
+ for (index = 0; index < sl->ref_count[list]; index++) {
+ if (!sl->ref_list[list][index].parent) {
av_log(h->avctx, AV_LOG_ERROR, "Missing reference picture\n");
- if (h->default_ref_list[list][0].f.buf[0])
- COPY_PICTURE(&h->ref_list[list][index], &h->default_ref_list[list][0]);
+ if (index == 0 || h->avctx->err_recognition & AV_EF_EXPLODE)
+ return AVERROR_INVALIDDATA;
else
- return -1;
+ sl->ref_list[list][index] = sl->ref_list[list][index - 1];
}
}
}
return 0;
}
-void ff_h264_fill_mbaff_ref_list(H264Context *h)
+void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl)
{
int list, i, j;
- for (list = 0; list < 2; list++) { //FIXME try list_count
- for (i = 0; i < h->ref_count[list]; i++) {
- H264Picture *frame = &h->ref_list[list][i];
- H264Picture *field = &h->ref_list[list][16 + 2 * i];
- COPY_PICTURE(field, frame);
+ for (list = 0; list < sl->list_count; list++) { //FIXME try list_count
+ for (i = 0; i < sl->ref_count[list]; i++) {
+ H264Ref *frame = &sl->ref_list[list][i];
+ H264Ref *field = &sl->ref_list[list][16 + 2 * i];
+
+ field[0] = *frame;
+
for (j = 0; j < 3; j++)
- field[0].f.linesize[j] <<= 1;
+ field[0].linesize[j] <<= 1;
field[0].reference = PICT_TOP_FIELD;
- field[0].poc = field[0].field_poc[0];
- COPY_PICTURE(field + 1, field);
+ field[0].poc = field[0].parent->field_poc[0];
+
+ field[1] = field[0];
+
for (j = 0; j < 3; j++)
- field[1].f.data[j] += frame->f.linesize[j];
+ field[1].data[j] += frame->parent->f->linesize[j];
field[1].reference = PICT_BOTTOM_FIELD;
- field[1].poc = field[1].field_poc[1];
+ field[1].poc = field[1].parent->field_poc[1];
- h->luma_weight[16 + 2 * i][list][0] = h->luma_weight[16 + 2 * i + 1][list][0] = h->luma_weight[i][list][0];
- h->luma_weight[16 + 2 * i][list][1] = h->luma_weight[16 + 2 * i + 1][list][1] = h->luma_weight[i][list][1];
+ sl->pwt.luma_weight[16 + 2 * i][list][0] = sl->pwt.luma_weight[16 + 2 * i + 1][list][0] = sl->pwt.luma_weight[i][list][0];
+ sl->pwt.luma_weight[16 + 2 * i][list][1] = sl->pwt.luma_weight[16 + 2 * i + 1][list][1] = sl->pwt.luma_weight[i][list][1];
for (j = 0; j < 2; j++) {
- h->chroma_weight[16 + 2 * i][list][j][0] = h->chroma_weight[16 + 2 * i + 1][list][j][0] = h->chroma_weight[i][list][j][0];
- h->chroma_weight[16 + 2 * i][list][j][1] = h->chroma_weight[16 + 2 * i + 1][list][j][1] = h->chroma_weight[i][list][j][1];
+ sl->pwt.chroma_weight[16 + 2 * i][list][j][0] = sl->pwt.chroma_weight[16 + 2 * i + 1][list][j][0] = sl->pwt.chroma_weight[i][list][j][0];
+ sl->pwt.chroma_weight[16 + 2 * i][list][j][1] = sl->pwt.chroma_weight[16 + 2 * i + 1][list][j][1] = sl->pwt.chroma_weight[i][list][j][1];
}
}
}
}
/**
- *
* @return the removed picture or NULL if an error occurs
*/
static H264Picture *remove_short(H264Context *h, int frame_num, int ref_mask)
h->short_ref_count = 0;
}
-/**
- * print short term list
- */
-static void print_short_term(H264Context *h)
-{
- uint32_t i;
- if (h->avctx->debug & FF_DEBUG_MMCO) {
- av_log(h->avctx, AV_LOG_DEBUG, "short term list:\n");
- for (i = 0; i < h->short_ref_count; i++) {
- H264Picture *pic = h->short_ref[i];
- av_log(h->avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n",
- i, pic->frame_num, pic->poc, pic->f.data[0]);
- }
- }
-}
-
-/**
- * print long term list
- */
-static void print_long_term(H264Context *h)
-{
- uint32_t i;
- if (h->avctx->debug & FF_DEBUG_MMCO) {
- av_log(h->avctx, AV_LOG_DEBUG, "long term list:\n");
- for (i = 0; i < 16; i++) {
- H264Picture *pic = h->long_ref[i];
- if (pic) {
- av_log(h->avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n",
- i, pic->frame_num, pic->poc, pic->f.data[0]);
- }
- }
- }
-}
-
static int check_opcodes(MMCO *mmco1, MMCO *mmco2, int n_mmcos)
{
int i;
MMCO mmco_temp[MAX_MMCO_COUNT], *mmco = first_slice ? h->mmco : mmco_temp;
int mmco_index = 0, i = 0;
- assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count);
+ assert(h->long_ref_count + h->short_ref_count <= h->ps.sps->ref_frame_count);
if (h->short_ref_count &&
- h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count &&
+ h->long_ref_count + h->short_ref_count == h->ps.sps->ref_frame_count &&
!(FIELD_PICTURE(h) && !h->first_field && h->cur_pic_ptr->reference)) {
mmco[0].opcode = MMCO_SHORT2UNUSED;
mmco[0].short_pic_num = h->short_ref[h->short_ref_count - 1]->frame_num;
av_log(h->avctx, AV_LOG_DEBUG, "mmco: unref long failure\n");
break;
case MMCO_LONG:
- // Comment below left from previous code as it is an interresting note.
+ // Comment below left from previous code as it is an interesting note.
/* First field in pair is in short term list or
* at a different long term index.
* This is not allowed; see 7.4.3.3, notes 2 and 3.
if (h->short_ref[0] == h->cur_pic_ptr)
remove_short_at_index(h, 0);
+ /* make sure the current picture is not already assigned as a long ref */
+ if (h->cur_pic_ptr->long_ref) {
+ for (j = 0; j < FF_ARRAY_ELEMS(h->long_ref); j++) {
+ if (h->long_ref[j] == h->cur_pic_ptr)
+ remove_long(h, j, 0);
+ }
+ }
+
+
if (h->long_ref[mmco[i].long_arg] != h->cur_pic_ptr) {
remove_long(h, mmco[i].long_arg, 0);
for (j = 0; j < 16; j++) {
remove_long(h, j, 0);
}
- h->frame_num = h->cur_pic_ptr->frame_num = 0;
+ h->poc.frame_num = h->cur_pic_ptr->frame_num = 0;
h->mmco_reset = 1;
h->cur_pic_ptr->mmco_reset = 1;
break;
}
if (h->long_ref_count + h->short_ref_count -
- (h->short_ref[0] == h->cur_pic_ptr) > h->sps.ref_frame_count) {
+ (h->short_ref[0] == h->cur_pic_ptr) > h->ps.sps->ref_frame_count) {
/* We have too many reference frames, probably due to corrupted
* stream. Need to discard one frame. Prevents overrun of the
av_log(h->avctx, AV_LOG_ERROR,
"number of reference frames (%d+%d) exceeds max (%d; probably "
"corrupt input), discarding one\n",
- h->long_ref_count, h->short_ref_count, h->sps.ref_frame_count);
+ h->long_ref_count, h->short_ref_count, h->ps.sps->ref_frame_count);
err = AVERROR_INVALIDDATA;
if (h->long_ref_count && !h->short_ref_count) {
(h->max_pic_num - 1);
#if 0
if (mmco[i].short_pic_num >= h->short_ref_count ||
- h->short_ref[ mmco[i].short_pic_num ] == NULL){
+ !h->short_ref[mmco[i].short_pic_num]) {
av_log(s->avctx, AV_LOG_ERROR,
"illegal short ref in memory management control "
"operation %d\n", mmco);