[FFmpeg-cvslog] h264: deMpegEncContextize
Anton Khirnov
git at videolan.org
Sat Feb 16 23:33:53 CET 2013
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Feb 3 11:10:05 2013 +0100| [2c541554076cc8a72e7145d4da30389ca763f32f] | committer: Anton Khirnov
h264: deMpegEncContextize
Most of the changes are just trivial are just trivial replacements of
fields from MpegEncContext with equivalent fields in H264Context.
Everything in h264* other than h264.c are those trivial changes.
The nontrivial parts are:
1) extracting a simplified version of the frame management code from
mpegvideo.c. We don't need last/next_picture anymore, since h264 uses
its own more complex system already and those were set only to appease
the mpegvideo parts.
2) some tables that need to be allocated/freed in appropriate places.
3) hwaccels -- mostly trivial replacements.
for dxva, the draw_horiz_band() call is moved from
ff_dxva2_common_end_frame() to per-codec end_frame() callbacks,
because it's now different for h264 and MpegEncContext-based
decoders.
4) svq3 -- it does not use h264 complex reference system, so I just
added some very simplistic frame management instead and dropped the
use of ff_h264_frame_start(). Because of this I also had to move some
initialization code to svq3.
Additional fixes for chroma format and bit depth changes by
Janne Grunau <janne-libav at jannau.net>
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c541554076cc8a72e7145d4da30389ca763f32f
---
libavcodec/dxva2.c | 6 +-
libavcodec/dxva2_h264.c | 48 +-
libavcodec/dxva2_internal.h | 2 +-
libavcodec/dxva2_mpeg2.c | 12 +-
libavcodec/dxva2_vc1.c | 12 +-
libavcodec/h264.c | 1798 ++++++++++++++++++++++++-----------------
libavcodec/h264.h | 70 +-
libavcodec/h264_cabac.c | 101 ++-
libavcodec/h264_cavlc.c | 151 ++--
libavcodec/h264_direct.c | 73 +-
libavcodec/h264_loopfilter.c | 61 +-
libavcodec/h264_mb_template.c | 102 ++-
libavcodec/h264_mc_template.c | 7 +-
libavcodec/h264_mvpred.h | 97 ++-
libavcodec/h264_parser.c | 46 +-
libavcodec/h264_ps.c | 266 +++---
libavcodec/h264_refs.c | 138 ++--
libavcodec/h264_sei.c | 91 +--
libavcodec/h264pred.c | 2 -
libavcodec/mpegvideo.h | 2 +-
libavcodec/svq3.c | 582 +++++++------
libavcodec/vaapi.c | 45 +-
libavcodec/vaapi_h264.c | 32 +-
libavcodec/vaapi_internal.h | 6 +-
libavcodec/vaapi_mpeg2.c | 7 +-
libavcodec/vaapi_mpeg4.c | 9 +-
libavcodec/vaapi_vc1.c | 11 +-
libavcodec/vda_h264.c | 2 +-
libavcodec/vdpau.c | 54 +-
libavcodec/vdpau_h264.c | 24 +-
libavcodec/vdpau_internal.h | 11 +-
libavcodec/vdpau_mpeg12.c | 4 +-
libavcodec/vdpau_mpeg4.c | 4 +-
libavcodec/vdpau_vc1.c | 4 +-
34 files changed, 2162 insertions(+), 1718 deletions(-)
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c
index 63addb7..bc43cae 100644
--- a/libavcodec/dxva2.c
+++ b/libavcodec/dxva2.c
@@ -76,7 +76,7 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx,
return result;
}
-int ff_dxva2_common_end_frame(AVCodecContext *avctx, MpegEncContext *s,
+int ff_dxva2_common_end_frame(AVCodecContext *avctx, Picture *pic,
const void *pp, unsigned pp_size,
const void *qm, unsigned qm_size,
int (*commit_bs_si)(AVCodecContext *,
@@ -90,7 +90,7 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, MpegEncContext *s,
int result;
if (FAILED(IDirectXVideoDecoder_BeginFrame(ctx->decoder,
- ff_dxva2_get_surface(s->current_picture_ptr),
+ ff_dxva2_get_surface(pic),
NULL))) {
av_log(avctx, AV_LOG_ERROR, "Failed to begin frame\n");
return -1;
@@ -146,7 +146,5 @@ end:
result = -1;
}
- if (!result)
- ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
return result;
}
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index 2fd0767..7009d6c 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -44,15 +44,14 @@ static void fill_picture_entry(DXVA_PicEntry_H264 *pic,
static void fill_picture_parameters(struct dxva_context *ctx, const H264Context *h,
DXVA_PicParams_H264 *pp)
{
- const MpegEncContext *s = &h->s;
- const Picture *current_picture = s->current_picture_ptr;
+ const Picture *current_picture = h->cur_pic_ptr;
int i, j;
memset(pp, 0, sizeof(*pp));
/* Configure current picture */
fill_picture_entry(&pp->CurrPic,
ff_dxva2_get_surface_index(ctx, current_picture),
- s->picture_structure == PICT_BOTTOM_FIELD);
+ h->picture_structure == PICT_BOTTOM_FIELD);
/* Configure the set of references */
pp->UsedForReferenceFlags = 0;
pp->NonExistingFrameFlags = 0;
@@ -88,13 +87,13 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context
}
}
- pp->wFrameWidthInMbsMinus1 = s->mb_width - 1;
- pp->wFrameHeightInMbsMinus1 = s->mb_height - 1;
+ pp->wFrameWidthInMbsMinus1 = h->mb_width - 1;
+ pp->wFrameHeightInMbsMinus1 = h->mb_height - 1;
pp->num_ref_frames = h->sps.ref_frame_count;
- pp->wBitFields = ((s->picture_structure != PICT_FRAME) << 0) |
+ pp->wBitFields = ((h->picture_structure != PICT_FRAME) << 0) |
((h->sps.mb_aff &&
- (s->picture_structure == PICT_FRAME)) << 1) |
+ (h->picture_structure == PICT_FRAME)) << 1) |
(h->sps.residual_color_transform_flag << 2) |
/* sp_for_switch_flag (not implemented by Libav) */
(0 << 3) |
@@ -120,11 +119,11 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context
pp->Reserved16Bits = 3; /* FIXME is there a way to detect the right mode ? */
pp->StatusReportFeedbackNumber = 1 + ctx->report_id++;
pp->CurrFieldOrderCnt[0] = 0;
- if ((s->picture_structure & PICT_TOP_FIELD) &&
+ if ((h->picture_structure & PICT_TOP_FIELD) &&
current_picture->field_poc[0] != INT_MAX)
pp->CurrFieldOrderCnt[0] = current_picture->field_poc[0];
pp->CurrFieldOrderCnt[1] = 0;
- if ((s->picture_structure & PICT_BOTTOM_FIELD) &&
+ if ((h->picture_structure & PICT_BOTTOM_FIELD) &&
current_picture->field_poc[1] != INT_MAX)
pp->CurrFieldOrderCnt[1] = current_picture->field_poc[1];
pp->pic_init_qs_minus26 = h->pps.init_qs - 26;
@@ -200,7 +199,6 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice,
{
const H264Context *h = avctx->priv_data;
struct dxva_context *ctx = avctx->hwaccel_context;
- const MpegEncContext *s = &h->s;
unsigned list;
memset(slice, 0, sizeof(*slice));
@@ -208,9 +206,9 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice,
slice->SliceBytesInBuffer = size;
slice->wBadSliceChopping = 0;
- slice->first_mb_in_slice = (s->mb_y >> FIELD_OR_MBAFF_PICTURE) * s->mb_width + s->mb_x;
+ slice->first_mb_in_slice = (h->mb_y >> FIELD_OR_MBAFF_PICTURE) * h->mb_width + h->mb_x;
slice->NumMbsForSlice = 0; /* XXX it is set once we have all slices */
- slice->BitOffsetToSliceData = get_bits_count(&s->gb);
+ slice->BitOffsetToSliceData = get_bits_count(&h->gb);
slice->slice_type = ff_h264_get_slice_type(h);
if (h->slice_type_fixed)
slice->slice_type += 5;
@@ -260,7 +258,7 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice,
}
}
slice->slice_qs_delta = 0; /* XXX not implemented by Libav */
- slice->slice_qp_delta = s->qscale - h->pps.init_qp;
+ slice->slice_qp_delta = h->qscale - h->pps.init_qp;
slice->redundant_pic_cnt = h->redundant_pic_count;
if (h->slice_type == AV_PICTURE_TYPE_B)
slice->direct_spatial_mv_pred_flag = h->direct_spatial_mv_pred;
@@ -277,10 +275,9 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
DXVA2_DecodeBufferDesc *sc)
{
const H264Context *h = avctx->priv_data;
- const MpegEncContext *s = &h->s;
- const unsigned mb_count = s->mb_width * s->mb_height;
+ const unsigned mb_count = h->mb_width * h->mb_height;
struct dxva_context *ctx = avctx->hwaccel_context;
- const Picture *current_picture = h->s.current_picture_ptr;
+ const Picture *current_picture = h->cur_pic_ptr;
struct dxva2_picture_context *ctx_pic = current_picture->f.hwaccel_picture_private;
DXVA_Slice_H264_Short *slice = NULL;
uint8_t *dxva_data, *current, *end;
@@ -376,7 +373,7 @@ static int start_frame(AVCodecContext *avctx,
{
const H264Context *h = avctx->priv_data;
struct dxva_context *ctx = avctx->hwaccel_context;
- struct dxva2_picture_context *ctx_pic = h->s.current_picture_ptr->f.hwaccel_picture_private;
+ struct dxva2_picture_context *ctx_pic = h->cur_pic_ptr->f.hwaccel_picture_private;
if (!ctx->decoder || !ctx->cfg || ctx->surface_count <= 0)
return -1;
@@ -399,7 +396,7 @@ static int decode_slice(AVCodecContext *avctx,
{
const H264Context *h = avctx->priv_data;
struct dxva_context *ctx = avctx->hwaccel_context;
- const Picture *current_picture = h->s.current_picture_ptr;
+ const Picture *current_picture = h->cur_pic_ptr;
struct dxva2_picture_context *ctx_pic = current_picture->f.hwaccel_picture_private;
unsigned position;
@@ -427,16 +424,19 @@ static int decode_slice(AVCodecContext *avctx,
static int end_frame(AVCodecContext *avctx)
{
H264Context *h = avctx->priv_data;
- MpegEncContext *s = &h->s;
struct dxva2_picture_context *ctx_pic =
- h->s.current_picture_ptr->f.hwaccel_picture_private;
+ h->cur_pic_ptr->f.hwaccel_picture_private;
+ int ret;
if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0)
return -1;
- return ff_dxva2_common_end_frame(avctx, s,
- &ctx_pic->pp, sizeof(ctx_pic->pp),
- &ctx_pic->qm, sizeof(ctx_pic->qm),
- commit_bitstream_and_slice_buffer);
+ ret = ff_dxva2_common_end_frame(avctx, h->cur_pic_ptr,
+ &ctx_pic->pp, sizeof(ctx_pic->pp),
+ &ctx_pic->qm, sizeof(ctx_pic->qm),
+ commit_bitstream_and_slice_buffer);
+ if (!ret)
+ ff_h264_draw_horiz_band(h, 0, h->avctx->height);
+ return ret;
}
AVHWAccel ff_h264_dxva2_hwaccel = {
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h
index e2305b1..a81cfbe 100644
--- a/libavcodec/dxva2_internal.h
+++ b/libavcodec/dxva2_internal.h
@@ -47,7 +47,7 @@ int ff_dxva2_commit_buffer(AVCodecContext *, struct dxva_context *,
unsigned mb_count);
-int ff_dxva2_common_end_frame(AVCodecContext *, MpegEncContext *,
+int ff_dxva2_common_end_frame(AVCodecContext *, Picture *,
const void *pp, unsigned pp_size,
const void *qm, unsigned qm_size,
int (*commit_bs_si)(AVCodecContext *,
diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c
index fa6ae7b..e247731 100644
--- a/libavcodec/dxva2_mpeg2.c
+++ b/libavcodec/dxva2_mpeg2.c
@@ -251,13 +251,17 @@ static int end_frame(AVCodecContext *avctx)
struct MpegEncContext *s = avctx->priv_data;
struct dxva2_picture_context *ctx_pic =
s->current_picture_ptr->f.hwaccel_picture_private;
+ int ret;
if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0)
return -1;
- return ff_dxva2_common_end_frame(avctx, s,
- &ctx_pic->pp, sizeof(ctx_pic->pp),
- &ctx_pic->qm, sizeof(ctx_pic->qm),
- commit_bitstream_and_slice_buffer);
+ ret = ff_dxva2_common_end_frame(avctx, s->current_picture_ptr,
+ &ctx_pic->pp, sizeof(ctx_pic->pp),
+ &ctx_pic->qm, sizeof(ctx_pic->qm),
+ commit_bitstream_and_slice_buffer);
+ if (!ret)
+ ff_mpeg_draw_horiz_band(s, 0, avctx->height);
+ return ret;
}
AVHWAccel ff_mpeg2_dxva2_hwaccel = {
diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c
index 5aed2f3..0767055 100644
--- a/libavcodec/dxva2_vc1.c
+++ b/libavcodec/dxva2_vc1.c
@@ -254,14 +254,18 @@ static int end_frame(AVCodecContext *avctx)
{
VC1Context *v = avctx->priv_data;
struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->f.hwaccel_picture_private;
+ int ret;
if (ctx_pic->bitstream_size <= 0)
return -1;
- return ff_dxva2_common_end_frame(avctx, &v->s,
- &ctx_pic->pp, sizeof(ctx_pic->pp),
- NULL, 0,
- commit_bitstream_and_slice_buffer);
+ ret = ff_dxva2_common_end_frame(avctx, v->s.current_picture_ptr,
+ &ctx_pic->pp, sizeof(ctx_pic->pp),
+ NULL, 0,
+ commit_bitstream_and_slice_buffer);
+ if (!ret)
+ ff_mpeg_draw_horiz_band(&v->s, 0, avctx->height);
+ return ret;
}
#if CONFIG_WMV3_DXVA2_HWACCEL
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index b5efde0..79e4b0b 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -83,11 +83,10 @@ static void h264_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type,
int mb_x, int mb_y, int mb_intra, int mb_skipped)
{
H264Context *h = opaque;
- MpegEncContext *s = &h->s;
- s->mb_x = mb_x;
- s->mb_y = mb_y;
- h->mb_xy = s->mb_x + s->mb_y * s->mb_stride;
+ h->mb_x = mb_x;
+ h->mb_y = mb_y;
+ h->mb_xy = mb_x + mb_y * h->mb_stride;
memset(h->non_zero_count_cache, 0, sizeof(h->non_zero_count_cache));
assert(ref >= 0);
/* FIXME: It is possible albeit uncommon that slice references
@@ -96,22 +95,179 @@ static void h264_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type,
* practice then correct remapping should be added. */
if (ref >= h->ref_count[0])
ref = 0;
- fill_rectangle(&s->current_picture.f.ref_index[0][4 * h->mb_xy],
+ fill_rectangle(&h->cur_pic.f.ref_index[0][4 * h->mb_xy],
2, 2, 2, ref, 1);
fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref, 1);
fill_rectangle(h->mv_cache[0][scan8[0]], 4, 4, 8,
- pack16to32(s->mv[0][0][0], s->mv[0][0][1]), 4);
+ pack16to32((*mv)[0][0][0], (*mv)[0][0][1]), 4);
assert(!FRAME_MBAFF);
ff_h264_hl_decode_mb(h);
}
+void ff_h264_draw_horiz_band(H264Context *h, int y, int height)
+{
+ ff_draw_horiz_band(h->avctx, &h->dsp, &h->cur_pic,
+ h->ref_list[0][0].f.data[0] ? &h->ref_list[0][0] : NULL,
+ y, height, h->picture_structure, h->first_field, 1,
+ h->low_delay, h->mb_height * 16, h->mb_width * 16);
+}
+
+static void free_frame_buffer(H264Context *h, Picture *pic)
+{
+ ff_thread_release_buffer(h->avctx, &pic->f);
+ av_freep(&pic->f.hwaccel_picture_private);
+}
+
+static void free_picture(H264Context *h, Picture *pic)
+{
+ int i;
+
+ if (pic->f.data[0])
+ free_frame_buffer(h, pic);
+
+ av_freep(&pic->qscale_table_base);
+ pic->f.qscale_table = NULL;
+ av_freep(&pic->mb_type_base);
+ pic->f.mb_type = NULL;
+ for (i = 0; i < 2; i++) {
+ av_freep(&pic->motion_val_base[i]);
+ av_freep(&pic->f.ref_index[i]);
+ pic->f.motion_val[i] = NULL;
+ }
+}
+
+static void release_unused_pictures(H264Context *h, int remove_current)
+{
+ int i;
+
+ /* release non reference frames */
+ for (i = 0; i < h->picture_count; i++) {
+ if (h->DPB[i].f.data[0] && !h->DPB[i].f.reference &&
+ (!h->DPB[i].owner2 || h->DPB[i].owner2 == h) &&
+ (remove_current || &h->DPB[i] != h->cur_pic_ptr)) {
+ free_frame_buffer(h, &h->DPB[i]);
+ }
+ }
+}
+
+static int alloc_scratch_buffers(H264Context *h, int linesize)
+{
+ int alloc_size = FFALIGN(FFABS(linesize) + 32, 32);
+
+ if (h->bipred_scratchpad)
+ return 0;
+
+ h->bipred_scratchpad = av_malloc(16 * 6 * alloc_size);
+ // edge emu needs blocksize + filter length - 1
+ // (= 21x21 for h264)
+ h->edge_emu_buffer = av_mallocz(alloc_size * 2 * 21);
+ h->me.scratchpad = av_mallocz(alloc_size * 2 * 16 * 2);
+
+ if (!h->bipred_scratchpad || !h->edge_emu_buffer || !h->me.scratchpad) {
+ av_freep(&h->bipred_scratchpad);
+ av_freep(&h->edge_emu_buffer);
+ av_freep(&h->me.scratchpad);
+ return AVERROR(ENOMEM);
+ }
+
+ h->me.temp = h->me.scratchpad;
+
+ return 0;
+}
+
+static int alloc_picture(H264Context *h, Picture *pic)
+{
+ const int big_mb_num = h->mb_stride * (h->mb_height + 1) + 1;
+ const int mb_array_size = h->mb_stride * h->mb_height;
+ const int b4_stride = h->mb_width * 4 + 1;
+ const int b4_array_size = b4_stride * h->mb_height * 4;
+ int i, ret = 0;
+
+ av_assert0(!pic->f.data[0]);
+
+ if (h->avctx->hwaccel) {
+ const AVHWAccel *hwaccel = h->avctx->hwaccel;
+ av_assert0(!pic->f.hwaccel_picture_private);
+ if (hwaccel->priv_data_size) {
+ pic->f.hwaccel_picture_private = av_mallocz(hwaccel->priv_data_size);
+ if (!pic->f.hwaccel_picture_private)
+ return AVERROR(ENOMEM);
+ }
+ }
+ ret = ff_thread_get_buffer(h->avctx, &pic->f);
+ if (ret < 0)
+ goto fail;
+
+ h->linesize = pic->f.linesize[0];
+ h->uvlinesize = pic->f.linesize[1];
+
+ if (pic->f.qscale_table == NULL) {
+ FF_ALLOCZ_OR_GOTO(h->avctx, pic->qscale_table_base,
+ (big_mb_num + h->mb_stride) * sizeof(uint8_t),
+ fail)
+ FF_ALLOCZ_OR_GOTO(h->avctx, pic->mb_type_base,
+ (big_mb_num + h->mb_stride) * sizeof(uint32_t),
+ fail)
+ pic->f.mb_type = pic->mb_type_base + 2 * h->mb_stride + 1;
+ pic->f.qscale_table = pic->qscale_table_base + 2 * h->mb_stride + 1;
+
+ for (i = 0; i < 2; i++) {
+ FF_ALLOCZ_OR_GOTO(h->avctx, pic->motion_val_base[i],
+ 2 * (b4_array_size + 4) * sizeof(int16_t),
+ fail)
+ pic->f.motion_val[i] = pic->motion_val_base[i] + 4;
+ FF_ALLOCZ_OR_GOTO(h->avctx, pic->f.ref_index[i],
+ 4 * mb_array_size * sizeof(uint8_t), fail)
+ }
+ pic->f.motion_subsample_log2 = 2;
+
+ pic->f.qstride = h->mb_stride;
+ }
+
+ pic->owner2 = h;
+
+ return 0;
+fail:
+ free_frame_buffer(h, pic);
+ return (ret < 0) ? ret : AVERROR(ENOMEM);
+}
+
+static inline int pic_is_unused(H264Context *h, Picture *pic)
+{
+ if (pic->f.data[0] == NULL)
+ return 1;
+ if (pic->needs_realloc && !(pic->f.reference & DELAYED_PIC_REF))
+ if (!pic->owner2 || pic->owner2 == h)
+ return 1;
+ return 0;
+}
+
+static int find_unused_picture(H264Context *h)
+{
+ int i;
+
+ for (i = h->picture_range_start; i < h->picture_range_end; i++) {
+ if (pic_is_unused(h, &h->DPB[i]))
+ break;
+ }
+ if (i == h->picture_range_end)
+ return AVERROR_INVALIDDATA;
+
+ if (h->DPB[i].needs_realloc) {
+ h->DPB[i].needs_realloc = 0;
+ free_picture(h, &h->DPB[i]);
+ avcodec_get_frame_defaults(&h->DPB[i].f);
+ }
+
+ return i;
+}
+
/**
* Check if the top & left blocks are available if needed and
* change the dc mode so it only uses the available blocks.
*/
int ff_h264_check_intra4x4_pred_mode(H264Context *h)
{
- MpegEncContext *const s = &h->s;
static const int8_t top[12] = {
-1, 0, LEFT_DC_PRED, -1, -1, -1, -1, -1, 0
};
@@ -124,9 +280,9 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h)
for (i = 0; i < 4; i++) {
int status = top[h->intra4x4_pred_mode_cache[scan8[0] + i]];
if (status < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"top block unavailable for requested intra4x4 mode %d at %d %d\n",
- status, s->mb_x, s->mb_y);
+ status, h->mb_x, h->mb_y);
return -1;
} else if (status) {
h->intra4x4_pred_mode_cache[scan8[0] + i] = status;
@@ -140,9 +296,9 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h)
if (!(h->left_samples_available & mask[i])) {
int status = left[h->intra4x4_pred_mode_cache[scan8[0] + 8 * i]];
if (status < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"left block unavailable for requested intra4x4 mode %d at %d %d\n",
- status, s->mb_x, s->mb_y);
+ status, h->mb_x, h->mb_y);
return -1;
} else if (status) {
h->intra4x4_pred_mode_cache[scan8[0] + 8 * i] = status;
@@ -159,23 +315,22 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h)
*/
int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma)
{
- MpegEncContext *const s = &h->s;
static const int8_t top[7] = { LEFT_DC_PRED8x8, 1, -1, -1 };
static const int8_t left[7] = { TOP_DC_PRED8x8, -1, 2, -1, DC_128_PRED8x8 };
if (mode > 6U) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"out of range intra chroma pred mode at %d %d\n",
- s->mb_x, s->mb_y);
+ h->mb_x, h->mb_y);
return -1;
}
if (!(h->top_samples_available & 0x8000)) {
mode = top[mode];
if (mode < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"top block unavailable for requested intra mode at %d %d\n",
- s->mb_x, s->mb_y);
+ h->mb_x, h->mb_y);
return -1;
}
}
@@ -189,9 +344,9 @@ int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma)
2 * (mode == DC_128_PRED8x8);
}
if (mode < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"left block unavailable for requested intra mode at %d %d\n",
- s->mb_x, s->mb_y);
+ h->mb_x, h->mb_y);
return -1;
}
}
@@ -314,7 +469,7 @@ static int decode_rbsp_trailing(H264Context *h, const uint8_t *src)
int v = *src;
int r;
- tprintf(h->s.avctx, "rbsp trailing %X\n", v);
+ tprintf(h->avctx, "rbsp trailing %X\n", v);
for (r = 1; r < 9; r++) {
if (v & 1)
@@ -341,10 +496,9 @@ static inline void get_lowest_part_y(H264Context *h, int refs[2][48], int n,
int height, int y_offset, int list0,
int list1, int *nrefs)
{
- MpegEncContext *const s = &h->s;
int my;
- y_offset += 16 * (s->mb_y >> MB_FIELD);
+ y_offset += 16 * (h->mb_y >> MB_FIELD);
if (list0) {
int ref_n = h->ref_cache[0][scan8[n]];
@@ -353,8 +507,8 @@ static inline void get_lowest_part_y(H264Context *h, int refs[2][48], int n,
// Error resilience puts the current picture in the ref list.
// Don't try to wait on these as it will cause a deadlock.
// Fields can wait on each other, though.
- if (ref->f.thread_opaque != s->current_picture.f.thread_opaque ||
- (ref->f.reference & 3) != s->picture_structure) {
+ if (ref->f.thread_opaque != h->cur_pic.f.thread_opaque ||
+ (ref->f.reference & 3) != h->picture_structure) {
my = get_lowest_part_list_y(h, ref, n, height, y_offset, 0);
if (refs[0][ref_n] < 0)
nrefs[0] += 1;
@@ -366,8 +520,8 @@ static inline void get_lowest_part_y(H264Context *h, int refs[2][48], int n,
int ref_n = h->ref_cache[1][scan8[n]];
Picture *ref = &h->ref_list[1][ref_n];
- if (ref->f.thread_opaque != s->current_picture.f.thread_opaque ||
- (ref->f.reference & 3) != s->picture_structure) {
+ if (ref->f.thread_opaque != h->cur_pic.f.thread_opaque ||
+ (ref->f.reference & 3) != h->picture_structure) {
my = get_lowest_part_list_y(h, ref, n, height, y_offset, 1);
if (refs[1][ref_n] < 0)
nrefs[1] += 1;
@@ -383,9 +537,8 @@ static inline void get_lowest_part_y(H264Context *h, int refs[2][48], int n,
*/
static void await_references(H264Context *h)
{
- MpegEncContext *const s = &h->s;
const int mb_xy = h->mb_xy;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
+ const int mb_type = h->cur_pic.f.mb_type[mb_xy];
int refs[2][48];
int nrefs[2] = { 0 };
int ref, list;
@@ -459,7 +612,7 @@ static void await_references(H264Context *h)
Picture *ref_pic = &h->ref_list[list][ref];
int ref_field = ref_pic->f.reference - 1;
int ref_field_picture = ref_pic->field_picture;
- int pic_height = 16 * s->mb_height >> ref_field_picture;
+ int pic_height = 16 * h->mb_height >> ref_field_picture;
row <<= MB_MBAFF;
nrefs[list]--;
@@ -500,7 +653,6 @@ static av_always_inline void mc_dir_part(H264Context *h, Picture *pic,
h264_chroma_mc_func chroma_op,
int pixel_shift, int chroma_idc)
{
- MpegEncContext *const s = &h->s;
const int mx = h->mv_cache[list][scan8[n]][0] + src_x_offset * 8;
int my = h->mv_cache[list][scan8[n]][1] + src_y_offset * 8;
const int luma_xy = (mx & 3) + ((my & 3) << 2);
@@ -512,8 +664,8 @@ static av_always_inline void mc_dir_part(H264Context *h, Picture *pic,
int emu = 0;
const int full_mx = mx >> 2;
const int full_my = my >> 2;
- const int pic_width = 16 * s->mb_width;
- const int pic_height = 16 * s->mb_height >> MB_FIELD;
+ const int pic_width = 16 * h->mb_width;
+ const int pic_height = 16 * h->mb_height >> MB_FIELD;
int ysh;
if (mx & 7)
@@ -525,12 +677,12 @@ static av_always_inline void mc_dir_part(H264Context *h, Picture *pic,
full_my < 0 - extra_height ||
full_mx + 16 /*FIXME*/ > pic_width + extra_width ||
full_my + 16 /*FIXME*/ > pic_height + extra_height) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
+ h->vdsp.emulated_edge_mc(h->edge_emu_buffer,
src_y - (2 << pixel_shift) - 2 * h->mb_linesize,
h->mb_linesize,
16 + 5, 16 + 5 /*FIXME*/, full_mx - 2,
full_my - 2, pic_width, pic_height);
- src_y = s->edge_emu_buffer + (2 << pixel_shift) + 2 * h->mb_linesize;
+ src_y = h->edge_emu_buffer + (2 << pixel_shift) + 2 * h->mb_linesize;
emu = 1;
}
@@ -538,19 +690,19 @@ static av_always_inline void mc_dir_part(H264Context *h, Picture *pic,
if (!square)
qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize);
- if (CONFIG_GRAY && s->flags & CODEC_FLAG_GRAY)
+ if (CONFIG_GRAY && h->flags & CODEC_FLAG_GRAY)
return;
if (chroma_idc == 3 /* yuv444 */) {
src_cb = pic->f.data[1] + offset;
if (emu) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
+ h->vdsp.emulated_edge_mc(h->edge_emu_buffer,
src_cb - (2 << pixel_shift) - 2 * h->mb_linesize,
h->mb_linesize,
16 + 5, 16 + 5 /*FIXME*/,
full_mx - 2, full_my - 2,
pic_width, pic_height);
- src_cb = s->edge_emu_buffer + (2 << pixel_shift) + 2 * h->mb_linesize;
+ src_cb = h->edge_emu_buffer + (2 << pixel_shift) + 2 * h->mb_linesize;
}
qpix_op[luma_xy](dest_cb, src_cb, h->mb_linesize); // FIXME try variable height perhaps?
if (!square)
@@ -558,13 +710,13 @@ static av_always_inline void mc_dir_part(H264Context *h, Picture *pic,
src_cr = pic->f.data[2] + offset;
if (emu) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
+ h->vdsp.emulated_edge_mc(h->edge_emu_buffer,
src_cr - (2 << pixel_shift) - 2 * h->mb_linesize,
h->mb_linesize,
16 + 5, 16 + 5 /*FIXME*/,
full_mx - 2, full_my - 2,
pic_width, pic_height);
- src_cr = s->edge_emu_buffer + (2 << pixel_shift) + 2 * h->mb_linesize;
+ src_cr = h->edge_emu_buffer + (2 << pixel_shift) + 2 * h->mb_linesize;
}
qpix_op[luma_xy](dest_cr, src_cr, h->mb_linesize); // FIXME try variable height perhaps?
if (!square)
@@ -575,7 +727,7 @@ static av_always_inline void mc_dir_part(H264Context *h, Picture *pic,
ysh = 3 - (chroma_idc == 2 /* yuv422 */);
if (chroma_idc == 1 /* yuv420 */ && MB_FIELD) {
// chroma offset when predicting from a field of opposite parity
- my += 2 * ((s->mb_y & 1) - (pic->f.reference - 1));
+ my += 2 * ((h->mb_y & 1) - (pic->f.reference - 1));
emu |= (my >> 3) < 0 || (my >> 3) + 8 >= (pic_height >> 1);
}
@@ -585,20 +737,20 @@ static av_always_inline void mc_dir_part(H264Context *h, Picture *pic,
(my >> ysh) * h->mb_uvlinesize;
if (emu) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src_cb, h->mb_uvlinesize,
+ h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cb, h->mb_uvlinesize,
9, 8 * chroma_idc + 1, (mx >> 3), (my >> ysh),
pic_width >> 1, pic_height >> (chroma_idc == 1 /* yuv420 */));
- src_cb = s->edge_emu_buffer;
+ src_cb = h->edge_emu_buffer;
}
chroma_op(dest_cb, src_cb, h->mb_uvlinesize,
height >> (chroma_idc == 1 /* yuv420 */),
mx & 7, (my << (chroma_idc == 2 /* yuv422 */)) & 7);
if (emu) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src_cr, h->mb_uvlinesize,
+ h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cr, h->mb_uvlinesize,
9, 8 * chroma_idc + 1, (mx >> 3), (my >> ysh),
pic_width >> 1, pic_height >> (chroma_idc == 1 /* yuv420 */));
- src_cr = s->edge_emu_buffer;
+ src_cr = h->edge_emu_buffer;
}
chroma_op(dest_cr, src_cr, h->mb_uvlinesize, height >> (chroma_idc == 1 /* yuv420 */),
mx & 7, (my << (chroma_idc == 2 /* yuv422 */)) & 7);
@@ -616,7 +768,6 @@ static av_always_inline void mc_part_std(H264Context *h, int n, int square,
int list0, int list1,
int pixel_shift, int chroma_idc)
{
- MpegEncContext *const s = &h->s;
qpel_mc_func *qpix_op = qpix_put;
h264_chroma_mc_func chroma_op = chroma_put;
@@ -631,8 +782,8 @@ static av_always_inline void mc_part_std(H264Context *h, int n, int square,
dest_cb += (x_offset << pixel_shift) + y_offset * h->mb_uvlinesize;
dest_cr += (x_offset << pixel_shift) + y_offset * h->mb_uvlinesize;
}
- x_offset += 8 * s->mb_x;
- y_offset += 8 * (s->mb_y >> MB_FIELD);
+ x_offset += 8 * h->mb_x;
+ y_offset += 8 * (h->mb_y >> MB_FIELD);
if (list0) {
Picture *ref = &h->ref_list[0][h->ref_cache[0][scan8[n]]];
@@ -666,7 +817,6 @@ static av_always_inline void mc_part_weighted(H264Context *h, int n, int square,
int list0, int list1,
int pixel_shift, int chroma_idc)
{
- MpegEncContext *const s = &h->s;
int chroma_height;
dest_y += (2 * x_offset << pixel_shift) + 2 * y_offset * h->mb_linesize;
@@ -685,8 +835,8 @@ static av_always_inline void mc_part_weighted(H264Context *h, int n, int square,
dest_cb += (x_offset << pixel_shift) + y_offset * h->mb_uvlinesize;
dest_cr += (x_offset << pixel_shift) + y_offset * h->mb_uvlinesize;
}
- x_offset += 8 * s->mb_x;
- y_offset += 8 * (s->mb_y >> MB_FIELD);
+ x_offset += 8 * h->mb_x;
+ y_offset += 8 * (h->mb_y >> MB_FIELD);
if (list0 && list1) {
/* don't optimize for luma-only case, since B-frames usually
@@ -707,7 +857,7 @@ static av_always_inline void mc_part_weighted(H264Context *h, int n, int square,
pixel_shift, chroma_idc);
if (h->use_weight == 2) {
- int weight0 = h->implicit_weight[refn0][refn1][s->mb_y & 1];
+ int weight0 = h->implicit_weight[refn0][refn1][h->mb_y & 1];
int weight1 = 64 - weight0;
luma_weight_avg(dest_y, tmp_y, h->mb_linesize,
height, 5, weight0, weight1, 0);
@@ -765,24 +915,23 @@ static av_always_inline void prefetch_motion(H264Context *h, int list,
{
/* fetch pixels for estimated mv 4 macroblocks ahead
* optimized for 64byte cache lines */
- MpegEncContext *const s = &h->s;
const int refn = h->ref_cache[list][scan8[0]];
if (refn >= 0) {
- const int mx = (h->mv_cache[list][scan8[0]][0] >> 2) + 16 * s->mb_x + 8;
- const int my = (h->mv_cache[list][scan8[0]][1] >> 2) + 16 * s->mb_y;
+ const int mx = (h->mv_cache[list][scan8[0]][0] >> 2) + 16 * h->mb_x + 8;
+ const int my = (h->mv_cache[list][scan8[0]][1] >> 2) + 16 * h->mb_y;
uint8_t **src = h->ref_list[list][refn].f.data;
int off = (mx << pixel_shift) +
- (my + (s->mb_x & 3) * 4) * h->mb_linesize +
+ (my + (h->mb_x & 3) * 4) * h->mb_linesize +
(64 << pixel_shift);
- s->vdsp.prefetch(src[0] + off, s->linesize, 4);
+ h->vdsp.prefetch(src[0] + off, h->linesize, 4);
if (chroma_idc == 3 /* yuv444 */) {
- s->vdsp.prefetch(src[1] + off, s->linesize, 4);
- s->vdsp.prefetch(src[2] + off, s->linesize, 4);
+ h->vdsp.prefetch(src[1] + off, h->linesize, 4);
+ h->vdsp.prefetch(src[2] + off, h->linesize, 4);
} else {
off = ((mx >> 1) << pixel_shift) +
- ((my >> 1) + (s->mb_x & 7)) * s->uvlinesize +
+ ((my >> 1) + (h->mb_x & 7)) * h->uvlinesize +
(64 << pixel_shift);
- s->vdsp.prefetch(src[1] + off, src[2] - src[1], 2);
+ h->vdsp.prefetch(src[1] + off, src[2] - src[1], 2);
}
}
}
@@ -806,6 +955,18 @@ static void free_tables(H264Context *h, int free_rbsp)
av_freep(&h->mb2b_xy);
av_freep(&h->mb2br_xy);
+ if (free_rbsp) {
+ for (i = 0; i < h->picture_count && !h->avctx->internal->is_copy; i++)
+ free_picture(h, &h->DPB[i]);
+ av_freep(&h->DPB);
+ h->picture_count = 0;
+ } else if (h->DPB) {
+ for (i = 0; i < h->picture_count; i++)
+ h->DPB[i].needs_realloc = 1;
+ }
+
+ h->cur_pic_ptr = NULL;
+
for (i = 0; i < MAX_THREADS; i++) {
hx = h->thread_context[i];
if (!hx)
@@ -813,6 +974,15 @@ static void free_tables(H264Context *h, int free_rbsp)
av_freep(&hx->top_borders[1]);
av_freep(&hx->top_borders[0]);
av_freep(&hx->bipred_scratchpad);
+ av_freep(&hx->edge_emu_buffer);
+ av_freep(&hx->dc_val_base);
+ av_freep(&hx->me.scratchpad);
+ av_freep(&hx->er.mb_index2xy);
+ av_freep(&hx->er.error_status_table);
+ av_freep(&hx->er.er_temp_buffer);
+ av_freep(&hx->er.mbintra_table);
+ av_freep(&hx->er.mbskip_table);
+
if (free_rbsp) {
av_freep(&hx->rbsp_buffer[1]);
av_freep(&hx->rbsp_buffer[0]);
@@ -896,50 +1066,59 @@ static void init_dequant_tables(H264Context *h)
int ff_h264_alloc_tables(H264Context *h)
{
- MpegEncContext *const s = &h->s;
- const int big_mb_num = s->mb_stride * (s->mb_height + 1);
- const int row_mb_num = s->mb_stride * 2 * s->avctx->thread_count;
- int x, y;
+ const int big_mb_num = h->mb_stride * (h->mb_height + 1);
+ const int row_mb_num = h->mb_stride * 2 * h->avctx->thread_count;
+ int x, y, i;
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->intra4x4_pred_mode,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->intra4x4_pred_mode,
row_mb_num * 8 * sizeof(uint8_t), fail)
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->non_zero_count,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->non_zero_count,
big_mb_num * 48 * sizeof(uint8_t), fail)
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->slice_table_base,
- (big_mb_num + s->mb_stride) * sizeof(*h->slice_table_base), fail)
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->cbp_table,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->slice_table_base,
+ (big_mb_num + h->mb_stride) * sizeof(*h->slice_table_base), fail)
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->cbp_table,
big_mb_num * sizeof(uint16_t), fail)
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->chroma_pred_mode_table,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->chroma_pred_mode_table,
big_mb_num * sizeof(uint8_t), fail)
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[0],
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->mvd_table[0],
16 * row_mb_num * sizeof(uint8_t), fail);
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[1],
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->mvd_table[1],
16 * row_mb_num * sizeof(uint8_t), fail);
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->direct_table,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->direct_table,
4 * big_mb_num * sizeof(uint8_t), fail);
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->list_counts,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->list_counts,
big_mb_num * sizeof(uint8_t), fail)
memset(h->slice_table_base, -1,
- (big_mb_num + s->mb_stride) * sizeof(*h->slice_table_base));
- h->slice_table = h->slice_table_base + s->mb_stride * 2 + 1;
+ (big_mb_num + h->mb_stride) * sizeof(*h->slice_table_base));
+ h->slice_table = h->slice_table_base + h->mb_stride * 2 + 1;
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2b_xy,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->mb2b_xy,
big_mb_num * sizeof(uint32_t), fail);
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2br_xy,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->mb2br_xy,
big_mb_num * sizeof(uint32_t), fail);
- for (y = 0; y < s->mb_height; y++)
- for (x = 0; x < s->mb_width; x++) {
- const int mb_xy = x + y * s->mb_stride;
+ for (y = 0; y < h->mb_height; y++)
+ for (x = 0; x < h->mb_width; x++) {
+ const int mb_xy = x + y * h->mb_stride;
const int b_xy = 4 * x + 4 * y * h->b_stride;
h->mb2b_xy[mb_xy] = b_xy;
- h->mb2br_xy[mb_xy] = 8 * (FMO ? mb_xy : (mb_xy % (2 * s->mb_stride)));
+ h->mb2br_xy[mb_xy] = 8 * (FMO ? mb_xy : (mb_xy % (2 * h->mb_stride)));
}
if (!h->dequant4_coeff[0])
init_dequant_tables(h);
+ if (!h->DPB) {
+ h->picture_count = MAX_PICTURE_COUNT * FFMAX(1, h->avctx->thread_count);
+ h->DPB = av_mallocz_array(h->picture_count, sizeof(*h->DPB));
+ if (!h->DPB)
+ return AVERROR(ENOMEM);
+ for (i = 0; i < h->picture_count; i++)
+ avcodec_get_frame_defaults(&h->DPB[i].f);
+ avcodec_get_frame_defaults(&h->cur_pic.f);
+ }
+
return 0;
fail:
@@ -952,20 +1131,24 @@ fail:
*/
static void clone_tables(H264Context *dst, H264Context *src, int i)
{
- MpegEncContext *const s = &src->s;
- dst->intra4x4_pred_mode = src->intra4x4_pred_mode + i * 8 * 2 * s->mb_stride;
+ dst->intra4x4_pred_mode = src->intra4x4_pred_mode + i * 8 * 2 * src->mb_stride;
dst->non_zero_count = src->non_zero_count;
dst->slice_table = src->slice_table;
dst->cbp_table = src->cbp_table;
dst->mb2b_xy = src->mb2b_xy;
dst->mb2br_xy = src->mb2br_xy;
dst->chroma_pred_mode_table = src->chroma_pred_mode_table;
- dst->mvd_table[0] = src->mvd_table[0] + i * 8 * 2 * s->mb_stride;
- dst->mvd_table[1] = src->mvd_table[1] + i * 8 * 2 * s->mb_stride;
+ dst->mvd_table[0] = src->mvd_table[0] + i * 8 * 2 * src->mb_stride;
+ dst->mvd_table[1] = src->mvd_table[1] + i * 8 * 2 * src->mb_stride;
dst->direct_table = src->direct_table;
dst->list_counts = src->list_counts;
+ dst->DPB = src->DPB;
+ dst->cur_pic_ptr = src->cur_pic_ptr;
+ dst->cur_pic = src->cur_pic;
dst->bipred_scratchpad = NULL;
- ff_h264_pred_init(&dst->hpc, src->s.codec_id, src->sps.bit_depth_luma,
+ dst->edge_emu_buffer = NULL;
+ dst->me.scratchpad = NULL;
+ ff_h264_pred_init(&dst->hpc, src->avctx->codec_id, src->sps.bit_depth_luma,
src->sps.chroma_format_idc);
}
@@ -975,10 +1158,17 @@ static void clone_tables(H264Context *dst, H264Context *src, int i)
*/
static int context_init(H264Context *h)
{
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->top_borders[0],
- h->s.mb_width * 16 * 3 * sizeof(uint8_t) * 2, fail)
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->top_borders[1],
- h->s.mb_width * 16 * 3 * sizeof(uint8_t) * 2, fail)
+ ERContext *er = &h->er;
+ int mb_array_size = h->mb_height * h->mb_stride;
+ int y_size = (2 * h->mb_width + 1) * (2 * h->mb_height + 1);
+ int c_size = h->mb_stride * (h->mb_height + 1);
+ int yc_size = y_size + 2 * c_size;
+ int x, y, i;
+
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->top_borders[0],
+ h->mb_width * 16 * 3 * sizeof(uint8_t) * 2, fail)
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->top_borders[1],
+ h->mb_width * 16 * 3 * sizeof(uint8_t) * 2, fail)
h->ref_cache[0][scan8[5] + 1] =
h->ref_cache[0][scan8[7] + 1] =
@@ -987,8 +1177,45 @@ static int context_init(H264Context *h)
h->ref_cache[1][scan8[7] + 1] =
h->ref_cache[1][scan8[13] + 1] = PART_NOT_AVAILABLE;
- h->s.er.decode_mb = h264_er_decode_mb;
- h->s.er.opaque = h;
+ /* init ER */
+ er->avctx = h->avctx;
+ er->dsp = &h->dsp;
+ er->decode_mb = h264_er_decode_mb;
+ er->opaque = h;
+ er->quarter_sample = 1;
+
+ er->mb_num = h->mb_num;
+ er->mb_width = h->mb_width;
+ er->mb_height = h->mb_height;
+ er->mb_stride = h->mb_stride;
+ er->b8_stride = h->mb_width * 2 + 1;
+
+ FF_ALLOCZ_OR_GOTO(h->avctx, er->mb_index2xy, (h->mb_num + 1) * sizeof(int),
+ fail); // error ressilience code looks cleaner with this
+ for (y = 0; y < h->mb_height; y++)
+ for (x = 0; x < h->mb_width; x++)
+ er->mb_index2xy[x + y * h->mb_width] = x + y * h->mb_stride;
+
+ er->mb_index2xy[h->mb_height * h->mb_width] = (h->mb_height - 1) *
+ h->mb_stride + h->mb_width;
+
+ FF_ALLOCZ_OR_GOTO(h->avctx, er->error_status_table,
+ mb_array_size * sizeof(uint8_t), fail);
+
+ FF_ALLOC_OR_GOTO(h->avctx, er->mbintra_table, mb_array_size, fail);
+ memset(er->mbintra_table, 1, mb_array_size);
+
+ FF_ALLOCZ_OR_GOTO(h->avctx, er->mbskip_table, mb_array_size + 2, fail);
+
+ FF_ALLOC_OR_GOTO(h->avctx, er->er_temp_buffer, h->mb_height * h->mb_stride,
+ fail);
+
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->dc_val_base, yc_size * sizeof(int16_t), fail);
+ er->dc_val[0] = h->dc_val_base + h->mb_width * 2 + 2;
+ er->dc_val[1] = h->dc_val_base + y_size + h->mb_stride + 1;
+ er->dc_val[2] = er->dc_val[1] + c_size;
+ for (i = 0; i < yc_size; i++)
+ h->dc_val_base[i] = 1024;
return 0;
@@ -1001,23 +1228,23 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
static av_cold void common_init(H264Context *h)
{
- MpegEncContext *const s = &h->s;
- s->width = s->avctx->width;
- s->height = s->avctx->height;
- s->codec_id = s->avctx->codec->id;
+ h->width = h->avctx->width;
+ h->height = h->avctx->height;
+
+ h->bit_depth_luma = 8;
+ h->chroma_format_idc = 1;
ff_h264dsp_init(&h->h264dsp, 8, 1);
ff_h264chroma_init(&h->h264chroma, h->sps.bit_depth_chroma);
ff_h264qpel_init(&h->h264qpel, 8);
- ff_h264_pred_init(&h->hpc, s->codec_id, 8, 1);
+ ff_h264_pred_init(&h->hpc, h->avctx->codec_id, 8, 1);
h->dequant_coeff_pps = -1;
- s->unrestricted_mv = 1;
/* needed so that IDCT permutation is known early */
- ff_dsputil_init(&s->dsp, s->avctx);
- ff_videodsp_init(&s->vdsp, 8);
+ ff_dsputil_init(&h->dsp, h->avctx);
+ ff_videodsp_init(&h->vdsp, 8);
memset(h->pps.scaling_matrix4, 16, 6 * 16 * sizeof(uint8_t));
memset(h->pps.scaling_matrix8, 16, 2 * 64 * sizeof(uint8_t));
@@ -1025,7 +1252,7 @@ static av_cold void common_init(H264Context *h)
int ff_h264_decode_extradata(H264Context *h)
{
- AVCodecContext *avctx = h->s.avctx;
+ AVCodecContext *avctx = h->avctx;
if (avctx->extradata[0] == 1) {
int i, cnt, nalsize;
@@ -1080,22 +1307,22 @@ int ff_h264_decode_extradata(H264Context *h)
av_cold int ff_h264_decode_init(AVCodecContext *avctx)
{
H264Context *h = avctx->priv_data;
- MpegEncContext *const s = &h->s;
int i;
- ff_MPV_decode_defaults(s);
-
- s->avctx = avctx;
+ h->avctx = avctx;
common_init(h);
- s->out_format = FMT_H264;
- s->workaround_bugs = avctx->workaround_bugs;
+ h->picture_structure = PICT_FRAME;
+ h->picture_range_start = 0;
+ h->picture_range_end = MAX_PICTURE_COUNT;
+ h->slice_context_count = 1;
+ h->workaround_bugs = avctx->workaround_bugs;
+ h->flags = avctx->flags;
/* set defaults */
// s->decode_mb = ff_h263_decode_mb;
- s->quarter_sample = 1;
if (!avctx->has_b_frames)
- s->low_delay = 1;
+ h->low_delay = 1;
avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
@@ -1113,7 +1340,7 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
ff_h264_reset_sei(h);
if (avctx->codec_id == AV_CODEC_ID_H264) {
if (avctx->ticks_per_frame == 1)
- s->avctx->time_base.den *= 2;
+ h->avctx->time_base.den *= 2;
avctx->ticks_per_frame = 2;
}
@@ -1122,25 +1349,30 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
return -1;
if (h->sps.bitstream_restriction_flag &&
- s->avctx->has_b_frames < h->sps.num_reorder_frames) {
- s->avctx->has_b_frames = h->sps.num_reorder_frames;
- s->low_delay = 0;
+ h->avctx->has_b_frames < h->sps.num_reorder_frames) {
+ h->avctx->has_b_frames = h->sps.num_reorder_frames;
+ h->low_delay = 0;
}
return 0;
}
#define IN_RANGE(a, b, size) (((a) >= (b)) && ((a) < ((b) + (size))))
+#undef REBASE_PICTURE
+#define REBASE_PICTURE(pic, new_ctx, old_ctx) \
+ ((pic && pic >= old_ctx->DPB && \
+ pic < old_ctx->DPB + old_ctx->picture_count) ? \
+ &new_ctx->DPB[pic - old_ctx->DPB] : NULL)
static void copy_picture_range(Picture **to, Picture **from, int count,
- MpegEncContext *new_base,
- MpegEncContext *old_base)
+ H264Context *new_base,
+ H264Context *old_base)
{
int i;
for (i = 0; i < count; i++) {
assert((IN_RANGE(from[i], old_base, sizeof(*old_base)) ||
- IN_RANGE(from[i], old_base->picture,
+ IN_RANGE(from[i], old_base->DPB,
sizeof(Picture) * old_base->picture_count) ||
!from[i]));
to[i] = REBASE_PICTURE(from[i], new_base, old_base);
@@ -1171,7 +1403,7 @@ static int decode_init_thread_copy(AVCodecContext *avctx)
memset(h->sps_buffers, 0, sizeof(h->sps_buffers));
memset(h->pps_buffers, 0, sizeof(h->pps_buffers));
- h->s.context_initialized = 0;
+ h->context_initialized = 0;
return 0;
}
@@ -1188,49 +1420,47 @@ static int decode_update_thread_context(AVCodecContext *dst,
const AVCodecContext *src)
{
H264Context *h = dst->priv_data, *h1 = src->priv_data;
- MpegEncContext *const s = &h->s, *const s1 = &h1->s;
- int inited = s->context_initialized, err;
+ int inited = h->context_initialized, err = 0;
+ int context_reinitialized = 0;
int i;
- if (dst == src || !s1->context_initialized)
+ if (dst == src || !h1->context_initialized)
return 0;
if (inited &&
- (s->width != s1->width ||
- s->height != s1->height ||
- s->mb_width != s1->mb_width ||
- s->mb_height != s1->mb_height ||
+ (h->width != h1->width ||
+ h->height != h1->height ||
+ h->mb_width != h1->mb_width ||
+ h->mb_height != h1->mb_height ||
h->sps.bit_depth_luma != h1->sps.bit_depth_luma ||
h->sps.chroma_format_idc != h1->sps.chroma_format_idc ||
h->sps.colorspace != h1->sps.colorspace)) {
av_freep(&h->bipred_scratchpad);
- s->width = s1->width;
- s->height = s1->height;
- s->mb_height = s1->mb_height;
+ h->width = h1->width;
+ h->height = h1->height;
+ h->mb_height = h1->mb_height;
+ h->mb_width = h1->mb_width;
+ h->mb_num = h1->mb_num;
+ h->mb_stride = h1->mb_stride;
h->b_stride = h1->b_stride;
if ((err = h264_slice_header_init(h, 1)) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR, "h264_slice_header_init() failed");
+ av_log(h->avctx, AV_LOG_ERROR, "h264_slice_header_init() failed");
return err;
}
- h->context_reinitialized = 1;
+ context_reinitialized = 1;
- /* update linesize on resize for h264. The h264 decoder doesn't
- * necessarily call ff_MPV_frame_start in the new thread */
- s->linesize = s1->linesize;
- s->uvlinesize = s1->uvlinesize;
+ /* update linesize on resize. The decoder doesn't
+ * necessarily call ff_h264_frame_start in the new thread */
+ h->linesize = h1->linesize;
+ h->uvlinesize = h1->uvlinesize;
/* copy block_offset since frame_start may not be called */
memcpy(h->block_offset, h1->block_offset, sizeof(h->block_offset));
- h264_set_parameter_from_sps(h);
}
- err = ff_mpeg_update_thread_context(dst, src);
- if (err)
- return err;
-
if (!inited) {
for (i = 0; i < MAX_SPS_COUNT; i++)
av_freep(h->sps_buffers + i);
@@ -1238,11 +1468,20 @@ static int decode_update_thread_context(AVCodecContext *dst,
for (i = 0; i < MAX_PPS_COUNT; i++)
av_freep(h->pps_buffers + i);
- // copy all fields after MpegEnc
- memcpy(&h->s + 1, &h1->s + 1,
- sizeof(H264Context) - sizeof(MpegEncContext));
+ memcpy(h, h1, sizeof(*h1));
memset(h->sps_buffers, 0, sizeof(h->sps_buffers));
memset(h->pps_buffers, 0, sizeof(h->pps_buffers));
+ memset(&h->er, 0, sizeof(h->er));
+ memset(&h->me, 0, sizeof(h->me));
+ h->context_initialized = 0;
+
+ h->picture_range_start += MAX_PICTURE_COUNT;
+ h->picture_range_end += MAX_PICTURE_COUNT;
+
+ h->avctx = dst;
+ h->DPB = NULL;
+ h->cur_pic.f.extended_data = h->cur_pic.f.data;
+
if (ff_h264_alloc_tables(h) < 0) {
av_log(dst, AV_LOG_ERROR, "Could not allocate memory for h264\n");
return AVERROR(ENOMEM);
@@ -1254,17 +1493,46 @@ static int decode_update_thread_context(AVCodecContext *dst,
h->rbsp_buffer_size[i] = 0;
}
h->bipred_scratchpad = NULL;
+ h->edge_emu_buffer = NULL;
h->thread_context[0] = h;
- s->dsp.clear_blocks(h->mb);
- s->dsp.clear_blocks(h->mb + (24 * 16 << h->pixel_shift));
+ h->dsp.clear_blocks(h->mb);
+ h->dsp.clear_blocks(h->mb + (24 * 16 << h->pixel_shift));
+ h->context_initialized = 1;
}
+ h->avctx->coded_height = h1->avctx->coded_height;
+ h->avctx->coded_width = h1->avctx->coded_width;
+ h->avctx->width = h1->avctx->width;
+ h->avctx->height = h1->avctx->height;
+ h->coded_picture_number = h1->coded_picture_number;
+ h->first_field = h1->first_field;
+ h->picture_structure = h1->picture_structure;
+ h->qscale = h1->qscale;
+ h->droppable = h1->droppable;
+ h->data_partitioning = h1->data_partitioning;
+ h->low_delay = h1->low_delay;
+
+ memcpy(h->DPB, h1->DPB, h1->picture_count * sizeof(*h1->DPB));
+
+ // reset s->picture[].f.extended_data to s->picture[].f.data
+ for (i = 0; i < h->picture_count; i++)
+ h->DPB[i].f.extended_data = h->DPB[i].f.data;
+
+ h->cur_pic_ptr = REBASE_PICTURE(h1->cur_pic_ptr, h, h1);
+ h->cur_pic = h1->cur_pic;
+ h->cur_pic.f.extended_data = h->cur_pic.f.data;
+
+ h->workaround_bugs = h1->workaround_bugs;
+ h->low_delay = h1->low_delay;
+ h->droppable = h1->droppable;
+
/* frame_start may not be called for the next thread (if it's decoding
* a bottom field) so this has to be allocated here */
- if (!h->bipred_scratchpad)
- h->bipred_scratchpad = av_malloc(16 * 6 * s->linesize);
+ err = alloc_scratch_buffers(h, h1->linesize);
+ if (err < 0)
+ return err;
// extradata/NAL handling
h->is_avc = h1->is_avc;
@@ -1299,17 +1567,20 @@ static int decode_update_thread_context(AVCodecContext *dst,
copy_fields(h, h1, ref2frm, intra_gb);
copy_fields(h, h1, short_ref, cabac_init_idc);
- copy_picture_range(h->short_ref, h1->short_ref, 32, s, s1);
- copy_picture_range(h->long_ref, h1->long_ref, 32, s, s1);
+ copy_picture_range(h->short_ref, h1->short_ref, 32, h, h1);
+ copy_picture_range(h->long_ref, h1->long_ref, 32, h, h1);
copy_picture_range(h->delayed_pic, h1->delayed_pic,
- MAX_DELAYED_PIC_COUNT + 2, s, s1);
+ MAX_DELAYED_PIC_COUNT + 2, h, h1);
h->last_slice_type = h1->last_slice_type;
- if (!s->current_picture_ptr)
+ if (context_reinitialized)
+ h264_set_parameter_from_sps(h);
+
+ if (!h->cur_pic_ptr)
return 0;
- if (!s->droppable) {
+ if (!h->droppable) {
err = ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index);
h->prev_poc_msb = h->poc_msb;
h->prev_poc_lsb = h->poc_lsb;
@@ -1323,45 +1594,66 @@ static int decode_update_thread_context(AVCodecContext *dst,
int ff_h264_frame_start(H264Context *h)
{
- MpegEncContext *const s = &h->s;
- int i;
+ Picture *pic;
+ int i, ret;
const int pixel_shift = h->pixel_shift;
- if (ff_MPV_frame_start(s, s->avctx) < 0)
- return -1;
- ff_mpeg_er_frame_start(s);
+ release_unused_pictures(h, 1);
+ h->cur_pic_ptr = NULL;
+
+ i = find_unused_picture(h);
+ if (i < 0) {
+ av_log(h->avctx, AV_LOG_ERROR, "no frame buffer available\n");
+ return i;
+ }
+ pic = &h->DPB[i];
+
+ pic->f.reference = h->droppable ? 0 : h->picture_structure;
+ pic->f.coded_picture_number = h->coded_picture_number++;
+ pic->field_picture = h->picture_structure != PICT_FRAME;
/*
- * ff_MPV_frame_start uses pict_type to derive key_frame.
- * This is incorrect for H.264; IDR markings must be used.
- * Zero here; IDR markings per slice in frame or fields are ORed in later.
+ * Zero key_frame here; IDR markings per slice in frame or fields are ORed
+ * in later.
* See decode_nal_units().
*/
- s->current_picture_ptr->f.key_frame = 0;
- s->current_picture_ptr->mmco_reset = 0;
+ pic->f.key_frame = 0;
+ pic->mmco_reset = 0;
+
+ if ((ret = alloc_picture(h, pic)) < 0)
+ return ret;
+
+ h->cur_pic_ptr = pic;
+ h->cur_pic = *h->cur_pic_ptr;
+ h->cur_pic.f.extended_data = h->cur_pic.f.data;
+
+ ff_er_frame_start(&h->er);
- assert(s->linesize && s->uvlinesize);
+ assert(h->linesize && h->uvlinesize);
for (i = 0; i < 16; i++) {
- h->block_offset[i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 4 * s->linesize * ((scan8[i] - scan8[0]) >> 3);
- h->block_offset[48 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 8 * s->linesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 4 * h->linesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[48 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 8 * h->linesize * ((scan8[i] - scan8[0]) >> 3);
}
for (i = 0; i < 16; i++) {
h->block_offset[16 + i] =
- h->block_offset[32 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 4 * s->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[32 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 4 * h->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
h->block_offset[48 + 16 + i] =
- h->block_offset[48 + 32 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 8 * s->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[48 + 32 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 8 * h->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
}
/* can't be in alloc_tables because linesize isn't known there.
* FIXME: redo bipred weight to not require extra buffer? */
- for (i = 0; i < s->slice_context_count; i++)
- if (h->thread_context[i] && !h->thread_context[i]->bipred_scratchpad)
- h->thread_context[i]->bipred_scratchpad = av_malloc(16 * 6 * s->linesize);
+ for (i = 0; i < h->slice_context_count; i++)
+ if (h->thread_context[i]) {
+ ret = alloc_scratch_buffers(h->thread_context[i], h->linesize);
+ if (ret < 0)
+ return ret;
+ }
/* Some macroblocks can be accessed before they're available in case
* of lost slices, MBAFF or threading. */
memset(h->slice_table, -1,
- (s->mb_height * s->mb_stride - 1) * sizeof(*h->slice_table));
+ (h->mb_height * h->mb_stride - 1) * sizeof(*h->slice_table));
// s->decode = (s->flags & CODEC_FLAG_PSNR) || !s->encoding ||
// s->current_picture.f.reference /* || h->contains_intra */ || 1;
@@ -1372,15 +1664,14 @@ int ff_h264_frame_start(H264Context *h)
* SVQ3 as well as most other codecs have only last/next/current and thus
* get released even with set reference, besides SVQ3 and others do not
* mark frames as reference later "naturally". */
- if (s->codec_id != AV_CODEC_ID_SVQ3)
- s->current_picture_ptr->f.reference = 0;
+ if (h->avctx->codec_id != AV_CODEC_ID_SVQ3)
+ h->cur_pic_ptr->f.reference = 0;
- s->current_picture_ptr->field_poc[0] =
- s->current_picture_ptr->field_poc[1] = INT_MAX;
+ h->cur_pic_ptr->field_poc[0] = h->cur_pic_ptr->field_poc[1] = INT_MAX;
h->next_output_pic = NULL;
- assert(s->current_picture_ptr->long_ref == 0);
+ assert(h->cur_pic_ptr->long_ref == 0);
return 0;
}
@@ -1395,14 +1686,13 @@ int ff_h264_frame_start(H264Context *h)
*/
static void decode_postinit(H264Context *h, int setup_finished)
{
- MpegEncContext *const s = &h->s;
- Picture *out = s->current_picture_ptr;
- Picture *cur = s->current_picture_ptr;
+ Picture *out = h->cur_pic_ptr;
+ Picture *cur = h->cur_pic_ptr;
int i, pics, out_of_order, out_idx;
int invalid = 0, cnt = 0;
- s->current_picture_ptr->f.qscale_type = FF_QSCALE_TYPE_H264;
- s->current_picture_ptr->f.pict_type = s->pict_type;
+ h->cur_pic_ptr->f.qscale_type = FF_QSCALE_TYPE_H264;
+ h->cur_pic_ptr->f.pict_type = h->pict_type;
if (h->next_output_pic)
return;
@@ -1413,7 +1703,7 @@ static void decode_postinit(H264Context *h, int setup_finished)
* The check in decode_nal_units() is not good enough to find this
* yet, so we assume the worst for now. */
// if (setup_finished)
- // ff_thread_finish_setup(s->avctx);
+ // ff_thread_finish_setup(h->avctx);
return;
}
@@ -1487,15 +1777,15 @@ static void decode_postinit(H264Context *h, int setup_finished)
/* Sort B-frames into display order */
if (h->sps.bitstream_restriction_flag &&
- s->avctx->has_b_frames < h->sps.num_reorder_frames) {
- s->avctx->has_b_frames = h->sps.num_reorder_frames;
- s->low_delay = 0;
+ h->avctx->has_b_frames < h->sps.num_reorder_frames) {
+ h->avctx->has_b_frames = h->sps.num_reorder_frames;
+ h->low_delay = 0;
}
- if (s->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT &&
+ if (h->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT &&
!h->sps.bitstream_restriction_flag) {
- s->avctx->has_b_frames = MAX_DELAYED_PIC_COUNT - 1;
- s->low_delay = 0;
+ h->avctx->has_b_frames = MAX_DELAYED_PIC_COUNT - 1;
+ h->low_delay = 0;
}
pics = 0;
@@ -1516,7 +1806,7 @@ static void decode_postinit(H264Context *h, int setup_finished)
* there is no delay, we can't detect that (since the frame was already
* output to the user), so we also set h->mmco_reset to detect the MMCO
* reset code.
- * FIXME: if we detect insufficient delays (as per s->avctx->has_b_frames),
+ * FIXME: if we detect insufficient delays (as per h->avctx->has_b_frames),
* we increase the delay between input and output. All frames affected by
* the lag (e.g. those that should have been output before another frame
* that we already returned to the user) will be dropped. This is a bug
@@ -1548,40 +1838,40 @@ static void decode_postinit(H264Context *h, int setup_finished)
out = h->delayed_pic[i];
out_idx = i;
}
- if (s->avctx->has_b_frames == 0 &&
+ if (h->avctx->has_b_frames == 0 &&
(h->delayed_pic[0]->f.key_frame || h->mmco_reset))
h->next_outputed_poc = INT_MIN;
out_of_order = !out->f.key_frame && !h->mmco_reset &&
(out->poc < h->next_outputed_poc);
if (h->sps.bitstream_restriction_flag &&
- s->avctx->has_b_frames >= h->sps.num_reorder_frames) {
- } else if (out_of_order && pics - 1 == s->avctx->has_b_frames &&
- s->avctx->has_b_frames < MAX_DELAYED_PIC_COUNT) {
+ h->avctx->has_b_frames >= h->sps.num_reorder_frames) {
+ } else if (out_of_order && pics - 1 == h->avctx->has_b_frames &&
+ h->avctx->has_b_frames < MAX_DELAYED_PIC_COUNT) {
if (invalid + cnt < MAX_DELAYED_PIC_COUNT) {
- s->avctx->has_b_frames = FFMAX(s->avctx->has_b_frames, cnt);
+ h->avctx->has_b_frames = FFMAX(h->avctx->has_b_frames, cnt);
}
- s->low_delay = 0;
- } else if (s->low_delay &&
+ h->low_delay = 0;
+ } else if (h->low_delay &&
((h->next_outputed_poc != INT_MIN &&
out->poc > h->next_outputed_poc + 2) ||
cur->f.pict_type == AV_PICTURE_TYPE_B)) {
- s->low_delay = 0;
- s->avctx->has_b_frames++;
+ h->low_delay = 0;
+ h->avctx->has_b_frames++;
}
- if (pics > s->avctx->has_b_frames) {
+ if (pics > h->avctx->has_b_frames) {
out->f.reference &= ~DELAYED_PIC_REF;
// for frame threading, the owner must be the second field's thread or
// else the first thread can release the picture and reuse it unsafely
- out->owner2 = s;
+ out->owner2 = h;
for (i = out_idx; h->delayed_pic[i]; i++)
h->delayed_pic[i] = h->delayed_pic[i + 1];
}
memmove(h->last_pocs, &h->last_pocs[1],
sizeof(*h->last_pocs) * (MAX_DELAYED_PIC_COUNT - 1));
h->last_pocs[MAX_DELAYED_PIC_COUNT - 1] = cur->poc;
- if (!out_of_order && pics > s->avctx->has_b_frames) {
+ if (!out_of_order && pics > h->avctx->has_b_frames) {
h->next_output_pic = out;
if (out->mmco_reset) {
if (out_idx > 0) {
@@ -1599,11 +1889,11 @@ static void decode_postinit(H264Context *h, int setup_finished)
}
h->mmco_reset = 0;
} else {
- av_log(s->avctx, AV_LOG_DEBUG, "no picture\n");
+ av_log(h->avctx, AV_LOG_DEBUG, "no picture\n");
}
if (setup_finished)
- ff_thread_finish_setup(s->avctx);
+ ff_thread_finish_setup(h->avctx);
}
static av_always_inline void backup_mb_border(H264Context *h, uint8_t *src_y,
@@ -1611,7 +1901,6 @@ static av_always_inline void backup_mb_border(H264Context *h, uint8_t *src_y,
int linesize, int uvlinesize,
int simple)
{
- MpegEncContext *const s = &h->s;
uint8_t *top_border;
int top_idx = 1;
const int pixel_shift = h->pixel_shift;
@@ -1623,13 +1912,13 @@ static av_always_inline void backup_mb_border(H264Context *h, uint8_t *src_y,
src_cr -= uvlinesize;
if (!simple && FRAME_MBAFF) {
- if (s->mb_y & 1) {
+ if (h->mb_y & 1) {
if (!MB_MBAFF) {
- top_border = h->top_borders[0][s->mb_x];
+ top_border = h->top_borders[0][h->mb_x];
AV_COPY128(top_border, src_y + 15 * linesize);
if (pixel_shift)
AV_COPY128(top_border + 16, src_y + 15 * linesize + 16);
- if (simple || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
+ if (simple || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) {
if (chroma444) {
if (pixel_shift) {
AV_COPY128(top_border + 32, src_cb + 15 * uvlinesize);
@@ -1665,14 +1954,14 @@ static av_always_inline void backup_mb_border(H264Context *h, uint8_t *src_y,
return;
}
- top_border = h->top_borders[top_idx][s->mb_x];
+ top_border = h->top_borders[top_idx][h->mb_x];
/* There are two lines saved, the line above the top macroblock
* of a pair, and the line above the bottom macroblock. */
AV_COPY128(top_border, src_y + 16 * linesize);
if (pixel_shift)
AV_COPY128(top_border + 16, src_y + 16 * linesize + 16);
- if (simple || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
+ if (simple || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) {
if (chroma444) {
if (pixel_shift) {
AV_COPY128(top_border + 32, src_cb + 16 * linesize);
@@ -1709,7 +1998,6 @@ static av_always_inline void xchg_mb_border(H264Context *h, uint8_t *src_y,
int xchg, int chroma444,
int simple, int pixel_shift)
{
- MpegEncContext *const s = &h->s;
int deblock_topleft;
int deblock_top;
int top_idx = 1;
@@ -1717,7 +2005,7 @@ static av_always_inline void xchg_mb_border(H264Context *h, uint8_t *src_y,
uint8_t *top_border;
if (!simple && FRAME_MBAFF) {
- if (s->mb_y & 1) {
+ if (h->mb_y & 1) {
if (!MB_MBAFF)
return;
} else {
@@ -1726,19 +2014,19 @@ static av_always_inline void xchg_mb_border(H264Context *h, uint8_t *src_y,
}
if (h->deblocking_filter == 2) {
- deblock_topleft = h->slice_table[h->mb_xy - 1 - s->mb_stride] == h->slice_num;
+ deblock_topleft = h->slice_table[h->mb_xy - 1 - h->mb_stride] == h->slice_num;
deblock_top = h->top_type;
} else {
- deblock_topleft = (s->mb_x > 0);
- deblock_top = (s->mb_y > !!MB_FIELD);
+ deblock_topleft = (h->mb_x > 0);
+ deblock_top = (h->mb_y > !!MB_FIELD);
}
src_y -= linesize + 1 + pixel_shift;
src_cb -= uvlinesize + 1 + pixel_shift;
src_cr -= uvlinesize + 1 + pixel_shift;
- top_border_m1 = h->top_borders[top_idx][s->mb_x - 1];
- top_border = h->top_borders[top_idx][s->mb_x];
+ top_border_m1 = h->top_borders[top_idx][h->mb_x - 1];
+ top_border = h->top_borders[top_idx][h->mb_x];
#define XCHG(a, b, xchg) \
if (pixel_shift) { \
@@ -1760,12 +2048,12 @@ static av_always_inline void xchg_mb_border(H264Context *h, uint8_t *src_y,
}
XCHG(top_border + (0 << pixel_shift), src_y + (1 << pixel_shift), xchg);
XCHG(top_border + (8 << pixel_shift), src_y + (9 << pixel_shift), 1);
- if (s->mb_x + 1 < s->mb_width) {
- XCHG(h->top_borders[top_idx][s->mb_x + 1],
+ if (h->mb_x + 1 < h->mb_width) {
+ XCHG(h->top_borders[top_idx][h->mb_x + 1],
src_y + (17 << pixel_shift), 1);
}
}
- if (simple || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
+ if (simple || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) {
if (chroma444) {
if (deblock_topleft) {
XCHG(top_border_m1 + (24 << pixel_shift), src_cb - (7 << pixel_shift), 1);
@@ -1775,9 +2063,9 @@ static av_always_inline void xchg_mb_border(H264Context *h, uint8_t *src_y,
XCHG(top_border + (24 << pixel_shift), src_cb + (9 << pixel_shift), 1);
XCHG(top_border + (32 << pixel_shift), src_cr + (1 << pixel_shift), xchg);
XCHG(top_border + (40 << pixel_shift), src_cr + (9 << pixel_shift), 1);
- if (s->mb_x + 1 < s->mb_width) {
- XCHG(h->top_borders[top_idx][s->mb_x + 1] + (16 << pixel_shift), src_cb + (17 << pixel_shift), 1);
- XCHG(h->top_borders[top_idx][s->mb_x + 1] + (32 << pixel_shift), src_cr + (17 << pixel_shift), 1);
+ if (h->mb_x + 1 < h->mb_width) {
+ XCHG(h->top_borders[top_idx][h->mb_x + 1] + (16 << pixel_shift), src_cb + (17 << pixel_shift), 1);
+ XCHG(h->top_borders[top_idx][h->mb_x + 1] + (32 << pixel_shift), src_cr + (17 << pixel_shift), 1);
}
} else {
if (deblock_top) {
@@ -1819,17 +2107,16 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h,
int linesize,
uint8_t *dest_y, int p)
{
- MpegEncContext *const s = &h->s;
void (*idct_add)(uint8_t *dst, int16_t *block, int stride);
void (*idct_dc_add)(uint8_t *dst, int16_t *block, int stride);
int i;
- int qscale = p == 0 ? s->qscale : h->chroma_qp[p - 1];
+ int qscale = p == 0 ? h->qscale : h->chroma_qp[p - 1];
block_offset += 16 * p;
if (IS_INTRA4x4(mb_type)) {
if (IS_8x8DCT(mb_type)) {
if (transform_bypass) {
idct_dc_add =
- idct_add = s->dsp.add_pixels8;
+ idct_add = h->dsp.add_pixels8;
} else {
idct_dc_add = h->h264dsp.h264_idct8_dc_add;
idct_add = h->h264dsp.h264_idct8_add;
@@ -1854,7 +2141,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h,
} else {
if (transform_bypass) {
idct_dc_add =
- idct_add = s->dsp.add_pixels4;
+ idct_add = h->dsp.add_pixels4;
} else {
idct_dc_add = h->h264dsp.h264_idct_dc_add;
idct_add = h->h264dsp.h264_idct_add;
@@ -1871,7 +2158,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h,
uint64_t tr_high;
if (dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED) {
const int topright_avail = (h->topright_samples_available << i) & 0x8000;
- assert(s->mb_y || linesize <= block_offset[i]);
+ assert(h->mb_y || linesize <= block_offset[i]);
if (!topright_avail) {
if (pixel_shift) {
tr_high = ((uint16_t *)ptr)[3 - linesize / 2] * 0x0001000100010001ULL;
@@ -1934,7 +2221,6 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, int mb_type,
int linesize,
uint8_t *dest_y, int p)
{
- MpegEncContext *const s = &h->s;
void (*idct_add)(uint8_t *dst, int16_t *block, int stride);
int i;
block_offset += 16 * p;
@@ -1952,7 +2238,7 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, int mb_type,
for (i = 0; i < 16; i++)
if (h->non_zero_count_cache[scan8[i + p * 16]] ||
dctcoef_get(h->mb, pixel_shift, i * 16 + p * 256))
- s->dsp.add_pixels4(dest_y + block_offset[i],
+ h->dsp.add_pixels4(dest_y + block_offset[i],
h->mb + (i * 16 + p * 256 << pixel_shift),
linesize);
}
@@ -1965,8 +2251,8 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, int mb_type,
} else if (h->cbp & 15) {
if (transform_bypass) {
const int di = IS_8x8DCT(mb_type) ? 4 : 1;
- idct_add = IS_8x8DCT(mb_type) ? s->dsp.add_pixels8
- : s->dsp.add_pixels4;
+ idct_add = IS_8x8DCT(mb_type) ? h->dsp.add_pixels8
+ : h->dsp.add_pixels4;
for (i = 0; i < 16; i += di)
if (h->non_zero_count_cache[scan8[i + p * 16]])
idct_add(dest_y + block_offset[i],
@@ -1991,7 +2277,7 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, int mb_type,
// FIXME benchmark weird rule, & below
uint8_t *const ptr = dest_y + block_offset[i];
ff_svq3_add_idct_c(ptr, h->mb + i * 16 + p * 256, linesize,
- s->qscale, IS_INTRA(mb_type) ? 1 : 0);
+ h->qscale, IS_INTRA(mb_type) ? 1 : 0);
}
}
}
@@ -2011,10 +2297,9 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, int mb_type,
void ff_h264_hl_decode_mb(H264Context *h)
{
- MpegEncContext *const s = &h->s;
const int mb_xy = h->mb_xy;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
- int is_complex = CONFIG_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0;
+ const int mb_type = h->cur_pic.f.mb_type[mb_xy];
+ int is_complex = CONFIG_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || h->qscale == 0;
if (CHROMA444) {
if (is_complex || h->pixel_shift)
@@ -2031,15 +2316,14 @@ void ff_h264_hl_decode_mb(H264Context *h)
static int pred_weight_table(H264Context *h)
{
- MpegEncContext *const s = &h->s;
int list, i;
int luma_def, chroma_def;
h->use_weight = 0;
h->use_weight_chroma = 0;
- h->luma_log2_weight_denom = get_ue_golomb(&s->gb);
+ h->luma_log2_weight_denom = get_ue_golomb(&h->gb);
if (h->sps.chroma_format_idc)
- h->chroma_log2_weight_denom = get_ue_golomb(&s->gb);
+ h->chroma_log2_weight_denom = get_ue_golomb(&h->gb);
luma_def = 1 << h->luma_log2_weight_denom;
chroma_def = 1 << h->chroma_log2_weight_denom;
@@ -2049,10 +2333,10 @@ static int pred_weight_table(H264Context *h)
for (i = 0; i < h->ref_count[list]; i++) {
int luma_weight_flag, chroma_weight_flag;
- luma_weight_flag = get_bits1(&s->gb);
+ luma_weight_flag = get_bits1(&h->gb);
if (luma_weight_flag) {
- h->luma_weight[i][list][0] = get_se_golomb(&s->gb);
- h->luma_weight[i][list][1] = get_se_golomb(&s->gb);
+ h->luma_weight[i][list][0] = get_se_golomb(&h->gb);
+ h->luma_weight[i][list][1] = get_se_golomb(&h->gb);
if (h->luma_weight[i][list][0] != luma_def ||
h->luma_weight[i][list][1] != 0) {
h->use_weight = 1;
@@ -2064,12 +2348,12 @@ static int pred_weight_table(H264Context *h)
}
if (h->sps.chroma_format_idc) {
- chroma_weight_flag = get_bits1(&s->gb);
+ chroma_weight_flag = get_bits1(&h->gb);
if (chroma_weight_flag) {
int j;
for (j = 0; j < 2; j++) {
- h->chroma_weight[i][list][j][0] = get_se_golomb(&s->gb);
- h->chroma_weight[i][list][j][1] = get_se_golomb(&s->gb);
+ h->chroma_weight[i][list][j][0] = get_se_golomb(&h->gb);
+ h->chroma_weight[i][list][j][1] = get_se_golomb(&h->gb);
if (h->chroma_weight[i][list][j][0] != chroma_def ||
h->chroma_weight[i][list][j][1] != 0) {
h->use_weight_chroma = 1;
@@ -2099,7 +2383,6 @@ static int pred_weight_table(H264Context *h)
*/
static void implicit_weight_table(H264Context *h, int field)
{
- MpegEncContext *const s = &h->s;
int ref0, ref1, i, cur_poc, ref_start, ref_count0, ref_count1;
for (i = 0; i < 2; i++) {
@@ -2108,10 +2391,10 @@ static void implicit_weight_table(H264Context *h, int field)
}
if (field < 0) {
- if (s->picture_structure == PICT_FRAME) {
- cur_poc = s->current_picture_ptr->poc;
+ if (h->picture_structure == PICT_FRAME) {
+ cur_poc = h->cur_pic_ptr->poc;
} else {
- cur_poc = s->current_picture_ptr->field_poc[s->picture_structure - 1];
+ cur_poc = h->cur_pic_ptr->field_poc[h->picture_structure - 1];
}
if (h->ref_count[0] == 1 && h->ref_count[1] == 1 && !FRAME_MBAFF &&
h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2 * cur_poc) {
@@ -2123,7 +2406,7 @@ static void implicit_weight_table(H264Context *h, int field)
ref_count0 = h->ref_count[0];
ref_count1 = h->ref_count[1];
} else {
- cur_poc = s->current_picture_ptr->field_poc[field];
+ cur_poc = h->cur_pic_ptr->field_poc[field];
ref_start = 16;
ref_count0 = 16 + 2 * h->ref_count[0];
ref_count1 = 16 + 2 * h->ref_count[1];
@@ -2180,9 +2463,9 @@ static void flush_change(H264Context *h)
h->outputed_poc = h->next_outputed_poc = INT_MIN;
h->prev_interlaced_frame = 1;
idr(h);
- if (h->s.current_picture_ptr)
- h->s.current_picture_ptr->f.reference = 0;
- h->s.first_field = 0;
+ if (h->cur_pic_ptr)
+ h->cur_pic_ptr->f.reference = 0;
+ h->first_field = 0;
memset(h->ref_list[0], 0, sizeof(h->ref_list[0]));
memset(h->ref_list[1], 0, sizeof(h->ref_list[1]));
memset(h->default_ref_list[0], 0, sizeof(h->default_ref_list[0]));
@@ -2203,15 +2486,28 @@ static void flush_dpb(AVCodecContext *avctx)
}
flush_change(h);
- ff_mpeg_flush(avctx);
+
+ for (i = 0; i < h->picture_count; i++) {
+ if (h->DPB[i].f.data[0])
+ free_frame_buffer(h, &h->DPB[i]);
+ }
+ h->cur_pic_ptr = NULL;
+
+ h->mb_x = h->mb_y = 0;
+
+ h->parse_context.state = -1;
+ h->parse_context.frame_start_found = 0;
+ h->parse_context.overread = 0;
+ h->parse_context.overread_index = 0;
+ h->parse_context.index = 0;
+ h->parse_context.last_index = 0;
}
static int init_poc(H264Context *h)
{
- MpegEncContext *const s = &h->s;
const int max_frame_num = 1 << h->sps.log2_max_frame_num;
int field_poc[2];
- Picture *cur = s->current_picture_ptr;
+ Picture *cur = h->cur_pic_ptr;
h->frame_num_offset = h->prev_frame_num_offset;
if (h->frame_num < h->prev_frame_num)
@@ -2228,7 +2524,7 @@ static int init_poc(H264Context *h)
h->poc_msb = h->prev_poc_msb;
field_poc[0] =
field_poc[1] = h->poc_msb + h->poc_lsb;
- if (s->picture_structure == PICT_FRAME)
+ if (h->picture_structure == PICT_FRAME)
field_poc[1] += h->delta_poc_bottom;
} else if (h->sps.poc_type == 1) {
int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc;
@@ -2263,7 +2559,7 @@ static int init_poc(H264Context *h)
field_poc[0] = expectedpoc + h->delta_poc[0];
field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field;
- if (s->picture_structure == PICT_FRAME)
+ if (h->picture_structure == PICT_FRAME)
field_poc[1] += h->delta_poc[1];
} else {
int poc = 2 * (h->frame_num_offset + h->frame_num);
@@ -2275,10 +2571,10 @@ static int init_poc(H264Context *h)
field_poc[1] = poc;
}
- if (s->picture_structure != PICT_BOTTOM_FIELD)
- s->current_picture_ptr->field_poc[0] = field_poc[0];
- if (s->picture_structure != PICT_TOP_FIELD)
- s->current_picture_ptr->field_poc[1] = field_poc[1];
+ if (h->picture_structure != PICT_BOTTOM_FIELD)
+ h->cur_pic_ptr->field_poc[0] = field_poc[0];
+ if (h->picture_structure != PICT_TOP_FIELD)
+ h->cur_pic_ptr->field_poc[1] = field_poc[1];
cur->poc = FFMIN(cur->field_poc[0], cur->field_poc[1]);
return 0;
@@ -2323,21 +2619,20 @@ static void init_scan_tables(H264Context *h)
static int field_end(H264Context *h, int in_setup)
{
- MpegEncContext *const s = &h->s;
- AVCodecContext *const avctx = s->avctx;
+ AVCodecContext *const avctx = h->avctx;
int err = 0;
- s->mb_y = 0;
+ h->mb_y = 0;
- if (!in_setup && !s->droppable)
- ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX,
- s->picture_structure == PICT_BOTTOM_FIELD);
+ if (!in_setup && !h->droppable)
+ ff_thread_report_progress(&h->cur_pic_ptr->f, INT_MAX,
+ h->picture_structure == PICT_BOTTOM_FIELD);
if (CONFIG_H264_VDPAU_DECODER &&
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
- ff_vdpau_h264_set_reference_frames(s);
+ h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
+ ff_vdpau_h264_set_reference_frames(h);
if (in_setup || !(avctx->active_thread_type & FF_THREAD_FRAME)) {
- if (!s->droppable) {
+ if (!h->droppable) {
err = ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index);
h->prev_poc_msb = h->poc_msb;
h->prev_poc_lsb = h->poc_lsb;
@@ -2354,8 +2649,8 @@ static int field_end(H264Context *h, int in_setup)
}
if (CONFIG_H264_VDPAU_DECODER &&
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
- ff_vdpau_h264_picture_complete(s);
+ h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
+ ff_vdpau_h264_picture_complete(h);
/*
* FIXME: Error handling code does not seem to support interlaced
@@ -2369,10 +2664,36 @@ static int field_end(H264Context *h, int in_setup)
* past end by one (callers fault) and resync_mb_y != 0
* causes problems for the first MB line, too.
*/
- if (!FIELD_PICTURE)
- ff_er_frame_end(&s->er);
-
- ff_MPV_frame_end(s);
+ if (!FIELD_PICTURE) {
+ h->er.cur_pic = h->cur_pic_ptr;
+ h->er.last_pic = h->ref_count[0] ? &h->ref_list[0][0] : NULL;
+ h->er.next_pic = h->ref_count[1] ? &h->ref_list[1][0] : NULL;
+ ff_er_frame_end(&h->er);
+ }
+
+ /* redraw edges for the frame if decoding didn't complete */
+ if (h->er.error_count &&
+ !h->avctx->hwaccel &&
+ !(h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) &&
+ h->cur_pic_ptr->f.reference &&
+ !(h->flags & CODEC_FLAG_EMU_EDGE)) {
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(h->avctx->pix_fmt);
+ int hshift = desc->log2_chroma_w;
+ int vshift = desc->log2_chroma_h;
+ h->dsp.draw_edges(h->cur_pic.f.data[0], h->linesize,
+ h->mb_width * 16, h->mb_height * 16,
+ EDGE_WIDTH, EDGE_WIDTH,
+ EDGE_TOP | EDGE_BOTTOM);
+ h->dsp.draw_edges(h->cur_pic.f.data[1], h->uvlinesize,
+ (h->mb_width * 16) >> hshift, (h->mb_height * 16) >> vshift,
+ EDGE_WIDTH >> hshift, EDGE_WIDTH >> vshift,
+ EDGE_TOP | EDGE_BOTTOM);
+ h->dsp.draw_edges(h->cur_pic.f.data[2], h->uvlinesize,
+ (h->mb_width * 16) >> hshift, (h->mb_height * 16) >> vshift,
+ EDGE_WIDTH >> hshift, EDGE_WIDTH >> vshift,
+ EDGE_TOP | EDGE_BOTTOM);
+ }
+ emms_c();
h->current_slice = 0;
@@ -2384,21 +2705,12 @@ static int field_end(H264Context *h, int in_setup)
*/
static int clone_slice(H264Context *dst, H264Context *src)
{
- int ret;
-
memcpy(dst->block_offset, src->block_offset, sizeof(dst->block_offset));
- dst->s.current_picture_ptr = src->s.current_picture_ptr;
- dst->s.current_picture = src->s.current_picture;
- dst->s.linesize = src->s.linesize;
- dst->s.uvlinesize = src->s.uvlinesize;
- dst->s.first_field = src->s.first_field;
-
- if (!dst->s.edge_emu_buffer &&
- (ret = ff_mpv_frame_size_alloc(&dst->s, dst->s.linesize))) {
- av_log(dst->s.avctx, AV_LOG_ERROR,
- "Failed to allocate scratch buffers\n");
- return ret;
- }
+ dst->cur_pic_ptr = src->cur_pic_ptr;
+ dst->cur_pic = src->cur_pic;
+ dst->linesize = src->linesize;
+ dst->uvlinesize = src->uvlinesize;
+ dst->first_field = src->first_field;
dst->prev_poc_msb = src->prev_poc_msb;
dst->prev_poc_lsb = src->prev_poc_lsb;
@@ -2445,32 +2757,30 @@ int ff_h264_get_profile(SPS *sps)
static int h264_set_parameter_from_sps(H264Context *h)
{
- MpegEncContext *s = &h->s;
-
- if (s->flags & CODEC_FLAG_LOW_DELAY ||
+ if (h->flags & CODEC_FLAG_LOW_DELAY ||
(h->sps.bitstream_restriction_flag &&
!h->sps.num_reorder_frames)) {
- if (s->avctx->has_b_frames > 1 || h->delayed_pic[0])
- av_log(h->s.avctx, AV_LOG_WARNING, "Delayed frames seen. "
+ if (h->avctx->has_b_frames > 1 || h->delayed_pic[0])
+ av_log(h->avctx, AV_LOG_WARNING, "Delayed frames seen. "
"Reenabling low delay requires a codec flush.\n");
else
- s->low_delay = 1;
+ h->low_delay = 1;
}
- if (s->avctx->has_b_frames < 2)
- s->avctx->has_b_frames = !s->low_delay;
+ if (h->avctx->has_b_frames < 2)
+ h->avctx->has_b_frames = !h->low_delay;
- if (s->avctx->bits_per_raw_sample != h->sps.bit_depth_luma ||
+ if (h->avctx->bits_per_raw_sample != h->sps.bit_depth_luma ||
h->cur_chroma_format_idc != h->sps.chroma_format_idc) {
- if (s->avctx->codec &&
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU &&
+ if (h->avctx->codec &&
+ h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU &&
(h->sps.bit_depth_luma != 8 || h->sps.chroma_format_idc > 1)) {
- av_log(s->avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"VDPAU decoding does not support video colorspace.\n");
return AVERROR_INVALIDDATA;
}
if (h->sps.bit_depth_luma >= 8 && h->sps.bit_depth_luma <= 10) {
- s->avctx->bits_per_raw_sample = h->sps.bit_depth_luma;
+ h->avctx->bits_per_raw_sample = h->sps.bit_depth_luma;
h->cur_chroma_format_idc = h->sps.chroma_format_idc;
h->pixel_shift = h->sps.bit_depth_luma > 8;
@@ -2478,13 +2788,13 @@ static int h264_set_parameter_from_sps(H264Context *h)
h->sps.chroma_format_idc);
ff_h264chroma_init(&h->h264chroma, h->sps.bit_depth_chroma);
ff_h264qpel_init(&h->h264qpel, h->sps.bit_depth_luma);
- ff_h264_pred_init(&h->hpc, s->codec_id, h->sps.bit_depth_luma,
+ ff_h264_pred_init(&h->hpc, h->avctx->codec_id, h->sps.bit_depth_luma,
h->sps.chroma_format_idc);
- s->dsp.dct_bits = h->sps.bit_depth_luma > 8 ? 32 : 16;
- ff_dsputil_init(&s->dsp, s->avctx);
- ff_videodsp_init(&s->vdsp, h->sps.bit_depth_luma);
+ h->dsp.dct_bits = h->sps.bit_depth_luma > 8 ? 32 : 16;
+ ff_dsputil_init(&h->dsp, h->avctx);
+ ff_videodsp_init(&h->vdsp, h->sps.bit_depth_luma);
} else {
- av_log(s->avctx, AV_LOG_ERROR, "Unsupported bit depth: %d\n",
+ av_log(h->avctx, AV_LOG_ERROR, "Unsupported bit depth: %d\n",
h->sps.bit_depth_luma);
return AVERROR_INVALIDDATA;
}
@@ -2494,11 +2804,10 @@ static int h264_set_parameter_from_sps(H264Context *h)
static enum PixelFormat get_pixel_format(H264Context *h)
{
- MpegEncContext *const s = &h->s;
switch (h->sps.bit_depth_luma) {
case 9:
if (CHROMA444) {
- if (s->avctx->colorspace == AVCOL_SPC_RGB) {
+ if (h->avctx->colorspace == AVCOL_SPC_RGB) {
return AV_PIX_FMT_GBRP9;
} else
return AV_PIX_FMT_YUV444P9;
@@ -2509,7 +2818,7 @@ static enum PixelFormat get_pixel_format(H264Context *h)
break;
case 10:
if (CHROMA444) {
- if (s->avctx->colorspace == AVCOL_SPC_RGB) {
+ if (h->avctx->colorspace == AVCOL_SPC_RGB) {
return AV_PIX_FMT_GBRP10;
} else
return AV_PIX_FMT_YUV444P10;
@@ -2520,24 +2829,24 @@ static enum PixelFormat get_pixel_format(H264Context *h)
break;
case 8:
if (CHROMA444) {
- if (s->avctx->colorspace == AVCOL_SPC_RGB) {
+ if (h->avctx->colorspace == AVCOL_SPC_RGB) {
return AV_PIX_FMT_GBRP;
} else
- return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ444P
+ return h->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ444P
: AV_PIX_FMT_YUV444P;
} else if (CHROMA422) {
- return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P
+ return h->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P
: AV_PIX_FMT_YUV422P;
} else {
- return s->avctx->get_format(s->avctx, s->avctx->codec->pix_fmts ?
- s->avctx->codec->pix_fmts :
- s->avctx->color_range == AVCOL_RANGE_JPEG ?
+ return h->avctx->get_format(h->avctx, h->avctx->codec->pix_fmts ?
+ h->avctx->codec->pix_fmts :
+ h->avctx->color_range == AVCOL_RANGE_JPEG ?
hwaccel_pixfmt_list_h264_jpeg_420 :
ff_hwaccel_pixfmt_list_420);
}
break;
default:
- av_log(s->avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"Unsupported bit depth: %d\n", h->sps.bit_depth_luma);
return AVERROR_INVALIDDATA;
}
@@ -2545,73 +2854,101 @@ static enum PixelFormat get_pixel_format(H264Context *h)
static int h264_slice_header_init(H264Context *h, int reinit)
{
- MpegEncContext *const s = &h->s;
- int i, ret;
+ int nb_slices = (HAVE_THREADS &&
+ h->avctx->active_thread_type & FF_THREAD_SLICE) ?
+ h->avctx->thread_count : 1;
+ int i;
- avcodec_set_dimensions(s->avctx, s->width, s->height);
- s->avctx->sample_aspect_ratio = h->sps.sar;
- av_assert0(s->avctx->sample_aspect_ratio.den);
+ avcodec_set_dimensions(h->avctx, h->width, h->height);
+ h->avctx->sample_aspect_ratio = h->sps.sar;
+ av_assert0(h->avctx->sample_aspect_ratio.den);
+ av_pix_fmt_get_chroma_sub_sample(h->avctx->pix_fmt,
+ &h->chroma_x_shift, &h->chroma_y_shift);
if (h->sps.timing_info_present_flag) {
int64_t den = h->sps.time_scale;
if (h->x264_build < 44U)
den *= 2;
- av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den,
+ av_reduce(&h->avctx->time_base.num, &h->avctx->time_base.den,
h->sps.num_units_in_tick, den, 1 << 30);
}
- s->avctx->hwaccel = ff_find_hwaccel(s->avctx->codec->id, s->avctx->pix_fmt);
+ h->avctx->hwaccel = ff_find_hwaccel(h->avctx->codec->id, h->avctx->pix_fmt);
- if (reinit) {
+ if (reinit)
free_tables(h, 0);
- if ((ret = ff_MPV_common_frame_size_change(s)) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR, "ff_MPV_common_frame_size_change() failed.\n");
- return ret;
- }
- } else {
- if ((ret = ff_MPV_common_init(s)) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR, "ff_MPV_common_init() failed.\n");
- return ret;
- }
- }
- s->first_field = 0;
+ h->first_field = 0;
h->prev_interlaced_frame = 1;
init_scan_tables(h);
if (ff_h264_alloc_tables(h) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"Could not allocate memory for h264\n");
return AVERROR(ENOMEM);
}
- if (!HAVE_THREADS || !(s->avctx->active_thread_type & FF_THREAD_SLICE)) {
+ if (nb_slices > MAX_THREADS || (nb_slices > h->mb_height && h->mb_height)) {
+ int max_slices;
+ if (h->mb_height)
+ max_slices = FFMIN(MAX_THREADS, h->mb_height);
+ else
+ max_slices = MAX_THREADS;
+ av_log(h->avctx, AV_LOG_WARNING, "too many threads/slices (%d),"
+ " reducing to %d\n", nb_slices, max_slices);
+ nb_slices = max_slices;
+ }
+ h->slice_context_count = nb_slices;
+
+ if (!HAVE_THREADS || !(h->avctx->active_thread_type & FF_THREAD_SLICE)) {
if (context_init(h) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR, "context_init() failed.\n");
+ av_log(h->avctx, AV_LOG_ERROR, "context_init() failed.\n");
return -1;
}
} else {
- for (i = 1; i < s->slice_context_count; i++) {
+ for (i = 1; i < h->slice_context_count; i++) {
H264Context *c;
- c = h->thread_context[i] = av_malloc(sizeof(H264Context));
- memcpy(c, h->s.thread_context[i], sizeof(MpegEncContext));
- memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext));
+ c = h->thread_context[i] = av_mallocz(sizeof(H264Context));
+ c->avctx = h->avctx;
+ c->dsp = h->dsp;
+ c->vdsp = h->vdsp;
c->h264dsp = h->h264dsp;
c->h264qpel = h->h264qpel;
c->h264chroma = h->h264chroma;
c->sps = h->sps;
c->pps = h->pps;
c->pixel_shift = h->pixel_shift;
+ c->width = h->width;
+ c->height = h->height;
+ c->linesize = h->linesize;
+ c->uvlinesize = h->uvlinesize;
+ c->chroma_x_shift = h->chroma_x_shift;
+ c->chroma_y_shift = h->chroma_y_shift;
+ c->qscale = h->qscale;
+ c->droppable = h->droppable;
+ c->data_partitioning = h->data_partitioning;
+ c->low_delay = h->low_delay;
+ c->mb_width = h->mb_width;
+ c->mb_height = h->mb_height;
+ c->mb_stride = h->mb_stride;
+ c->mb_num = h->mb_num;
+ c->flags = h->flags;
+ c->workaround_bugs = h->workaround_bugs;
+ c->pict_type = h->pict_type;
+
init_scan_tables(c);
clone_tables(c, h, i);
+ c->context_initialized = 1;
}
- for (i = 0; i < s->slice_context_count; i++)
+ for (i = 0; i < h->slice_context_count; i++)
if (context_init(h->thread_context[i]) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR, "context_init() failed.\n");
+ av_log(h->avctx, AV_LOG_ERROR, "context_init() failed.\n");
return -1;
}
}
+ h->context_initialized = 1;
+
return 0;
}
@@ -2627,8 +2964,6 @@ static int h264_slice_header_init(H264Context *h, int reinit)
*/
static int decode_slice_header(H264Context *h, H264Context *h0)
{
- MpegEncContext *const s = &h->s;
- MpegEncContext *const s0 = &h0->s;
unsigned int first_mb_in_slice;
unsigned int pps_id;
int num_ref_idx_active_override_flag, max_refs, ret;
@@ -2637,10 +2972,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
int last_pic_structure, last_pic_droppable;
int needs_reinit = 0;
- s->me.qpel_put = h->h264qpel.put_h264_qpel_pixels_tab;
- s->me.qpel_avg = h->h264qpel.avg_h264_qpel_pixels_tab;
+ h->me.qpel_put = h->h264qpel.put_h264_qpel_pixels_tab;
+ h->me.qpel_avg = h->h264qpel.avg_h264_qpel_pixels_tab;
- first_mb_in_slice = get_ue_golomb(&s->gb);
+ first_mb_in_slice = get_ue_golomb(&h->gb);
if (first_mb_in_slice == 0) { // FIXME better field boundary detection
if (h0->current_slice && FIELD_PICTURE) {
@@ -2648,21 +2983,21 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
}
h0->current_slice = 0;
- if (!s0->first_field) {
- if (s->current_picture_ptr && !s->droppable &&
- s->current_picture_ptr->owner2 == s) {
- ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX,
- s->picture_structure == PICT_BOTTOM_FIELD);
+ if (!h0->first_field) {
+ if (h->cur_pic_ptr && !h->droppable &&
+ h->cur_pic_ptr->owner2 == h) {
+ ff_thread_report_progress(&h->cur_pic_ptr->f, INT_MAX,
+ h->picture_structure == PICT_BOTTOM_FIELD);
}
- s->current_picture_ptr = NULL;
+ h->cur_pic_ptr = NULL;
}
}
- slice_type = get_ue_golomb_31(&s->gb);
+ slice_type = get_ue_golomb_31(&h->gb);
if (slice_type > 9) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"slice type too large (%d) at %d %d\n",
- h->slice_type, s->mb_x, s->mb_y);
+ h->slice_type, h->mb_x, h->mb_y);
return -1;
}
if (slice_type > 4) {
@@ -2680,15 +3015,15 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
h->slice_type_nos = slice_type & 3;
// to make a few old functions happy, it's wrong though
- s->pict_type = h->slice_type;
+ h->pict_type = h->slice_type;
- pps_id = get_ue_golomb(&s->gb);
+ pps_id = get_ue_golomb(&h->gb);
if (pps_id >= MAX_PPS_COUNT) {
- av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
+ av_log(h->avctx, AV_LOG_ERROR, "pps_id out of range\n");
return -1;
}
if (!h0->pps_buffers[pps_id]) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"non-existing PPS %u referenced\n",
pps_id);
return -1;
@@ -2696,77 +3031,77 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
h->pps = *h0->pps_buffers[pps_id];
if (!h0->sps_buffers[h->pps.sps_id]) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"non-existing SPS %u referenced\n",
h->pps.sps_id);
return -1;
}
if (h->pps.sps_id != h->current_sps_id ||
- h->context_reinitialized ||
h0->sps_buffers[h->pps.sps_id]->new) {
- SPS *new_sps = h0->sps_buffers[h->pps.sps_id];
-
h0->sps_buffers[h->pps.sps_id]->new = 0;
- if (h->sps.chroma_format_idc != new_sps->chroma_format_idc ||
- h->sps.bit_depth_luma != new_sps->bit_depth_luma)
- needs_reinit = 1;
-
h->current_sps_id = h->pps.sps_id;
h->sps = *h0->sps_buffers[h->pps.sps_id];
+ if (h->bit_depth_luma != h->sps.bit_depth_luma ||
+ h->chroma_format_idc != h->sps.chroma_format_idc) {
+ h->bit_depth_luma = h->sps.bit_depth_luma;
+ h->chroma_format_idc = h->sps.chroma_format_idc;
+ needs_reinit = 1;
+ }
if ((ret = h264_set_parameter_from_sps(h)) < 0)
return ret;
}
- s->avctx->profile = ff_h264_get_profile(&h->sps);
- s->avctx->level = h->sps.level_idc;
- s->avctx->refs = h->sps.ref_frame_count;
+ h->avctx->profile = ff_h264_get_profile(&h->sps);
+ h->avctx->level = h->sps.level_idc;
+ h->avctx->refs = h->sps.ref_frame_count;
- if (s->mb_width != h->sps.mb_width ||
- s->mb_height != h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag))
+ if (h->mb_width != h->sps.mb_width ||
+ h->mb_height != h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag))
needs_reinit = 1;
- s->mb_width = h->sps.mb_width;
- s->mb_height = h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag);
+ h->mb_width = h->sps.mb_width;
+ h->mb_height = h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag);
+ h->mb_num = h->mb_width * h->mb_height;
+ h->mb_stride = h->mb_width + 1;
- h->b_stride = s->mb_width * 4;
+ h->b_stride = h->mb_width * 4;
- s->chroma_y_shift = h->sps.chroma_format_idc <= 1; // 400 uses yuv420p
+ h->chroma_y_shift = h->sps.chroma_format_idc <= 1; // 400 uses yuv420p
- s->width = 16 * s->mb_width - (2 >> CHROMA444) * FFMIN(h->sps.crop_right, (8 << CHROMA444) - 1);
+ h->width = 16 * h->mb_width - (2 >> CHROMA444) * FFMIN(h->sps.crop_right, (8 << CHROMA444) - 1);
if (h->sps.frame_mbs_only_flag)
- s->height = 16 * s->mb_height - (1 << s->chroma_y_shift) * FFMIN(h->sps.crop_bottom, (16 >> s->chroma_y_shift) - 1);
+ h->height = 16 * h->mb_height - (1 << h->chroma_y_shift) * FFMIN(h->sps.crop_bottom, (16 >> h->chroma_y_shift) - 1);
else
- s->height = 16 * s->mb_height - (2 << s->chroma_y_shift) * FFMIN(h->sps.crop_bottom, (16 >> s->chroma_y_shift) - 1);
+ h->height = 16 * h->mb_height - (2 << h->chroma_y_shift) * FFMIN(h->sps.crop_bottom, (16 >> h->chroma_y_shift) - 1);
- if (FFALIGN(s->avctx->width, 16) == s->width &&
- FFALIGN(s->avctx->height, 16) == s->height) {
- s->width = s->avctx->width;
- s->height = s->avctx->height;
+ if (FFALIGN(h->avctx->width, 16) == h->width &&
+ FFALIGN(h->avctx->height, 16) == h->height) {
+ h->width = h->avctx->width;
+ h->height = h->avctx->height;
}
if (h->sps.video_signal_type_present_flag) {
- s->avctx->color_range = h->sps.full_range ? AVCOL_RANGE_JPEG
+ h->avctx->color_range = h->sps.full_range ? AVCOL_RANGE_JPEG
: AVCOL_RANGE_MPEG;
if (h->sps.colour_description_present_flag) {
- if (s->avctx->colorspace != h->sps.colorspace)
+ if (h->avctx->colorspace != h->sps.colorspace)
needs_reinit = 1;
- s->avctx->color_primaries = h->sps.color_primaries;
- s->avctx->color_trc = h->sps.color_trc;
- s->avctx->colorspace = h->sps.colorspace;
+ h->avctx->color_primaries = h->sps.color_primaries;
+ h->avctx->color_trc = h->sps.color_trc;
+ h->avctx->colorspace = h->sps.colorspace;
}
}
- if (s->context_initialized &&
- (s->width != s->avctx->width ||
- s->height != s->avctx->height ||
- needs_reinit ||
- av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) {
+ if (h->context_initialized &&
+ (h->width != h->avctx->width ||
+ h->height != h->avctx->height ||
+ needs_reinit)) {
if (h != h0) {
- av_log(s->avctx, AV_LOG_ERROR, "changing width/height on "
+ av_log(h->avctx, AV_LOG_ERROR, "changing width/height on "
"slice %d\n", h0->current_slice + 1);
return AVERROR_INVALIDDATA;
}
@@ -2775,31 +3110,30 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
if ((ret = get_pixel_format(h)) < 0)
return ret;
- s->avctx->pix_fmt = ret;
+ h->avctx->pix_fmt = ret;
- av_log(h->s.avctx, AV_LOG_INFO, "Reinit context to %dx%d, "
- "pix_fmt: %d\n", s->width, s->height, s->avctx->pix_fmt);
+ av_log(h->avctx, AV_LOG_INFO, "Reinit context to %dx%d, "
+ "pix_fmt: %d\n", h->width, h->height, h->avctx->pix_fmt);
if ((ret = h264_slice_header_init(h, 1)) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"h264_slice_header_init() failed\n");
return ret;
}
- h->context_reinitialized = 1;
}
- if (!s->context_initialized) {
+ if (!h->context_initialized) {
if (h != h0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"Cannot (re-)initialize context during parallel decoding.\n");
return -1;
}
if ((ret = get_pixel_format(h)) < 0)
return ret;
- s->avctx->pix_fmt = ret;
+ h->avctx->pix_fmt = ret;
if ((ret = h264_slice_header_init(h, 0)) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"h264_slice_header_init() failed\n");
return ret;
}
@@ -2810,37 +3144,37 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
init_dequant_tables(h);
}
- h->frame_num = get_bits(&s->gb, h->sps.log2_max_frame_num);
+ h->frame_num = get_bits(&h->gb, h->sps.log2_max_frame_num);
h->mb_mbaff = 0;
h->mb_aff_frame = 0;
- last_pic_structure = s0->picture_structure;
- last_pic_droppable = s0->droppable;
- s->droppable = h->nal_ref_idc == 0;
+ last_pic_structure = h0->picture_structure;
+ last_pic_droppable = h0->droppable;
+ h->droppable = h->nal_ref_idc == 0;
if (h->sps.frame_mbs_only_flag) {
- s->picture_structure = PICT_FRAME;
+ h->picture_structure = PICT_FRAME;
} else {
- if (get_bits1(&s->gb)) { // field_pic_flag
- s->picture_structure = PICT_TOP_FIELD + get_bits1(&s->gb); // bottom_field_flag
+ if (get_bits1(&h->gb)) { // field_pic_flag
+ h->picture_structure = PICT_TOP_FIELD + get_bits1(&h->gb); // bottom_field_flag
} else {
- s->picture_structure = PICT_FRAME;
+ h->picture_structure = PICT_FRAME;
h->mb_aff_frame = h->sps.mb_aff;
}
}
- h->mb_field_decoding_flag = s->picture_structure != PICT_FRAME;
+ h->mb_field_decoding_flag = h->picture_structure != PICT_FRAME;
if (h0->current_slice != 0) {
- if (last_pic_structure != s->picture_structure ||
- last_pic_droppable != s->droppable) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ if (last_pic_structure != h->picture_structure ||
+ last_pic_droppable != h->droppable) {
+ av_log(h->avctx, AV_LOG_ERROR,
"Changing field mode (%d -> %d) between slices is not allowed\n",
- last_pic_structure, s->picture_structure);
- s->picture_structure = last_pic_structure;
- s->droppable = last_pic_droppable;
+ last_pic_structure, h->picture_structure);
+ h->picture_structure = last_pic_structure;
+ h->droppable = last_pic_droppable;
return AVERROR_INVALIDDATA;
- } else if (!s0->current_picture_ptr) {
- av_log(s->avctx, AV_LOG_ERROR,
- "unset current_picture_ptr on %d. slice\n",
+ } else if (!h0->cur_pic_ptr) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "unset cur_pic_ptr on %d. slice\n",
h0->current_slice + 1);
return AVERROR_INVALIDDATA;
}
@@ -2868,53 +3202,53 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
* decode frames as "finished".
* We have to do that before the "dummy" in-between frame allocation,
* since that can modify s->current_picture_ptr. */
- if (s0->first_field) {
- assert(s0->current_picture_ptr);
- assert(s0->current_picture_ptr->f.data[0]);
- assert(s0->current_picture_ptr->f.reference != DELAYED_PIC_REF);
+ if (h0->first_field) {
+ assert(h0->cur_pic_ptr);
+ assert(h0->cur_pic_ptr->f.data[0]);
+ assert(h0->cur_pic_ptr->f.reference != DELAYED_PIC_REF);
/* Mark old field/frame as completed */
- if (!last_pic_droppable && s0->current_picture_ptr->owner2 == s0) {
- ff_thread_report_progress(&s0->current_picture_ptr->f, INT_MAX,
+ if (!last_pic_droppable && h0->cur_pic_ptr->owner2 == h0) {
+ ff_thread_report_progress(&h0->cur_pic_ptr->f, INT_MAX,
last_pic_structure == PICT_BOTTOM_FIELD);
}
/* figure out if we have a complementary field pair */
- if (!FIELD_PICTURE || s->picture_structure == last_pic_structure) {
+ if (!FIELD_PICTURE || h->picture_structure == last_pic_structure) {
/* Previous field is unmatched. Don't display it, but let it
* remain for reference if marked as such. */
if (!last_pic_droppable && last_pic_structure != PICT_FRAME) {
- ff_thread_report_progress(&s0->current_picture_ptr->f, INT_MAX,
+ ff_thread_report_progress(&h0->cur_pic_ptr->f, INT_MAX,
last_pic_structure == PICT_TOP_FIELD);
}
} else {
- if (s0->current_picture_ptr->frame_num != h->frame_num) {
+ if (h0->cur_pic_ptr->frame_num != h->frame_num) {
/* This and previous field were reference, but had
* different frame_nums. Consider this field first in
* pair. Throw away previous field except for reference
* purposes. */
if (!last_pic_droppable && last_pic_structure != PICT_FRAME) {
- ff_thread_report_progress(&s0->current_picture_ptr->f, INT_MAX,
+ ff_thread_report_progress(&h0->cur_pic_ptr->f, INT_MAX,
last_pic_structure == PICT_TOP_FIELD);
}
} else {
/* Second field in complementary pair */
if (!((last_pic_structure == PICT_TOP_FIELD &&
- s->picture_structure == PICT_BOTTOM_FIELD) ||
+ h->picture_structure == PICT_BOTTOM_FIELD) ||
(last_pic_structure == PICT_BOTTOM_FIELD &&
- s->picture_structure == PICT_TOP_FIELD))) {
- av_log(s->avctx, AV_LOG_ERROR,
+ h->picture_structure == PICT_TOP_FIELD))) {
+ av_log(h->avctx, AV_LOG_ERROR,
"Invalid field mode combination %d/%d\n",
- last_pic_structure, s->picture_structure);
- s->picture_structure = last_pic_structure;
- s->droppable = last_pic_droppable;
+ last_pic_structure, h->picture_structure);
+ h->picture_structure = last_pic_structure;
+ h->droppable = last_pic_droppable;
return AVERROR_INVALIDDATA;
- } else if (last_pic_droppable != s->droppable) {
- av_log(s->avctx, AV_LOG_ERROR,
+ } else if (last_pic_droppable != h->droppable) {
+ av_log(h->avctx, AV_LOG_ERROR,
"Cannot combine reference and non-reference fields in the same frame\n");
- av_log_ask_for_sample(s->avctx, NULL);
- s->picture_structure = last_pic_structure;
- s->droppable = last_pic_droppable;
+ av_log_ask_for_sample(h->avctx, NULL);
+ h->picture_structure = last_pic_structure;
+ h->droppable = last_pic_droppable;
return AVERROR_PATCHWELCOME;
}
@@ -2924,7 +3258,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
* on that first field (or if that was us, we just did that above).
* By taking ownership, we assign responsibility to ourselves to
* report progress on the second field. */
- s0->current_picture_ptr->owner2 = s0;
+ h0->cur_pic_ptr->owner2 = h0;
}
}
}
@@ -2932,20 +3266,20 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
while (h->frame_num != h->prev_frame_num &&
h->frame_num != (h->prev_frame_num + 1) % (1 << h->sps.log2_max_frame_num)) {
Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL;
- av_log(h->s.avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n",
+ av_log(h->avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n",
h->frame_num, h->prev_frame_num);
if (ff_h264_frame_start(h) < 0)
return -1;
h->prev_frame_num++;
h->prev_frame_num %= 1 << h->sps.log2_max_frame_num;
- s->current_picture_ptr->frame_num = h->prev_frame_num;
- ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX, 0);
- ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX, 1);
+ h->cur_pic_ptr->frame_num = h->prev_frame_num;
+ ff_thread_report_progress(&h->cur_pic_ptr->f, INT_MAX, 0);
+ ff_thread_report_progress(&h->cur_pic_ptr->f, INT_MAX, 1);
if ((ret = ff_generate_sliding_window_mmcos(h, 1)) < 0 &&
- s->avctx->err_recognition & AV_EF_EXPLODE)
+ h->avctx->err_recognition & AV_EF_EXPLODE)
return ret;
if (ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index) < 0 &&
- (s->avctx->err_recognition & AV_EF_EXPLODE))
+ (h->avctx->err_recognition & AV_EF_EXPLODE))
return AVERROR_INVALIDDATA;
/* Error concealment: if a ref is missing, copy the previous ref in its place.
* FIXME: avoiding a memcpy would be nice, but ref handling makes many assumptions
@@ -2957,7 +3291,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
if (prev) {
av_image_copy(h->short_ref[0]->f.data, h->short_ref[0]->f.linesize,
(const uint8_t **)prev->f.data, prev->f.linesize,
- s->avctx->pix_fmt, s->mb_width * 16, s->mb_height * 16);
+ h->avctx->pix_fmt, h->mb_width * 16, h->mb_height * 16);
h->short_ref[0]->poc = prev->poc + 2;
}
h->short_ref[0]->frame_num = h->prev_frame_num;
@@ -2967,61 +3301,61 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
/* See if we have a decoded first field looking for a pair...
* We're using that to see whether to continue decoding in that
* frame, or to allocate a new one. */
- if (s0->first_field) {
- assert(s0->current_picture_ptr);
- assert(s0->current_picture_ptr->f.data[0]);
- assert(s0->current_picture_ptr->f.reference != DELAYED_PIC_REF);
+ if (h0->first_field) {
+ assert(h0->cur_pic_ptr);
+ assert(h0->cur_pic_ptr->f.data[0]);
+ assert(h0->cur_pic_ptr->f.reference != DELAYED_PIC_REF);
/* figure out if we have a complementary field pair */
- if (!FIELD_PICTURE || s->picture_structure == last_pic_structure) {
+ if (!FIELD_PICTURE || h->picture_structure == last_pic_structure) {
/* Previous field is unmatched. Don't display it, but let it
* remain for reference if marked as such. */
- s0->current_picture_ptr = NULL;
- s0->first_field = FIELD_PICTURE;
+ h0->cur_pic_ptr = NULL;
+ h0->first_field = FIELD_PICTURE;
} else {
- if (s0->current_picture_ptr->frame_num != h->frame_num) {
+ if (h0->cur_pic_ptr->frame_num != h->frame_num) {
/* This and the previous field had different frame_nums.
* Consider this field first in pair. Throw away previous
* one except for reference purposes. */
- s0->first_field = 1;
- s0->current_picture_ptr = NULL;
+ h0->first_field = 1;
+ h0->cur_pic_ptr = NULL;
} else {
/* Second field in complementary pair */
- s0->first_field = 0;
+ h0->first_field = 0;
}
}
} else {
/* Frame or first field in a potentially complementary pair */
- s0->first_field = FIELD_PICTURE;
+ h0->first_field = FIELD_PICTURE;
}
- if (!FIELD_PICTURE || s0->first_field) {
+ if (!FIELD_PICTURE || h0->first_field) {
if (ff_h264_frame_start(h) < 0) {
- s0->first_field = 0;
+ h0->first_field = 0;
return -1;
}
} else {
- ff_release_unused_pictures(s, 0);
+ release_unused_pictures(h, 0);
}
}
if (h != h0 && (ret = clone_slice(h, h0)) < 0)
return ret;
- s->current_picture_ptr->frame_num = h->frame_num; // FIXME frame_num cleanup
+ h->cur_pic_ptr->frame_num = h->frame_num; // FIXME frame_num cleanup
- assert(s->mb_num == s->mb_width * s->mb_height);
- if (first_mb_in_slice << FIELD_OR_MBAFF_PICTURE >= s->mb_num ||
- first_mb_in_slice >= s->mb_num) {
- av_log(h->s.avctx, AV_LOG_ERROR, "first_mb_in_slice overflow\n");
+ assert(h->mb_num == h->mb_width * h->mb_height);
+ if (first_mb_in_slice << FIELD_OR_MBAFF_PICTURE >= h->mb_num ||
+ first_mb_in_slice >= h->mb_num) {
+ av_log(h->avctx, AV_LOG_ERROR, "first_mb_in_slice overflow\n");
return -1;
}
- s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width;
- s->resync_mb_y = s->mb_y = (first_mb_in_slice / s->mb_width) << FIELD_OR_MBAFF_PICTURE;
- if (s->picture_structure == PICT_BOTTOM_FIELD)
- s->resync_mb_y = s->mb_y = s->mb_y + 1;
- assert(s->mb_y < s->mb_height);
+ h->resync_mb_x = h->mb_x = first_mb_in_slice % h->mb_width;
+ h->resync_mb_y = h->mb_y = (first_mb_in_slice / h->mb_width) << FIELD_OR_MBAFF_PICTURE;
+ if (h->picture_structure == PICT_BOTTOM_FIELD)
+ h->resync_mb_y = h->mb_y = h->mb_y + 1;
+ assert(h->mb_y < h->mb_height);
- if (s->picture_structure == PICT_FRAME) {
+ if (h->picture_structure == PICT_FRAME) {
h->curr_pic_num = h->frame_num;
h->max_pic_num = 1 << h->sps.log2_max_frame_num;
} else {
@@ -3030,26 +3364,26 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
}
if (h->nal_unit_type == NAL_IDR_SLICE)
- get_ue_golomb(&s->gb); /* idr_pic_id */
+ get_ue_golomb(&h->gb); /* idr_pic_id */
if (h->sps.poc_type == 0) {
- h->poc_lsb = get_bits(&s->gb, h->sps.log2_max_poc_lsb);
+ h->poc_lsb = get_bits(&h->gb, h->sps.log2_max_poc_lsb);
- if (h->pps.pic_order_present == 1 && s->picture_structure == PICT_FRAME)
- h->delta_poc_bottom = get_se_golomb(&s->gb);
+ if (h->pps.pic_order_present == 1 && h->picture_structure == PICT_FRAME)
+ h->delta_poc_bottom = get_se_golomb(&h->gb);
}
if (h->sps.poc_type == 1 && !h->sps.delta_pic_order_always_zero_flag) {
- h->delta_poc[0] = get_se_golomb(&s->gb);
+ h->delta_poc[0] = get_se_golomb(&h->gb);
- if (h->pps.pic_order_present == 1 && s->picture_structure == PICT_FRAME)
- h->delta_poc[1] = get_se_golomb(&s->gb);
+ if (h->pps.pic_order_present == 1 && h->picture_structure == PICT_FRAME)
+ h->delta_poc[1] = get_se_golomb(&h->gb);
}
init_poc(h);
if (h->pps.redundant_pic_cnt_present)
- h->redundant_pic_count = get_ue_golomb(&s->gb);
+ h->redundant_pic_count = get_ue_golomb(&h->gb);
// set defaults, might be overridden a few lines later
h->ref_count[0] = h->pps.ref_count[0];
@@ -3057,15 +3391,15 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
if (h->slice_type_nos != AV_PICTURE_TYPE_I) {
if (h->slice_type_nos == AV_PICTURE_TYPE_B)
- h->direct_spatial_mv_pred = get_bits1(&s->gb);
- num_ref_idx_active_override_flag = get_bits1(&s->gb);
+ h->direct_spatial_mv_pred = get_bits1(&h->gb);
+ num_ref_idx_active_override_flag = get_bits1(&h->gb);
if (num_ref_idx_active_override_flag) {
- h->ref_count[0] = get_ue_golomb(&s->gb) + 1;
+ h->ref_count[0] = get_ue_golomb(&h->gb) + 1;
if (h->ref_count[0] < 1)
return AVERROR_INVALIDDATA;
if (h->slice_type_nos == AV_PICTURE_TYPE_B) {
- h->ref_count[1] = get_ue_golomb(&s->gb) + 1;
+ h->ref_count[1] = get_ue_golomb(&h->gb) + 1;
if (h->ref_count[1] < 1)
return AVERROR_INVALIDDATA;
}
@@ -3078,10 +3412,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
} else
h->list_count = 0;
- max_refs = s->picture_structure == PICT_FRAME ? 16 : 32;
+ max_refs = h->picture_structure == PICT_FRAME ? 16 : 32;
if (h->ref_count[0] > max_refs || h->ref_count[1] > max_refs) {
- av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n");
+ av_log(h->avctx, AV_LOG_ERROR, "reference overflow\n");
h->ref_count[0] = h->ref_count[1] = 1;
return AVERROR_INVALIDDATA;
}
@@ -3095,19 +3429,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
return -1;
}
- if (h->slice_type_nos != AV_PICTURE_TYPE_I) {
- s->last_picture_ptr = &h->ref_list[0][0];
- s->last_picture_ptr->owner2 = s;
- s->er.last_pic = s->last_picture_ptr;
- ff_copy_picture(&s->last_picture, s->last_picture_ptr);
- }
- if (h->slice_type_nos == AV_PICTURE_TYPE_B) {
- s->next_picture_ptr = &h->ref_list[1][0];
- s->next_picture_ptr->owner2 = s;
- s->er.next_pic = s->next_picture_ptr;
- ff_copy_picture(&s->next_picture, s->next_picture_ptr);
- }
-
if ((h->pps.weighted_pred && h->slice_type_nos == AV_PICTURE_TYPE_P) ||
(h->pps.weighted_bipred_idc == 1 &&
h->slice_type_nos == AV_PICTURE_TYPE_B))
@@ -3129,10 +3450,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
// further down the line. This may break decoding if the first slice is
// corrupt, thus we only do this if frame-mt is enabled.
if (h->nal_ref_idc &&
- ff_h264_decode_ref_pic_marking(h0, &s->gb,
- !(s->avctx->active_thread_type & FF_THREAD_FRAME) ||
+ ff_h264_decode_ref_pic_marking(h0, &h->gb,
+ !(h->avctx->active_thread_type & FF_THREAD_FRAME) ||
h0->current_slice == 0) < 0 &&
- (s->avctx->err_recognition & AV_EF_EXPLODE))
+ (h->avctx->err_recognition & AV_EF_EXPLODE))
return AVERROR_INVALIDDATA;
if (FRAME_MBAFF) {
@@ -3149,37 +3470,37 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
ff_h264_direct_ref_list_init(h);
if (h->slice_type_nos != AV_PICTURE_TYPE_I && h->pps.cabac) {
- tmp = get_ue_golomb_31(&s->gb);
+ tmp = get_ue_golomb_31(&h->gb);
if (tmp > 2) {
- av_log(s->avctx, AV_LOG_ERROR, "cabac_init_idc overflow\n");
+ av_log(h->avctx, AV_LOG_ERROR, "cabac_init_idc overflow\n");
return -1;
}
h->cabac_init_idc = tmp;
}
h->last_qscale_diff = 0;
- tmp = h->pps.init_qp + get_se_golomb(&s->gb);
+ tmp = h->pps.init_qp + get_se_golomb(&h->gb);
if (tmp > 51 + 6 * (h->sps.bit_depth_luma - 8)) {
- av_log(s->avctx, AV_LOG_ERROR, "QP %u out of range\n", tmp);
+ av_log(h->avctx, AV_LOG_ERROR, "QP %u out of range\n", tmp);
return -1;
}
- s->qscale = tmp;
- h->chroma_qp[0] = get_chroma_qp(h, 0, s->qscale);
- h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale);
+ h->qscale = tmp;
+ h->chroma_qp[0] = get_chroma_qp(h, 0, h->qscale);
+ h->chroma_qp[1] = get_chroma_qp(h, 1, h->qscale);
// FIXME qscale / qp ... stuff
if (h->slice_type == AV_PICTURE_TYPE_SP)
- get_bits1(&s->gb); /* sp_for_switch_flag */
+ get_bits1(&h->gb); /* sp_for_switch_flag */
if (h->slice_type == AV_PICTURE_TYPE_SP ||
h->slice_type == AV_PICTURE_TYPE_SI)
- get_se_golomb(&s->gb); /* slice_qs_delta */
+ get_se_golomb(&h->gb); /* slice_qs_delta */
h->deblocking_filter = 1;
h->slice_alpha_c0_offset = 52;
h->slice_beta_offset = 52;
if (h->pps.deblocking_filter_parameters_present) {
- tmp = get_ue_golomb_31(&s->gb);
+ tmp = get_ue_golomb_31(&h->gb);
if (tmp > 2) {
- av_log(s->avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"deblocking_filter_idc %u out of range\n", tmp);
return -1;
}
@@ -3188,11 +3509,11 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
h->deblocking_filter ^= 1; // 1<->0
if (h->deblocking_filter) {
- h->slice_alpha_c0_offset += get_se_golomb(&s->gb) << 1;
- h->slice_beta_offset += get_se_golomb(&s->gb) << 1;
+ h->slice_alpha_c0_offset += get_se_golomb(&h->gb) << 1;
+ h->slice_beta_offset += get_se_golomb(&h->gb) << 1;
if (h->slice_alpha_c0_offset > 104U ||
h->slice_beta_offset > 104U) {
- av_log(s->avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"deblocking filter parameters %d %d out of range\n",
h->slice_alpha_c0_offset, h->slice_beta_offset);
return -1;
@@ -3200,29 +3521,29 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
}
}
- if (s->avctx->skip_loop_filter >= AVDISCARD_ALL ||
- (s->avctx->skip_loop_filter >= AVDISCARD_NONKEY &&
+ if (h->avctx->skip_loop_filter >= AVDISCARD_ALL ||
+ (h->avctx->skip_loop_filter >= AVDISCARD_NONKEY &&
h->slice_type_nos != AV_PICTURE_TYPE_I) ||
- (s->avctx->skip_loop_filter >= AVDISCARD_BIDIR &&
+ (h->avctx->skip_loop_filter >= AVDISCARD_BIDIR &&
h->slice_type_nos == AV_PICTURE_TYPE_B) ||
- (s->avctx->skip_loop_filter >= AVDISCARD_NONREF &&
+ (h->avctx->skip_loop_filter >= AVDISCARD_NONREF &&
h->nal_ref_idc == 0))
h->deblocking_filter = 0;
if (h->deblocking_filter == 1 && h0->max_contexts > 1) {
- if (s->avctx->flags2 & CODEC_FLAG2_FAST) {
+ if (h->avctx->flags2 & CODEC_FLAG2_FAST) {
/* Cheat slightly for speed:
* Do not bother to deblock across slices. */
h->deblocking_filter = 2;
} else {
h0->max_contexts = 1;
if (!h0->single_decode_warning) {
- av_log(s->avctx, AV_LOG_INFO,
+ av_log(h->avctx, AV_LOG_INFO,
"Cannot parallelize deblocking type 1, decoding such frames in sequential order\n");
h0->single_decode_warning = 1;
}
if (h != h0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"Deblocking switched inside frame.\n");
return 1;
}
@@ -3238,7 +3559,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
h0->last_slice_type = slice_type;
h->slice_num = ++h0->current_slice;
if (h->slice_num >= MAX_SLICES) {
- av_log(s->avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"Too many slices, increase MAX_SLICES and recompile\n");
}
@@ -3276,26 +3597,26 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
}
// FIXME: fix draw_edges + PAFF + frame threads
- h->emu_edge_width = (s->flags & CODEC_FLAG_EMU_EDGE ||
+ h->emu_edge_width = (h->flags & CODEC_FLAG_EMU_EDGE ||
(!h->sps.frame_mbs_only_flag &&
- s->avctx->active_thread_type))
+ h->avctx->active_thread_type))
? 0 : 16;
h->emu_edge_height = (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width;
- if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
- av_log(h->s.avctx, AV_LOG_DEBUG,
+ if (h->avctx->debug & FF_DEBUG_PICT_INFO) {
+ av_log(h->avctx, AV_LOG_DEBUG,
"slice:%d %s mb:%d %c%s%s pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n",
h->slice_num,
- (s->picture_structure == PICT_FRAME ? "F" : s->picture_structure == PICT_TOP_FIELD ? "T" : "B"),
+ (h->picture_structure == PICT_FRAME ? "F" : h->picture_structure == PICT_TOP_FIELD ? "T" : "B"),
first_mb_in_slice,
av_get_picture_type_char(h->slice_type),
h->slice_type_fixed ? " fix" : "",
h->nal_unit_type == NAL_IDR_SLICE ? " IDR" : "",
pps_id, h->frame_num,
- s->current_picture_ptr->field_poc[0],
- s->current_picture_ptr->field_poc[1],
+ h->cur_pic_ptr->field_poc[0],
+ h->cur_pic_ptr->field_poc[1],
h->ref_count[0], h->ref_count[1],
- s->qscale,
+ h->qscale,
h->deblocking_filter,
h->slice_alpha_c0_offset / 2 - 26, h->slice_beta_offset / 2 - 26,
h->use_weight,
@@ -3325,7 +3646,6 @@ int ff_h264_get_slice_type(const H264Context *h)
}
static av_always_inline void fill_filter_caches_inter(H264Context *h,
- MpegEncContext *const s,
int mb_type, int top_xy,
int left_xy[LEFT_MBS],
int top_type,
@@ -3340,11 +3660,11 @@ static av_always_inline void fill_filter_caches_inter(H264Context *h,
const int b_xy = h->mb2b_xy[top_xy] + 3 * b_stride;
const int b8_xy = 4 * top_xy + 2;
int (*ref2frm)[64] = h->ref2frm[h->slice_table[top_xy] & (MAX_SLICES - 1)][0] + (MB_MBAFF ? 20 : 2);
- AV_COPY128(mv_dst - 1 * 8, s->current_picture.f.motion_val[list][b_xy + 0]);
+ AV_COPY128(mv_dst - 1 * 8, h->cur_pic.f.motion_val[list][b_xy + 0]);
ref_cache[0 - 1 * 8] =
- ref_cache[1 - 1 * 8] = ref2frm[list][s->current_picture.f.ref_index[list][b8_xy + 0]];
+ ref_cache[1 - 1 * 8] = ref2frm[list][h->cur_pic.f.ref_index[list][b8_xy + 0]];
ref_cache[2 - 1 * 8] =
- ref_cache[3 - 1 * 8] = ref2frm[list][s->current_picture.f.ref_index[list][b8_xy + 1]];
+ ref_cache[3 - 1 * 8] = ref2frm[list][h->cur_pic.f.ref_index[list][b8_xy + 1]];
} else {
AV_ZERO128(mv_dst - 1 * 8);
AV_WN32A(&ref_cache[0 - 1 * 8], ((LIST_NOT_USED) & 0xFF) * 0x01010101u);
@@ -3355,14 +3675,14 @@ static av_always_inline void fill_filter_caches_inter(H264Context *h,
const int b_xy = h->mb2b_xy[left_xy[LTOP]] + 3;
const int b8_xy = 4 * left_xy[LTOP] + 1;
int (*ref2frm)[64] = h->ref2frm[h->slice_table[left_xy[LTOP]] & (MAX_SLICES - 1)][0] + (MB_MBAFF ? 20 : 2);
- AV_COPY32(mv_dst - 1 + 0, s->current_picture.f.motion_val[list][b_xy + b_stride * 0]);
- AV_COPY32(mv_dst - 1 + 8, s->current_picture.f.motion_val[list][b_xy + b_stride * 1]);
- AV_COPY32(mv_dst - 1 + 16, s->current_picture.f.motion_val[list][b_xy + b_stride * 2]);
- AV_COPY32(mv_dst - 1 + 24, s->current_picture.f.motion_val[list][b_xy + b_stride * 3]);
+ AV_COPY32(mv_dst - 1 + 0, h->cur_pic.f.motion_val[list][b_xy + b_stride * 0]);
+ AV_COPY32(mv_dst - 1 + 8, h->cur_pic.f.motion_val[list][b_xy + b_stride * 1]);
+ AV_COPY32(mv_dst - 1 + 16, h->cur_pic.f.motion_val[list][b_xy + b_stride * 2]);
+ AV_COPY32(mv_dst - 1 + 24, h->cur_pic.f.motion_val[list][b_xy + b_stride * 3]);
ref_cache[-1 + 0] =
- ref_cache[-1 + 8] = ref2frm[list][s->current_picture.f.ref_index[list][b8_xy + 2 * 0]];
+ ref_cache[-1 + 8] = ref2frm[list][h->cur_pic.f.ref_index[list][b8_xy + 2 * 0]];
ref_cache[-1 + 16] =
- ref_cache[-1 + 24] = ref2frm[list][s->current_picture.f.ref_index[list][b8_xy + 2 * 1]];
+ ref_cache[-1 + 24] = ref2frm[list][h->cur_pic.f.ref_index[list][b8_xy + 2 * 1]];
} else {
AV_ZERO32(mv_dst - 1 + 0);
AV_ZERO32(mv_dst - 1 + 8);
@@ -3386,7 +3706,7 @@ static av_always_inline void fill_filter_caches_inter(H264Context *h,
}
{
- int8_t *ref = &s->current_picture.f.ref_index[list][4 * mb_xy];
+ int8_t *ref = &h->cur_pic.f.ref_index[list][4 * mb_xy];
int (*ref2frm)[64] = h->ref2frm[h->slice_num & (MAX_SLICES - 1)][0] + (MB_MBAFF ? 20 : 2);
uint32_t ref01 = (pack16to32(ref2frm[list][ref[0]], ref2frm[list][ref[1]]) & 0x00FF00FF) * 0x0101;
uint32_t ref23 = (pack16to32(ref2frm[list][ref[2]], ref2frm[list][ref[3]]) & 0x00FF00FF) * 0x0101;
@@ -3397,7 +3717,7 @@ static av_always_inline void fill_filter_caches_inter(H264Context *h,
}
{
- int16_t(*mv_src)[2] = &s->current_picture.f.motion_val[list][4 * s->mb_x + 4 * s->mb_y * b_stride];
+ int16_t(*mv_src)[2] = &h->cur_pic.f.motion_val[list][4 * h->mb_x + 4 * h->mb_y * b_stride];
AV_COPY128(mv_dst + 8 * 0, mv_src + 0 * b_stride);
AV_COPY128(mv_dst + 8 * 1, mv_src + 1 * b_stride);
AV_COPY128(mv_dst + 8 * 2, mv_src + 2 * b_stride);
@@ -3411,31 +3731,30 @@ static av_always_inline void fill_filter_caches_inter(H264Context *h,
*/
static int fill_filter_caches(H264Context *h, int mb_type)
{
- MpegEncContext *const s = &h->s;
const int mb_xy = h->mb_xy;
int top_xy, left_xy[LEFT_MBS];
int top_type, left_type[LEFT_MBS];
uint8_t *nnz;
uint8_t *nnz_cache;
- top_xy = mb_xy - (s->mb_stride << MB_FIELD);
+ top_xy = mb_xy - (h->mb_stride << MB_FIELD);
/* Wow, what a mess, why didn't they simplify the interlacing & intra
* stuff, I can't imagine that these complex rules are worth it. */
left_xy[LBOT] = left_xy[LTOP] = mb_xy - 1;
if (FRAME_MBAFF) {
- const int left_mb_field_flag = IS_INTERLACED(s->current_picture.f.mb_type[mb_xy - 1]);
+ const int left_mb_field_flag = IS_INTERLACED(h->cur_pic.f.mb_type[mb_xy - 1]);
const int curr_mb_field_flag = IS_INTERLACED(mb_type);
- if (s->mb_y & 1) {
+ if (h->mb_y & 1) {
if (left_mb_field_flag != curr_mb_field_flag)
- left_xy[LTOP] -= s->mb_stride;
+ left_xy[LTOP] -= h->mb_stride;
} else {
if (curr_mb_field_flag)
- top_xy += s->mb_stride &
- (((s->current_picture.f.mb_type[top_xy] >> 7) & 1) - 1);
+ top_xy += h->mb_stride &
+ (((h->cur_pic.f.mb_type[top_xy] >> 7) & 1) - 1);
if (left_mb_field_flag != curr_mb_field_flag)
- left_xy[LBOT] += s->mb_stride;
+ left_xy[LBOT] += h->mb_stride;
}
}
@@ -3447,25 +3766,25 @@ static int fill_filter_caches(H264Context *h, int mb_type)
* This is a conservative estimate: could also check beta_offset
* and more accurate chroma_qp. */
int qp_thresh = h->qp_thresh; // FIXME strictly we should store qp_thresh for each mb of a slice
- int qp = s->current_picture.f.qscale_table[mb_xy];
+ int qp = h->cur_pic.f.qscale_table[mb_xy];
if (qp <= qp_thresh &&
(left_xy[LTOP] < 0 ||
- ((qp + s->current_picture.f.qscale_table[left_xy[LTOP]] + 1) >> 1) <= qp_thresh) &&
+ ((qp + h->cur_pic.f.qscale_table[left_xy[LTOP]] + 1) >> 1) <= qp_thresh) &&
(top_xy < 0 ||
- ((qp + s->current_picture.f.qscale_table[top_xy] + 1) >> 1) <= qp_thresh)) {
+ ((qp + h->cur_pic.f.qscale_table[top_xy] + 1) >> 1) <= qp_thresh)) {
if (!FRAME_MBAFF)
return 1;
if ((left_xy[LTOP] < 0 ||
- ((qp + s->current_picture.f.qscale_table[left_xy[LBOT]] + 1) >> 1) <= qp_thresh) &&
- (top_xy < s->mb_stride ||
- ((qp + s->current_picture.f.qscale_table[top_xy - s->mb_stride] + 1) >> 1) <= qp_thresh))
+ ((qp + h->cur_pic.f.qscale_table[left_xy[LBOT]] + 1) >> 1) <= qp_thresh) &&
+ (top_xy < h->mb_stride ||
+ ((qp + h->cur_pic.f.qscale_table[top_xy - h->mb_stride] + 1) >> 1) <= qp_thresh))
return 1;
}
}
- top_type = s->current_picture.f.mb_type[top_xy];
- left_type[LTOP] = s->current_picture.f.mb_type[left_xy[LTOP]];
- left_type[LBOT] = s->current_picture.f.mb_type[left_xy[LBOT]];
+ top_type = h->cur_pic.f.mb_type[top_xy];
+ left_type[LTOP] = h->cur_pic.f.mb_type[left_xy[LTOP]];
+ left_type[LBOT] = h->cur_pic.f.mb_type[left_xy[LBOT]];
if (h->deblocking_filter == 2) {
if (h->slice_table[top_xy] != h->slice_num)
top_type = 0;
@@ -3484,10 +3803,10 @@ static int fill_filter_caches(H264Context *h, int mb_type)
if (IS_INTRA(mb_type))
return 0;
- fill_filter_caches_inter(h, s, mb_type, top_xy, left_xy,
+ fill_filter_caches_inter(h, mb_type, top_xy, left_xy,
top_type, left_type, mb_xy, 0);
if (h->list_count == 2)
- fill_filter_caches_inter(h, s, mb_type, top_xy, left_xy,
+ fill_filter_caches_inter(h, mb_type, top_xy, left_xy,
top_type, left_type, mb_xy, 1);
nnz = h->non_zero_count[mb_xy];
@@ -3557,57 +3876,56 @@ static int fill_filter_caches(H264Context *h, int mb_type)
static void loop_filter(H264Context *h, int start_x, int end_x)
{
- MpegEncContext *const s = &h->s;
uint8_t *dest_y, *dest_cb, *dest_cr;
int linesize, uvlinesize, mb_x, mb_y;
- const int end_mb_y = s->mb_y + FRAME_MBAFF;
+ const int end_mb_y = h->mb_y + FRAME_MBAFF;
const int old_slice_type = h->slice_type;
const int pixel_shift = h->pixel_shift;
- const int block_h = 16 >> s->chroma_y_shift;
+ const int block_h = 16 >> h->chroma_y_shift;
if (h->deblocking_filter) {
for (mb_x = start_x; mb_x < end_x; mb_x++)
for (mb_y = end_mb_y - FRAME_MBAFF; mb_y <= end_mb_y; mb_y++) {
int mb_xy, mb_type;
- mb_xy = h->mb_xy = mb_x + mb_y * s->mb_stride;
+ mb_xy = h->mb_xy = mb_x + mb_y * h->mb_stride;
h->slice_num = h->slice_table[mb_xy];
- mb_type = s->current_picture.f.mb_type[mb_xy];
+ mb_type = h->cur_pic.f.mb_type[mb_xy];
h->list_count = h->list_counts[mb_xy];
if (FRAME_MBAFF)
h->mb_mbaff =
h->mb_field_decoding_flag = !!IS_INTERLACED(mb_type);
- s->mb_x = mb_x;
- s->mb_y = mb_y;
- dest_y = s->current_picture.f.data[0] +
- ((mb_x << pixel_shift) + mb_y * s->linesize) * 16;
- dest_cb = s->current_picture.f.data[1] +
+ h->mb_x = mb_x;
+ h->mb_y = mb_y;
+ dest_y = h->cur_pic.f.data[0] +
+ ((mb_x << pixel_shift) + mb_y * h->linesize) * 16;
+ dest_cb = h->cur_pic.f.data[1] +
(mb_x << pixel_shift) * (8 << CHROMA444) +
- mb_y * s->uvlinesize * block_h;
- dest_cr = s->current_picture.f.data[2] +
+ mb_y * h->uvlinesize * block_h;
+ dest_cr = h->cur_pic.f.data[2] +
(mb_x << pixel_shift) * (8 << CHROMA444) +
- mb_y * s->uvlinesize * block_h;
+ mb_y * h->uvlinesize * block_h;
// FIXME simplify above
if (MB_FIELD) {
- linesize = h->mb_linesize = s->linesize * 2;
- uvlinesize = h->mb_uvlinesize = s->uvlinesize * 2;
+ linesize = h->mb_linesize = h->linesize * 2;
+ uvlinesize = h->mb_uvlinesize = h->uvlinesize * 2;
if (mb_y & 1) { // FIXME move out of this function?
- dest_y -= s->linesize * 15;
- dest_cb -= s->uvlinesize * (block_h - 1);
- dest_cr -= s->uvlinesize * (block_h - 1);
+ dest_y -= h->linesize * 15;
+ dest_cb -= h->uvlinesize * (block_h - 1);
+ dest_cr -= h->uvlinesize * (block_h - 1);
}
} else {
- linesize = h->mb_linesize = s->linesize;
- uvlinesize = h->mb_uvlinesize = s->uvlinesize;
+ linesize = h->mb_linesize = h->linesize;
+ uvlinesize = h->mb_uvlinesize = h->uvlinesize;
}
backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize,
uvlinesize, 0);
if (fill_filter_caches(h, mb_type))
continue;
- h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.f.qscale_table[mb_xy]);
- h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.f.qscale_table[mb_xy]);
+ h->chroma_qp[0] = get_chroma_qp(h, 0, h->cur_pic.f.qscale_table[mb_xy]);
+ h->chroma_qp[1] = get_chroma_qp(h, 1, h->cur_pic.f.qscale_table[mb_xy]);
if (FRAME_MBAFF) {
ff_h264_filter_mb(h, mb_x, mb_y, dest_y, dest_cb, dest_cr,
@@ -3619,20 +3937,19 @@ static void loop_filter(H264Context *h, int start_x, int end_x)
}
}
h->slice_type = old_slice_type;
- s->mb_x = end_x;
- s->mb_y = end_mb_y - FRAME_MBAFF;
- h->chroma_qp[0] = get_chroma_qp(h, 0, s->qscale);
- h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale);
+ h->mb_x = end_x;
+ h->mb_y = end_mb_y - FRAME_MBAFF;
+ h->chroma_qp[0] = get_chroma_qp(h, 0, h->qscale);
+ h->chroma_qp[1] = get_chroma_qp(h, 1, h->qscale);
}
static void predict_field_decoding_flag(H264Context *h)
{
- MpegEncContext *const s = &h->s;
- const int mb_xy = s->mb_x + s->mb_y * s->mb_stride;
+ const int mb_xy = h->mb_x + h->mb_y * h->mb_stride;
int mb_type = (h->slice_table[mb_xy - 1] == h->slice_num) ?
- s->current_picture.f.mb_type[mb_xy - 1] :
- (h->slice_table[mb_xy - s->mb_stride] == h->slice_num) ?
- s->current_picture.f.mb_type[mb_xy - s->mb_stride] : 0;
+ h->cur_pic.f.mb_type[mb_xy - 1] :
+ (h->slice_table[mb_xy - h->mb_stride] == h->slice_num) ?
+ h->cur_pic.f.mb_type[mb_xy - h->mb_stride] : 0;
h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0;
}
@@ -3641,9 +3958,8 @@ static void predict_field_decoding_flag(H264Context *h)
*/
static void decode_finish_row(H264Context *h)
{
- MpegEncContext *const s = &h->s;
- int top = 16 * (s->mb_y >> FIELD_PICTURE);
- int pic_height = 16 * s->mb_height >> FIELD_PICTURE;
+ int top = 16 * (h->mb_y >> FIELD_PICTURE);
+ int pic_height = 16 * h->mb_height >> FIELD_PICTURE;
int height = 16 << FRAME_MBAFF;
int deblock_border = (16 + 4) << FRAME_MBAFF;
@@ -3662,19 +3978,19 @@ static void decode_finish_row(H264Context *h)
top = 0;
}
- ff_mpeg_draw_horiz_band(s, top, height);
+ ff_h264_draw_horiz_band(h, top, height);
- if (s->droppable)
+ if (h->droppable)
return;
- ff_thread_report_progress(&s->current_picture_ptr->f, top + height - 1,
- s->picture_structure == PICT_BOTTOM_FIELD);
+ ff_thread_report_progress(&h->cur_pic_ptr->f, top + height - 1,
+ h->picture_structure == PICT_BOTTOM_FIELD);
}
static void er_add_slice(H264Context *h, int startx, int starty,
int endx, int endy, int status)
{
- ERContext *er = &h->s.er;
+ ERContext *er = &h->er;
er->ref_count = h->ref_count[0];
ff_er_add_slice(er, startx, starty, endx, endy, status);
@@ -3683,24 +3999,23 @@ static void er_add_slice(H264Context *h, int startx, int starty,
static int decode_slice(struct AVCodecContext *avctx, void *arg)
{
H264Context *h = *(void **)arg;
- MpegEncContext *const s = &h->s;
- int lf_x_start = s->mb_x;
+ int lf_x_start = h->mb_x;
- s->mb_skip_run = -1;
+ h->mb_skip_run = -1;
- h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME ||
- s->codec_id != AV_CODEC_ID_H264 ||
- (CONFIG_GRAY && (s->flags & CODEC_FLAG_GRAY));
+ h->is_complex = FRAME_MBAFF || h->picture_structure != PICT_FRAME ||
+ avctx->codec_id != AV_CODEC_ID_H264 ||
+ (CONFIG_GRAY && (h->flags & CODEC_FLAG_GRAY));
if (h->pps.cabac) {
/* realign */
- align_get_bits(&s->gb);
+ align_get_bits(&h->gb);
/* init cabac */
ff_init_cabac_states(&h->cabac);
ff_init_cabac_decoder(&h->cabac,
- s->gb.buffer + get_bits_count(&s->gb) / 8,
- (get_bits_left(&s->gb) + 7) / 8);
+ h->gb.buffer + get_bits_count(&h->gb) / 8,
+ (get_bits_left(&h->gb) + 7) / 8);
ff_h264_init_cabac_states(h);
@@ -3715,53 +4030,53 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg)
// FIXME optimal? or let mb_decode decode 16x32 ?
if (ret >= 0 && FRAME_MBAFF) {
- s->mb_y++;
+ h->mb_y++;
ret = ff_h264_decode_mb_cabac(h);
if (ret >= 0)
ff_h264_hl_decode_mb(h);
- s->mb_y--;
+ h->mb_y--;
}
eos = get_cabac_terminate(&h->cabac);
- if ((s->workaround_bugs & FF_BUG_TRUNCATED) &&
+ if ((h->workaround_bugs & FF_BUG_TRUNCATED) &&
h->cabac.bytestream > h->cabac.bytestream_end + 2) {
- er_add_slice(h, s->resync_mb_x, s->resync_mb_y, s->mb_x - 1,
- s->mb_y, ER_MB_END);
- if (s->mb_x >= lf_x_start)
- loop_filter(h, lf_x_start, s->mb_x + 1);
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x - 1,
+ h->mb_y, ER_MB_END);
+ if (h->mb_x >= lf_x_start)
+ loop_filter(h, lf_x_start, h->mb_x + 1);
return 0;
}
if (ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"error while decoding MB %d %d, bytestream (%td)\n",
- s->mb_x, s->mb_y,
+ h->mb_x, h->mb_y,
h->cabac.bytestream_end - h->cabac.bytestream);
- er_add_slice(h, s->resync_mb_x, s->resync_mb_y, s->mb_x,
- s->mb_y, ER_MB_ERROR);
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x,
+ h->mb_y, ER_MB_ERROR);
return -1;
}
- if (++s->mb_x >= s->mb_width) {
- loop_filter(h, lf_x_start, s->mb_x);
- s->mb_x = lf_x_start = 0;
+ if (++h->mb_x >= h->mb_width) {
+ loop_filter(h, lf_x_start, h->mb_x);
+ h->mb_x = lf_x_start = 0;
decode_finish_row(h);
- ++s->mb_y;
+ ++h->mb_y;
if (FIELD_OR_MBAFF_PICTURE) {
- ++s->mb_y;
- if (FRAME_MBAFF && s->mb_y < s->mb_height)
+ ++h->mb_y;
+ if (FRAME_MBAFF && h->mb_y < h->mb_height)
predict_field_decoding_flag(h);
}
}
- if (eos || s->mb_y >= s->mb_height) {
- tprintf(s->avctx, "slice end %d %d\n",
- get_bits_count(&s->gb), s->gb.size_in_bits);
- er_add_slice(h, s->resync_mb_x, s->resync_mb_y, s->mb_x - 1,
- s->mb_y, ER_MB_END);
- if (s->mb_x > lf_x_start)
- loop_filter(h, lf_x_start, s->mb_x);
+ if (eos || h->mb_y >= h->mb_height) {
+ tprintf(h->avctx, "slice end %d %d\n",
+ get_bits_count(&h->gb), h->gb.size_in_bits);
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x - 1,
+ h->mb_y, ER_MB_END);
+ if (h->mb_x > lf_x_start)
+ loop_filter(h, lf_x_start, h->mb_x);
return 0;
}
}
@@ -3774,45 +4089,45 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg)
// FIXME optimal? or let mb_decode decode 16x32 ?
if (ret >= 0 && FRAME_MBAFF) {
- s->mb_y++;
+ h->mb_y++;
ret = ff_h264_decode_mb_cavlc(h);
if (ret >= 0)
ff_h264_hl_decode_mb(h);
- s->mb_y--;
+ h->mb_y--;
}
if (ret < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
- "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
- er_add_slice(h, s->resync_mb_x, s->resync_mb_y, s->mb_x,
- s->mb_y, ER_MB_ERROR);
+ av_log(h->avctx, AV_LOG_ERROR,
+ "error while decoding MB %d %d\n", h->mb_x, h->mb_y);
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x,
+ h->mb_y, ER_MB_ERROR);
return -1;
}
- if (++s->mb_x >= s->mb_width) {
- loop_filter(h, lf_x_start, s->mb_x);
- s->mb_x = lf_x_start = 0;
+ if (++h->mb_x >= h->mb_width) {
+ loop_filter(h, lf_x_start, h->mb_x);
+ h->mb_x = lf_x_start = 0;
decode_finish_row(h);
- ++s->mb_y;
+ ++h->mb_y;
if (FIELD_OR_MBAFF_PICTURE) {
- ++s->mb_y;
- if (FRAME_MBAFF && s->mb_y < s->mb_height)
+ ++h->mb_y;
+ if (FRAME_MBAFF && h->mb_y < h->mb_height)
predict_field_decoding_flag(h);
}
- if (s->mb_y >= s->mb_height) {
- tprintf(s->avctx, "slice end %d %d\n",
- get_bits_count(&s->gb), s->gb.size_in_bits);
+ if (h->mb_y >= h->mb_height) {
+ tprintf(h->avctx, "slice end %d %d\n",
+ get_bits_count(&h->gb), h->gb.size_in_bits);
- if (get_bits_left(&s->gb) == 0) {
- er_add_slice(h, s->resync_mb_x, s->resync_mb_y,
- s->mb_x - 1, s->mb_y,
+ if (get_bits_left(&h->gb) == 0) {
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y,
+ h->mb_x - 1, h->mb_y,
ER_MB_END);
return 0;
} else {
- er_add_slice(h, s->resync_mb_x, s->resync_mb_y,
- s->mb_x - 1, s->mb_y,
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y,
+ h->mb_x - 1, h->mb_y,
ER_MB_END);
return -1;
@@ -3820,20 +4135,20 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg)
}
}
- if (get_bits_left(&s->gb) <= 0 && s->mb_skip_run <= 0) {
- tprintf(s->avctx, "slice end %d %d\n",
- get_bits_count(&s->gb), s->gb.size_in_bits);
- if (get_bits_left(&s->gb) == 0) {
- er_add_slice(h, s->resync_mb_x, s->resync_mb_y,
- s->mb_x - 1, s->mb_y,
+ if (get_bits_left(&h->gb) <= 0 && h->mb_skip_run <= 0) {
+ tprintf(h->avctx, "slice end %d %d\n",
+ get_bits_count(&h->gb), h->gb.size_in_bits);
+ if (get_bits_left(&h->gb) == 0) {
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y,
+ h->mb_x - 1, h->mb_y,
ER_MB_END);
- if (s->mb_x > lf_x_start)
- loop_filter(h, lf_x_start, s->mb_x);
+ if (h->mb_x > lf_x_start)
+ loop_filter(h, lf_x_start, h->mb_x);
return 0;
} else {
- er_add_slice(h, s->resync_mb_x, s->resync_mb_y, s->mb_x,
- s->mb_y, ER_MB_ERROR);
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x,
+ h->mb_y, ER_MB_ERROR);
return -1;
}
@@ -3850,21 +4165,19 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg)
*/
static int execute_decode_slices(H264Context *h, int context_count)
{
- MpegEncContext *const s = &h->s;
- AVCodecContext *const avctx = s->avctx;
+ AVCodecContext *const avctx = h->avctx;
H264Context *hx;
int i;
- if (s->avctx->hwaccel ||
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
+ if (h->avctx->hwaccel ||
+ h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
return 0;
if (context_count == 1) {
return decode_slice(avctx, &h);
} else {
for (i = 1; i < context_count; i++) {
hx = h->thread_context[i];
- hx->s.err_recognition = avctx->err_recognition;
- hx->s.er.error_count = 0;
+ hx->er.error_count = 0;
}
avctx->execute(avctx, decode_slice, h->thread_context,
@@ -3872,12 +4185,12 @@ static int execute_decode_slices(H264Context *h, int context_count)
/* pull back stuff from slices to master context */
hx = h->thread_context[context_count - 1];
- s->mb_x = hx->s.mb_x;
- s->mb_y = hx->s.mb_y;
- s->droppable = hx->s.droppable;
- s->picture_structure = hx->s.picture_structure;
+ h->mb_x = hx->mb_x;
+ h->mb_y = hx->mb_y;
+ h->droppable = hx->droppable;
+ h->picture_structure = hx->picture_structure;
for (i = 1; i < context_count; i++)
- h->s.er.error_count += h->thread_context[i]->s.er.error_count;
+ h->er.error_count += h->thread_context[i]->er.error_count;
}
return 0;
@@ -3886,8 +4199,7 @@ static int execute_decode_slices(H264Context *h, int context_count)
static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
int parse_extradata)
{
- MpegEncContext *const s = &h->s;
- AVCodecContext *const avctx = s->avctx;
+ AVCodecContext *const avctx = h->avctx;
H264Context *hx; ///< thread context
int buf_index;
int context_count;
@@ -3896,11 +4208,11 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
int nals_needed = 0; ///< number of NALs that need decoding before the next frame thread starts
int nal_index;
- h->max_contexts = s->slice_context_count;
- if (!(s->flags2 & CODEC_FLAG2_CHUNKS)) {
+ h->max_contexts = h->slice_context_count;
+ if (!(avctx->flags2 & CODEC_FLAG2_CHUNKS)) {
h->current_slice = 0;
- if (!s->first_field)
- s->current_picture_ptr = NULL;
+ if (!h->first_field)
+ h->cur_pic_ptr = NULL;
ff_h264_reset_sei(h);
}
@@ -3924,7 +4236,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
for (i = 0; i < h->nal_length_size; i++)
nalsize = (nalsize << 8) | buf[buf_index++];
if (nalsize <= 0 || nalsize > buf_size - buf_index) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"AVC: nal size %d\n", nalsize);
break;
}
@@ -3957,25 +4269,25 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
goto end;
}
i = buf_index + consumed;
- if ((s->workaround_bugs & FF_BUG_AUTODETECT) && i + 3 < next_avc &&
+ if ((h->workaround_bugs & FF_BUG_AUTODETECT) && i + 3 < next_avc &&
buf[i] == 0x00 && buf[i + 1] == 0x00 &&
buf[i + 2] == 0x01 && buf[i + 3] == 0xE0)
- s->workaround_bugs |= FF_BUG_TRUNCATED;
+ h->workaround_bugs |= FF_BUG_TRUNCATED;
- if (!(s->workaround_bugs & FF_BUG_TRUNCATED))
+ if (!(h->workaround_bugs & FF_BUG_TRUNCATED))
while (ptr[dst_length - 1] == 0 && dst_length > 0)
dst_length--;
bit_length = !dst_length ? 0
: (8 * dst_length -
decode_rbsp_trailing(h, ptr + dst_length - 1));
- if (s->avctx->debug & FF_DEBUG_STARTCODE)
- av_log(h->s.avctx, AV_LOG_DEBUG,
+ if (h->avctx->debug & FF_DEBUG_STARTCODE)
+ av_log(h->avctx, AV_LOG_DEBUG,
"NAL %d at %d/%d length %d\n",
hx->nal_unit_type, buf_index, buf_size, dst_length);
if (h->is_avc && (nalsize != consumed) && nalsize)
- av_log(h->s.avctx, AV_LOG_DEBUG,
+ av_log(h->avctx, AV_LOG_DEBUG,
"AVC: Consumed only %d bytes instead of %d\n",
consumed, nalsize);
@@ -3995,8 +4307,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
case NAL_DPA:
case NAL_IDR_SLICE:
case NAL_SLICE:
- init_get_bits(&hx->s.gb, ptr, bit_length);
- if (!get_ue_golomb(&hx->s.gb))
+ init_get_bits(&hx->gb, ptr, bit_length);
+ if (!get_ue_golomb(&hx->gb))
nals_needed = nal_index;
}
continue;
@@ -4011,7 +4323,7 @@ again:
* parsing. Decoding slices is not possible in codec init
* with frame-mt */
if (parse_extradata && HAVE_THREADS &&
- (s->avctx->active_thread_type & FF_THREAD_FRAME) &&
+ (h->avctx->active_thread_type & FF_THREAD_FRAME) &&
(hx->nal_unit_type != NAL_PPS &&
hx->nal_unit_type != NAL_SPS)) {
av_log(avctx, AV_LOG_INFO, "Ignoring NAL unit %d during "
@@ -4022,35 +4334,35 @@ again:
switch (hx->nal_unit_type) {
case NAL_IDR_SLICE:
if (h->nal_unit_type != NAL_IDR_SLICE) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"Invalid mix of idr and non-idr slices\n");
buf_index = -1;
goto end;
}
idr(h); // FIXME ensure we don't lose some frames if there is reordering
case NAL_SLICE:
- init_get_bits(&hx->s.gb, ptr, bit_length);
+ init_get_bits(&hx->gb, ptr, bit_length);
hx->intra_gb_ptr =
- hx->inter_gb_ptr = &hx->s.gb;
- hx->s.data_partitioning = 0;
+ hx->inter_gb_ptr = &hx->gb;
+ hx->data_partitioning = 0;
if ((err = decode_slice_header(hx, h)))
break;
- s->current_picture_ptr->f.key_frame |=
+ h->cur_pic_ptr->f.key_frame |=
(hx->nal_unit_type == NAL_IDR_SLICE) ||
(h->sei_recovery_frame_cnt >= 0);
if (h->current_slice == 1) {
- if (!(s->flags2 & CODEC_FLAG2_CHUNKS))
+ if (!(avctx->flags2 & CODEC_FLAG2_CHUNKS))
decode_postinit(h, nal_index >= nals_needed);
- if (s->avctx->hwaccel &&
- s->avctx->hwaccel->start_frame(s->avctx, NULL, 0) < 0)
+ if (h->avctx->hwaccel &&
+ h->avctx->hwaccel->start_frame(h->avctx, NULL, 0) < 0)
return -1;
if (CONFIG_H264_VDPAU_DECODER &&
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
- ff_vdpau_h264_picture_start(s);
+ h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
+ ff_vdpau_h264_picture_start(h);
}
if (hx->redundant_pic_count == 0 &&
@@ -4067,26 +4379,26 @@ again:
consumed) < 0)
return -1;
} else if (CONFIG_H264_VDPAU_DECODER &&
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) {
+ h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) {
static const uint8_t start_code[] = {
0x00, 0x00, 0x01 };
- ff_vdpau_add_data_chunk(s, start_code,
+ ff_vdpau_add_data_chunk(h->cur_pic_ptr->f.data[0], start_code,
sizeof(start_code));
- ff_vdpau_add_data_chunk(s, &buf[buf_index - consumed],
+ ff_vdpau_add_data_chunk(h->cur_pic_ptr->f.data[0], &buf[buf_index - consumed],
consumed);
} else
context_count++;
}
break;
case NAL_DPA:
- init_get_bits(&hx->s.gb, ptr, bit_length);
+ init_get_bits(&hx->gb, ptr, bit_length);
hx->intra_gb_ptr =
hx->inter_gb_ptr = NULL;
if ((err = decode_slice_header(hx, h)) < 0)
break;
- hx->s.data_partitioning = 1;
+ hx->data_partitioning = 1;
break;
case NAL_DPB:
init_get_bits(&hx->intra_gb, ptr, bit_length);
@@ -4098,9 +4410,8 @@ again:
if (hx->redundant_pic_count == 0 &&
hx->intra_gb_ptr &&
- hx->s.data_partitioning &&
- s->current_picture_ptr &&
- s->context_initialized &&
+ hx->data_partitioning &&
+ h->cur_pic_ptr && h->context_initialized &&
(avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc) &&
(avctx->skip_frame < AVDISCARD_BIDIR ||
hx->slice_type_nos != AV_PICTURE_TYPE_B) &&
@@ -4110,16 +4421,16 @@ again:
context_count++;
break;
case NAL_SEI:
- init_get_bits(&s->gb, ptr, bit_length);
+ init_get_bits(&h->gb, ptr, bit_length);
ff_h264_decode_sei(h);
break;
case NAL_SPS:
- init_get_bits(&s->gb, ptr, bit_length);
+ init_get_bits(&h->gb, ptr, bit_length);
if (ff_h264_decode_seq_parameter_set(h) < 0 &&
h->is_avc && (nalsize != consumed) && nalsize) {
- av_log(h->s.avctx, AV_LOG_DEBUG,
+ av_log(h->avctx, AV_LOG_DEBUG,
"SPS decoding failure, trying again with the complete NAL\n");
- init_get_bits(&s->gb, buf + buf_index + 1 - consumed,
+ init_get_bits(&h->gb, buf + buf_index + 1 - consumed,
8 * (nalsize - 1));
ff_h264_decode_seq_parameter_set(h);
}
@@ -4130,7 +4441,7 @@ again:
}
break;
case NAL_PPS:
- init_get_bits(&s->gb, ptr, bit_length);
+ init_get_bits(&h->gb, ptr, bit_length);
ff_h264_decode_picture_parameter_set(h, bit_length);
break;
case NAL_AUD:
@@ -4153,7 +4464,7 @@ again:
}
if (err < 0)
- av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n");
+ av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
else if (err == 1) {
/* Slice could not be decoded in parallel mode, copy down
* NAL unit stuff to context 0 and restart. Note that
@@ -4171,10 +4482,10 @@ again:
end:
/* clean up */
- if (s->current_picture_ptr && s->current_picture_ptr->owner2 == s &&
- !s->droppable) {
- ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX,
- s->picture_structure == PICT_BOTTOM_FIELD);
+ if (h->cur_pic_ptr && h->cur_pic_ptr->owner2 == h &&
+ !h->droppable) {
+ ff_thread_report_progress(&h->cur_pic_ptr->f, INT_MAX,
+ h->picture_structure == PICT_BOTTOM_FIELD);
}
return buf_index;
@@ -4183,7 +4494,7 @@ end:
/**
* Return the number of bytes consumed for building the current frame.
*/
-static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size)
+static int get_consumed_bytes(int pos, int buf_size)
{
if (pos == 0)
pos = 1; // avoid infinite loops (i doubt that is needed but ...)
@@ -4199,12 +4510,10 @@ static int decode_frame(AVCodecContext *avctx, void *data,
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
H264Context *h = avctx->priv_data;
- MpegEncContext *s = &h->s;
AVFrame *pict = data;
int buf_index = 0;
- s->flags = avctx->flags;
- s->flags2 = avctx->flags2;
+ h->flags = avctx->flags;
/* end of stream, output what is still in the buffers */
out:
@@ -4212,7 +4521,7 @@ out:
Picture *out;
int i, out_idx;
- s->current_picture_ptr = NULL;
+ h->cur_pic_ptr = NULL;
// FIXME factorize this with the output code below
out = h->delayed_pic[0];
@@ -4242,25 +4551,24 @@ out:
if (buf_index < 0)
return -1;
- if (!s->current_picture_ptr && h->nal_unit_type == NAL_END_SEQUENCE) {
+ if (!h->cur_pic_ptr && h->nal_unit_type == NAL_END_SEQUENCE) {
buf_size = 0;
goto out;
}
- if (!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr) {
+ if (!(avctx->flags2 & CODEC_FLAG2_CHUNKS) && !h->cur_pic_ptr) {
if (avctx->skip_frame >= AVDISCARD_NONREF)
return 0;
av_log(avctx, AV_LOG_ERROR, "no frame!\n");
return -1;
}
- if (!(s->flags2 & CODEC_FLAG2_CHUNKS) ||
- (s->mb_y >= s->mb_height && s->mb_height)) {
- if (s->flags2 & CODEC_FLAG2_CHUNKS)
+ if (!(avctx->flags2 & CODEC_FLAG2_CHUNKS) ||
+ (h->mb_y >= h->mb_height && h->mb_height)) {
+ if (avctx->flags2 & CODEC_FLAG2_CHUNKS)
decode_postinit(h, 1);
field_end(h, 0);
- h->context_reinitialized = 0;
if (!h->next_output_pic) {
/* Wait for second field. */
@@ -4272,9 +4580,8 @@ out:
}
assert(pict->data[0] || !*got_frame);
- ff_print_debug_info(s, pict);
- return get_consumed_bytes(s, buf_index, buf_size);
+ return get_consumed_bytes(buf_index, buf_size);
}
av_cold void ff_h264_free_context(H264Context *h)
@@ -4293,13 +4600,16 @@ av_cold void ff_h264_free_context(H264Context *h)
static av_cold int h264_decode_end(AVCodecContext *avctx)
{
H264Context *h = avctx->priv_data;
- MpegEncContext *s = &h->s;
+ int i;
ff_h264_free_context(h);
- ff_MPV_common_end(s);
-
- // memset(h, 0, sizeof(H264Context));
+ if (h->DPB && !h->avctx->internal->is_copy) {
+ for (i = 0; i < h->picture_count; i++) {
+ free_picture(h, &h->DPB[i]);
+ }
+ }
+ av_freep(&h->DPB);
return 0;
}
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index c4addbe..45c134e 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -30,6 +30,7 @@
#include "libavutil/intreadwrite.h"
#include "cabac.h"
+#include "get_bits.h"
#include "mpegvideo.h"
#include "h264chroma.h"
#include "h264dsp.h"
@@ -60,7 +61,7 @@
#define MB_MBAFF h->mb_mbaff
#define MB_FIELD h->mb_field_decoding_flag
#define FRAME_MBAFF h->mb_aff_frame
-#define FIELD_PICTURE (s->picture_structure != PICT_FRAME)
+#define FIELD_PICTURE (h->picture_structure != PICT_FRAME)
#define LEFT_MBS 2
#define LTOP 0
#define LBOT 1
@@ -250,15 +251,42 @@ typedef struct MMCO {
* H264Context
*/
typedef struct H264Context {
- MpegEncContext s;
+ AVCodecContext *avctx;
+ DSPContext dsp;
+ VideoDSPContext vdsp;
H264DSPContext h264dsp;
H264ChromaContext h264chroma;
H264QpelContext h264qpel;
+ MotionEstContext me;
+ ParseContext parse_context;
+ GetBitContext gb;
+ ERContext er;
+
+ Picture *DPB;
+ Picture *cur_pic_ptr;
+ Picture cur_pic;
+ int picture_count;
+ int picture_range_start, picture_range_end;
+
int pixel_shift; ///< 0 for 8-bit H264, 1 for high-bit-depth H264
int chroma_qp[2]; // QPc
int qp_thresh; ///< QP threshold to skip loopfilter
+ int width, height;
+ int linesize, uvlinesize;
+ int chroma_x_shift, chroma_y_shift;
+
+ int qscale;
+ int droppable;
+ int data_partitioning;
+ int coded_picture_number;
+ int low_delay;
+
+ int context_initialized;
+ int flags;
+ int workaround_bugs;
+
int prev_mb_skipped;
int next_mb_skipped;
@@ -348,6 +376,8 @@ typedef struct H264Context {
int mb_aff_frame;
int mb_field_decoding_flag;
int mb_mbaff; ///< mb_aff_frame && mb_field_decoding_flag
+ int picture_structure;
+ int first_field;
DECLARE_ALIGNED(8, uint16_t, sub_mb_type)[4];
@@ -424,6 +454,13 @@ typedef struct H264Context {
int x264_build;
+ int mb_x, mb_y;
+ int resync_mb_x;
+ int resync_mb_y;
+ int mb_skip_run;
+ int mb_height, mb_width;
+ int mb_stride;
+ int mb_num;
int mb_xy;
int is_complex;
@@ -448,7 +485,8 @@ typedef struct H264Context {
int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4)
int got_first; ///< this flag is != 0 if we've parsed a frame
- int context_reinitialized;
+ int bit_depth_luma; ///< luma bit depth from sps to detect changes
+ int chroma_format_idc; ///< chroma format from sps to detect changes
SPS *sps_buffers[MAX_SPS_COUNT];
PPS *pps_buffers[MAX_PPS_COUNT];
@@ -521,12 +559,16 @@ typedef struct H264Context {
*/
int max_contexts;
+ int slice_context_count;
+
/**
* 1 if the single thread fallback warning has already been
* displayed, 0 otherwise.
*/
int single_decode_warning;
+ enum AVPictureType pict_type;
+
int last_slice_type;
/** @} */
@@ -578,6 +620,8 @@ typedef struct H264Context {
int cur_chroma_format_idc;
uint8_t *bipred_scratchpad;
+ uint8_t *edge_emu_buffer;
+ int16_t *dc_val_base;
} H264Context;
extern const uint8_t ff_h264_chroma_qp[3][QP_MAX_NUM + 1]; ///< One chroma qp table for each supported bit depth (8, 9, 10).
@@ -786,7 +830,7 @@ static av_always_inline int pred_intra_mode(H264Context *h, int n)
const int top = h->intra4x4_pred_mode_cache[index8 - 8];
const int min = FFMIN(left, top);
- tprintf(h->s.avctx, "mode:%d %d min:%d\n", left, top, min);
+ tprintf(h->avctx, "mode:%d %d min:%d\n", left, top, min);
if (min < 0)
return DC_PRED;
@@ -820,7 +864,7 @@ static av_always_inline void write_back_non_zero_count(H264Context *h)
AV_COPY32(&nnz[32], &nnz_cache[4 + 8 * 11]);
AV_COPY32(&nnz[36], &nnz_cache[4 + 8 * 12]);
- if (!h->s.chroma_y_shift) {
+ if (!h->chroma_y_shift) {
AV_COPY32(&nnz[24], &nnz_cache[4 + 8 * 8]);
AV_COPY32(&nnz[28], &nnz_cache[4 + 8 * 9]);
AV_COPY32(&nnz[40], &nnz_cache[4 + 8 * 13]);
@@ -829,12 +873,11 @@ static av_always_inline void write_back_non_zero_count(H264Context *h)
}
static av_always_inline void write_back_motion_list(H264Context *h,
- MpegEncContext *const s,
int b_stride,
int b_xy, int b8_xy,
int mb_type, int list)
{
- int16_t(*mv_dst)[2] = &s->current_picture.f.motion_val[list][b_xy];
+ int16_t(*mv_dst)[2] = &h->cur_pic.f.motion_val[list][b_xy];
int16_t(*mv_src)[2] = &h->mv_cache[list][scan8[0]];
AV_COPY128(mv_dst + 0 * b_stride, mv_src + 8 * 0);
AV_COPY128(mv_dst + 1 * b_stride, mv_src + 8 * 1);
@@ -855,7 +898,7 @@ static av_always_inline void write_back_motion_list(H264Context *h,
}
{
- int8_t *ref_index = &s->current_picture.f.ref_index[list][b8_xy];
+ int8_t *ref_index = &h->cur_pic.f.ref_index[list][b8_xy];
int8_t *ref_cache = h->ref_cache[list];
ref_index[0 + 0 * 2] = ref_cache[scan8[0]];
ref_index[1 + 0 * 2] = ref_cache[scan8[4]];
@@ -866,19 +909,18 @@ static av_always_inline void write_back_motion_list(H264Context *h,
static av_always_inline void write_back_motion(H264Context *h, int mb_type)
{
- MpegEncContext *const s = &h->s;
const int b_stride = h->b_stride;
- const int b_xy = 4 * s->mb_x + 4 * s->mb_y * h->b_stride; // try mb2b(8)_xy
+ const int b_xy = 4 * h->mb_x + 4 * h->mb_y * h->b_stride; // try mb2b(8)_xy
const int b8_xy = 4 * h->mb_xy;
if (USES_LIST(mb_type, 0)) {
- write_back_motion_list(h, s, b_stride, b_xy, b8_xy, mb_type, 0);
+ write_back_motion_list(h, b_stride, b_xy, b8_xy, mb_type, 0);
} else {
- fill_rectangle(&s->current_picture.f.ref_index[0][b8_xy],
+ fill_rectangle(&h->cur_pic.f.ref_index[0][b8_xy],
2, 2, 2, (uint8_t)LIST_NOT_USED, 1);
}
if (USES_LIST(mb_type, 1))
- write_back_motion_list(h, s, b_stride, b_xy, b8_xy, mb_type, 1);
+ write_back_motion_list(h, b_stride, b_xy, b8_xy, mb_type, 1);
if (h->slice_type_nos == AV_PICTURE_TYPE_B && CABAC) {
if (IS_8X8(mb_type)) {
@@ -902,4 +944,6 @@ static av_always_inline int get_dct8x8_allowed(H264Context *h)
0x0001000100010001ULL));
}
+void ff_h264_draw_horiz_band(H264Context *h, int y, int height);
+
#endif /* AVCODEC_H264_H */
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 1926ce6..8fc6b95 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -1260,10 +1260,9 @@ static const int8_t cabac_context_init_PB[3][1024][2] =
};
void ff_h264_init_cabac_states(H264Context *h) {
- MpegEncContext * const s = &h->s;
int i;
const int8_t (*tab)[2];
- const int slice_qp = av_clip(s->qscale - 6*(h->sps.bit_depth_luma-8), 0, 51);
+ const int slice_qp = av_clip(h->qscale - 6*(h->sps.bit_depth_luma-8), 0, 51);
if( h->slice_type_nos == AV_PICTURE_TYPE_I ) tab = cabac_context_init_I;
else tab = cabac_context_init_PB[h->cabac_init_idc];
@@ -1281,13 +1280,12 @@ void ff_h264_init_cabac_states(H264Context *h) {
}
static int decode_cabac_field_decoding_flag(H264Context *h) {
- MpegEncContext * const s = &h->s;
- const long mbb_xy = h->mb_xy - 2L*s->mb_stride;
+ const long mbb_xy = h->mb_xy - 2L*h->mb_stride;
unsigned long ctx = 0;
- ctx += h->mb_field_decoding_flag & !!s->mb_x; //for FMO:(s->current_picture.f.mb_type[mba_xy] >> 7) & (h->slice_table[mba_xy] == h->slice_num);
- ctx += (s->current_picture.f.mb_type[mbb_xy] >> 7) & (h->slice_table[mbb_xy] == h->slice_num);
+ ctx += h->mb_field_decoding_flag & !!h->mb_x; //for FMO:(s->current_picture.f.mb_type[mba_xy] >> 7) & (h->slice_table[mba_xy] == h->slice_num);
+ ctx += (h->cur_pic.f.mb_type[mbb_xy] >> 7) & (h->slice_table[mbb_xy] == h->slice_num);
return get_cabac_noinline( &h->cabac, &(h->cabac_state+70)[ctx] );
}
@@ -1323,34 +1321,33 @@ static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_sl
}
static int decode_cabac_mb_skip( H264Context *h, int mb_x, int mb_y ) {
- MpegEncContext * const s = &h->s;
int mba_xy, mbb_xy;
int ctx = 0;
if(FRAME_MBAFF){ //FIXME merge with the stuff in fill_caches?
- int mb_xy = mb_x + (mb_y&~1)*s->mb_stride;
+ int mb_xy = mb_x + (mb_y&~1)*h->mb_stride;
mba_xy = mb_xy - 1;
if( (mb_y&1)
&& h->slice_table[mba_xy] == h->slice_num
- && MB_FIELD == !!IS_INTERLACED( s->current_picture.f.mb_type[mba_xy] ) )
- mba_xy += s->mb_stride;
+ && MB_FIELD == !!IS_INTERLACED( h->cur_pic.f.mb_type[mba_xy] ) )
+ mba_xy += h->mb_stride;
if( MB_FIELD ){
- mbb_xy = mb_xy - s->mb_stride;
+ mbb_xy = mb_xy - h->mb_stride;
if( !(mb_y&1)
&& h->slice_table[mbb_xy] == h->slice_num
- && IS_INTERLACED( s->current_picture.f.mb_type[mbb_xy] ) )
- mbb_xy -= s->mb_stride;
+ && IS_INTERLACED( h->cur_pic.f.mb_type[mbb_xy] ) )
+ mbb_xy -= h->mb_stride;
}else
- mbb_xy = mb_x + (mb_y-1)*s->mb_stride;
+ mbb_xy = mb_x + (mb_y-1)*h->mb_stride;
}else{
int mb_xy = h->mb_xy;
mba_xy = mb_xy - 1;
- mbb_xy = mb_xy - (s->mb_stride << FIELD_PICTURE);
+ mbb_xy = mb_xy - (h->mb_stride << FIELD_PICTURE);
}
- if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( s->current_picture.f.mb_type[mba_xy] ))
+ if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP(h->cur_pic.f.mb_type[mba_xy] ))
ctx++;
- if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( s->current_picture.f.mb_type[mbb_xy] ))
+ if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP(h->cur_pic.f.mb_type[mbb_xy] ))
ctx++;
if( h->slice_type_nos == AV_PICTURE_TYPE_B )
@@ -1507,7 +1504,7 @@ static int decode_cabac_mb_mvd( H264Context *h, int ctxbase, int amvd, int *mvda
mvd += 1 << k;
k++;
if(k>24){
- av_log(h->s.avctx, AV_LOG_ERROR, "overflow in decode_cabac_mb_mvd\n");
+ av_log(h->avctx, AV_LOG_ERROR, "overflow in decode_cabac_mb_mvd\n");
return INT_MIN;
}
}
@@ -1832,8 +1829,7 @@ static av_always_inline void decode_cabac_luma_residual( H264Context *h, const u
static const uint8_t ctx_cat[4][3] = {{0,6,10},{1,7,11},{2,8,12},{5,9,13}};
const uint32_t *qmul;
int i8x8, i4x4;
- MpegEncContext * const s = &h->s;
- int qscale = p == 0 ? s->qscale : h->chroma_qp[p-1];
+ int qscale = p == 0 ? h->qscale : h->chroma_qp[p-1];
if( IS_INTRA16x16( mb_type ) ) {
AV_ZERO128(h->mb_luma_dc[p]+0);
AV_ZERO128(h->mb_luma_dc[p]+8);
@@ -1879,28 +1875,27 @@ static av_always_inline void decode_cabac_luma_residual( H264Context *h, const u
* @return 0 if OK, ER_AC_ERROR / ER_DC_ERROR / ER_MV_ERROR if an error is noticed
*/
int ff_h264_decode_mb_cabac(H264Context *h) {
- MpegEncContext * const s = &h->s;
int mb_xy;
int mb_type, partition_count, cbp = 0;
int dct8x8_allowed= h->pps.transform_8x8_mode;
int decode_chroma = h->sps.chroma_format_idc == 1 || h->sps.chroma_format_idc == 2;
const int pixel_shift = h->pixel_shift;
- mb_xy = h->mb_xy = s->mb_x + s->mb_y*s->mb_stride;
+ mb_xy = h->mb_xy = h->mb_x + h->mb_y*h->mb_stride;
- tprintf(s->avctx, "pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y);
+ tprintf(h->avctx, "pic:%d mb:%d/%d\n", h->frame_num, h->mb_x, h->mb_y);
if( h->slice_type_nos != AV_PICTURE_TYPE_I ) {
int skip;
/* a skipped mb needs the aff flag from the following mb */
- if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped )
+ if( FRAME_MBAFF && (h->mb_y&1)==1 && h->prev_mb_skipped )
skip = h->next_mb_skipped;
else
- skip = decode_cabac_mb_skip( h, s->mb_x, s->mb_y );
+ skip = decode_cabac_mb_skip( h, h->mb_x, h->mb_y );
/* read skip flags */
if( skip ) {
- if( FRAME_MBAFF && (s->mb_y&1)==0 ){
- s->current_picture.f.mb_type[mb_xy] = MB_TYPE_SKIP;
- h->next_mb_skipped = decode_cabac_mb_skip( h, s->mb_x, s->mb_y+1 );
+ if( FRAME_MBAFF && (h->mb_y&1)==0 ){
+ h->cur_pic.f.mb_type[mb_xy] = MB_TYPE_SKIP;
+ h->next_mb_skipped = decode_cabac_mb_skip( h, h->mb_x, h->mb_y+1 );
if(!h->next_mb_skipped)
h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
}
@@ -1916,7 +1911,7 @@ int ff_h264_decode_mb_cabac(H264Context *h) {
}
}
if(FRAME_MBAFF){
- if( (s->mb_y&1) == 0 )
+ if( (h->mb_y&1) == 0 )
h->mb_mbaff =
h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
}
@@ -2017,10 +2012,10 @@ decode_intra_mb:
h->cbp_table[mb_xy] = 0xf7ef;
h->chroma_pred_mode_table[mb_xy] = 0;
// In deblocking, the quantizer is 0
- s->current_picture.f.qscale_table[mb_xy] = 0;
+ h->cur_pic.f.qscale_table[mb_xy] = 0;
// All coeffs are present
memset(h->non_zero_count[mb_xy], 16, 48);
- s->current_picture.f.mb_type[mb_xy] = mb_type;
+ h->cur_pic.f.mb_type[mb_xy] = mb_type;
h->last_qscale_diff = 0;
return 0;
}
@@ -2042,7 +2037,7 @@ decode_intra_mb:
int pred = pred_intra_mode( h, i );
h->intra4x4_pred_mode_cache[ scan8[i] ] = decode_cabac_mb_intra4x4_pred_mode( h, pred );
- av_dlog(s->avctx, "i4x4 pred=%d mode=%d\n", pred,
+ av_dlog(h->avctx, "i4x4 pred=%d mode=%d\n", pred,
h->intra4x4_pred_mode_cache[scan8[i]]);
}
}
@@ -2097,7 +2092,7 @@ decode_intra_mb:
if (rc > 1) {
ref[list][i] = decode_cabac_mb_ref( h, list, 4*i );
if (ref[list][i] >= (unsigned) rc) {
- av_log(s->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref[list][i], rc);
+ av_log(h->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref[list][i], rc);
return -1;
}
}else
@@ -2132,7 +2127,7 @@ decode_intra_mb:
uint8_t (* mvd_cache)[2]= &h->mvd_cache[list][ scan8[index] ];
pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my);
DECODE_CABAC_MB_MVD( h, list, index)
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
if(IS_SUB_8X8(sub_mb_type)){
mv_cache[ 1 ][0]=
@@ -2183,7 +2178,7 @@ decode_intra_mb:
if (rc > 1) {
ref= decode_cabac_mb_ref(h, list, 0);
if (ref >= (unsigned) rc) {
- av_log(s->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, rc);
+ av_log(h->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, rc);
return -1;
}
}else
@@ -2196,7 +2191,7 @@ decode_intra_mb:
int mx,my,mpx,mpy;
pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
DECODE_CABAC_MB_MVD( h, list, 0)
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
fill_rectangle(h->mvd_cache[list][ scan8[0] ], 4, 4, 8, pack8to16(mpx,mpy), 2);
fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4);
@@ -2211,7 +2206,7 @@ decode_intra_mb:
if (rc > 1) {
ref= decode_cabac_mb_ref( h, list, 8*i );
if (ref >= (unsigned) rc) {
- av_log(s->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, rc);
+ av_log(h->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, rc);
return -1;
}
}else
@@ -2227,7 +2222,7 @@ decode_intra_mb:
int mx,my,mpx,mpy;
pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my);
DECODE_CABAC_MB_MVD( h, list, 8*i)
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack8to16(mpx,mpy), 2);
fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4);
@@ -2246,7 +2241,7 @@ decode_intra_mb:
if (rc > 1) {
ref= decode_cabac_mb_ref( h, list, 4*i );
if (ref >= (unsigned) rc) {
- av_log(s->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, rc);
+ av_log(h->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, rc);
return -1;
}
}else
@@ -2263,7 +2258,7 @@ decode_intra_mb:
pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my);
DECODE_CABAC_MB_MVD( h, list, 4*i)
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack8to16(mpx,mpy), 2);
fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4);
}else{
@@ -2314,18 +2309,18 @@ decode_intra_mb:
AV_WN32A(&nnz_cache[4+8*10], top_empty);
}
}
- s->current_picture.f.mb_type[mb_xy] = mb_type;
+ h->cur_pic.f.mb_type[mb_xy] = mb_type;
if( cbp || IS_INTRA16x16( mb_type ) ) {
const uint8_t *scan, *scan8x8;
const uint32_t *qmul;
if(IS_INTERLACED(mb_type)){
- scan8x8= s->qscale ? h->field_scan8x8 : h->field_scan8x8_q0;
- scan= s->qscale ? h->field_scan : h->field_scan_q0;
+ scan8x8= h->qscale ? h->field_scan8x8 : h->field_scan8x8_q0;
+ scan= h->qscale ? h->field_scan : h->field_scan_q0;
}else{
- scan8x8= s->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0;
- scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
+ scan8x8= h->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0;
+ scan= h->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
}
// decode_cabac_mb_dqp
@@ -2338,7 +2333,7 @@ decode_intra_mb:
ctx= 3;
val++;
if(val > 2*max_qp){ //prevent infinite loop
- av_log(h->s.avctx, AV_LOG_ERROR, "cabac decode of qscale diff failed at %d %d\n", s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR, "cabac decode of qscale diff failed at %d %d\n", h->mb_x, h->mb_y);
return -1;
}
}
@@ -2348,13 +2343,13 @@ decode_intra_mb:
else
val= -((val + 1)>>1);
h->last_qscale_diff = val;
- s->qscale += val;
- if(((unsigned)s->qscale) > max_qp){
- if(s->qscale<0) s->qscale+= max_qp+1;
- else s->qscale-= max_qp+1;
+ h->qscale += val;
+ if(((unsigned)h->qscale) > max_qp){
+ if(h->qscale<0) h->qscale+= max_qp+1;
+ else h->qscale-= max_qp+1;
}
- h->chroma_qp[0] = get_chroma_qp(h, 0, s->qscale);
- h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale);
+ h->chroma_qp[0] = get_chroma_qp(h, 0, h->qscale);
+ h->chroma_qp[1] = get_chroma_qp(h, 1, h->qscale);
}else
h->last_qscale_diff=0;
@@ -2416,7 +2411,7 @@ decode_intra_mb:
h->last_qscale_diff = 0;
}
- s->current_picture.f.qscale_table[mb_xy] = s->qscale;
+ h->cur_pic.f.qscale_table[mb_xy] = h->qscale;
write_back_non_zero_count(h);
return 0;
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index be1cdf1..9585b77 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -292,7 +292,7 @@ static inline int pred_non_zero_count(H264Context *h, int n){
if(i<64) i= (i+1)>>1;
- tprintf(h->s.avctx, "pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31);
+ tprintf(h->avctx, "pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31);
return i&31;
}
@@ -443,7 +443,6 @@ static inline int get_level_prefix(GetBitContext *gb){
* @return <0 if an error occurred
*/
static int decode_residual(H264Context *h, GetBitContext *gb, int16_t *block, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff){
- MpegEncContext * const s = &h->s;
static const int coeff_token_table_index[17]= {0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3};
int level[16];
int zeros_left, coeff_token, total_coeff, i, trailing_ones, run_before;
@@ -474,12 +473,12 @@ static int decode_residual(H264Context *h, GetBitContext *gb, int16_t *block, in
if(total_coeff==0)
return 0;
if(total_coeff > (unsigned)max_coeff) {
- av_log(h->s.avctx, AV_LOG_ERROR, "corrupted macroblock %d %d (total_coeff=%d)\n", s->mb_x, s->mb_y, total_coeff);
+ av_log(h->avctx, AV_LOG_ERROR, "corrupted macroblock %d %d (total_coeff=%d)\n", h->mb_x, h->mb_y, total_coeff);
return -1;
}
trailing_ones= coeff_token&3;
- tprintf(h->s.avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff);
+ tprintf(h->avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff);
assert(total_coeff<=16);
i = show_bits(gb, 3);
@@ -515,7 +514,7 @@ static int decode_residual(H264Context *h, GetBitContext *gb, int16_t *block, in
level_code= 30 + get_bits(gb, prefix-3); //part
if(prefix>=16){
if(prefix > 25+3){
- av_log(h->s.avctx, AV_LOG_ERROR, "Invalid level prefix\n");
+ av_log(h->avctx, AV_LOG_ERROR, "Invalid level prefix\n");
return -1;
}
level_code += (1<<(prefix-3))-4096;
@@ -611,8 +610,8 @@ static int decode_residual(H264Context *h, GetBitContext *gb, int16_t *block, in
}
if (zeros_left < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
- "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR,
+ "negative number of zero coeffs at %d %d\n", h->mb_x, h->mb_y);
return AVERROR_INVALIDDATA;
}
@@ -627,8 +626,7 @@ static int decode_residual(H264Context *h, GetBitContext *gb, int16_t *block, in
static av_always_inline int decode_luma_residual(H264Context *h, GetBitContext *gb, const uint8_t *scan, const uint8_t *scan8x8, int pixel_shift, int mb_type, int cbp, int p){
int i4x4, i8x8;
- MpegEncContext * const s = &h->s;
- int qscale = p == 0 ? s->qscale : h->chroma_qp[p-1];
+ int qscale = p == 0 ? h->qscale : h->chroma_qp[p-1];
if(IS_INTRA16x16(mb_type)){
AV_ZERO128(h->mb_luma_dc[p]+0);
AV_ZERO128(h->mb_luma_dc[p]+8);
@@ -693,7 +691,6 @@ static av_always_inline int decode_luma_residual(H264Context *h, GetBitContext *
}
int ff_h264_decode_mb_cavlc(H264Context *h){
- MpegEncContext * const s = &h->s;
int mb_xy;
int partition_count;
unsigned int mb_type, cbp;
@@ -701,32 +698,32 @@ int ff_h264_decode_mb_cavlc(H264Context *h){
int decode_chroma = h->sps.chroma_format_idc == 1 || h->sps.chroma_format_idc == 2;
const int pixel_shift = h->pixel_shift;
- mb_xy = h->mb_xy = s->mb_x + s->mb_y*s->mb_stride;
+ mb_xy = h->mb_xy = h->mb_x + h->mb_y*h->mb_stride;
- tprintf(s->avctx, "pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y);
+ tprintf(h->avctx, "pic:%d mb:%d/%d\n", h->frame_num, h->mb_x, h->mb_y);
cbp = 0; /* avoid warning. FIXME: find a solution without slowing
down the code */
if(h->slice_type_nos != AV_PICTURE_TYPE_I){
- if(s->mb_skip_run==-1)
- s->mb_skip_run= get_ue_golomb(&s->gb);
+ if(h->mb_skip_run==-1)
+ h->mb_skip_run= get_ue_golomb(&h->gb);
- if (s->mb_skip_run--) {
- if(FRAME_MBAFF && (s->mb_y&1) == 0){
- if(s->mb_skip_run==0)
- h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
+ if (h->mb_skip_run--) {
+ if(FRAME_MBAFF && (h->mb_y&1) == 0){
+ if(h->mb_skip_run==0)
+ h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&h->gb);
}
decode_mb_skip(h);
return 0;
}
}
if(FRAME_MBAFF){
- if( (s->mb_y&1) == 0 )
- h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
+ if( (h->mb_y&1) == 0 )
+ h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&h->gb);
}
h->prev_mb_skipped= 0;
- mb_type= get_ue_golomb(&s->gb);
+ mb_type= get_ue_golomb(&h->gb);
if(h->slice_type_nos == AV_PICTURE_TYPE_B){
if(mb_type < 23){
partition_count= b_mb_type_info[mb_type].partition_count;
@@ -749,7 +746,7 @@ int ff_h264_decode_mb_cavlc(H264Context *h){
mb_type--;
decode_intra_mb:
if(mb_type > 25){
- av_log(h->s.avctx, AV_LOG_ERROR, "mb_type %d in %c slice too large at %d %d\n", mb_type, av_get_picture_type_char(h->slice_type), s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR, "mb_type %d in %c slice too large at %d %d\n", mb_type, av_get_picture_type_char(h->slice_type), h->mb_x, h->mb_y);
return -1;
}
partition_count=0;
@@ -769,19 +766,19 @@ decode_intra_mb:
h->sps.bit_depth_luma >> 3;
// We assume these blocks are very rare so we do not optimize it.
- align_get_bits(&s->gb);
+ align_get_bits(&h->gb);
// The pixels are stored in the same order as levels in h->mb array.
for(x=0; x < mb_size; x++){
- ((uint8_t*)h->mb)[x]= get_bits(&s->gb, 8);
+ ((uint8_t*)h->mb)[x]= get_bits(&h->gb, 8);
}
// In deblocking, the quantizer is 0
- s->current_picture.f.qscale_table[mb_xy] = 0;
+ h->cur_pic.f.qscale_table[mb_xy] = 0;
// All coeffs are present
memset(h->non_zero_count[mb_xy], 16, 48);
- s->current_picture.f.mb_type[mb_xy] = mb_type;
+ h->cur_pic.f.mb_type[mb_xy] = mb_type;
return 0;
}
@@ -795,7 +792,7 @@ decode_intra_mb:
if(IS_INTRA4x4(mb_type)){
int i;
int di = 1;
- if(dct8x8_allowed && get_bits1(&s->gb)){
+ if(dct8x8_allowed && get_bits1(&h->gb)){
mb_type |= MB_TYPE_8x8DCT;
di = 4;
}
@@ -804,8 +801,8 @@ decode_intra_mb:
for(i=0; i<16; i+=di){
int mode= pred_intra_mode(h, i);
- if(!get_bits1(&s->gb)){
- const int rem_mode= get_bits(&s->gb, 3);
+ if(!get_bits1(&h->gb)){
+ const int rem_mode= get_bits(&h->gb, 3);
mode = rem_mode + (rem_mode >= mode);
}
@@ -823,7 +820,7 @@ decode_intra_mb:
return -1;
}
if(decode_chroma){
- pred_mode= ff_h264_check_intra_pred_mode(h, get_ue_golomb_31(&s->gb), 1);
+ pred_mode= ff_h264_check_intra_pred_mode(h, get_ue_golomb_31(&h->gb), 1);
if(pred_mode < 0)
return -1;
h->chroma_pred_mode= pred_mode;
@@ -835,9 +832,9 @@ decode_intra_mb:
if(h->slice_type_nos == AV_PICTURE_TYPE_B){
for(i=0; i<4; i++){
- h->sub_mb_type[i]= get_ue_golomb_31(&s->gb);
+ h->sub_mb_type[i]= get_ue_golomb_31(&h->gb);
if(h->sub_mb_type[i] >=13){
- av_log(h->s.avctx, AV_LOG_ERROR, "B sub_mb_type %u out of range at %d %d\n", h->sub_mb_type[i], s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR, "B sub_mb_type %u out of range at %d %d\n", h->sub_mb_type[i], h->mb_x, h->mb_y);
return -1;
}
sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
@@ -853,9 +850,9 @@ decode_intra_mb:
}else{
assert(h->slice_type_nos == AV_PICTURE_TYPE_P); //FIXME SP correct ?
for(i=0; i<4; i++){
- h->sub_mb_type[i]= get_ue_golomb_31(&s->gb);
+ h->sub_mb_type[i]= get_ue_golomb_31(&h->gb);
if(h->sub_mb_type[i] >=4){
- av_log(h->s.avctx, AV_LOG_ERROR, "P sub_mb_type %u out of range at %d %d\n", h->sub_mb_type[i], s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR, "P sub_mb_type %u out of range at %d %d\n", h->sub_mb_type[i], h->mb_x, h->mb_y);
return -1;
}
sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
@@ -872,11 +869,11 @@ decode_intra_mb:
if(ref_count == 1){
tmp= 0;
}else if(ref_count == 2){
- tmp= get_bits1(&s->gb)^1;
+ tmp= get_bits1(&h->gb)^1;
}else{
- tmp= get_ue_golomb_31(&s->gb);
+ tmp= get_ue_golomb_31(&h->gb);
if(tmp>=ref_count){
- av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", tmp);
+ av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", tmp);
return -1;
}
}
@@ -908,9 +905,9 @@ decode_intra_mb:
const int index= 4*i + block_width*j;
int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ];
pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my);
- mx += get_se_golomb(&s->gb);
- my += get_se_golomb(&s->gb);
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ mx += get_se_golomb(&h->gb);
+ my += get_se_golomb(&h->gb);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
if(IS_SUB_8X8(sub_mb_type)){
mv_cache[ 1 ][0]=
@@ -948,11 +945,11 @@ decode_intra_mb:
if (rc == 1) {
val= 0;
} else if (rc == 2) {
- val= get_bits1(&s->gb)^1;
+ val= get_bits1(&h->gb)^1;
}else{
- val= get_ue_golomb_31(&s->gb);
+ val= get_ue_golomb_31(&h->gb);
if (val >= rc) {
- av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
+ av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
return -1;
}
}
@@ -962,9 +959,9 @@ decode_intra_mb:
for(list=0; list<h->list_count; list++){
if(IS_DIR(mb_type, 0, list)){
pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
- mx += get_se_golomb(&s->gb);
- my += get_se_golomb(&s->gb);
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ mx += get_se_golomb(&h->gb);
+ my += get_se_golomb(&h->gb);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4);
}
@@ -979,11 +976,11 @@ decode_intra_mb:
if (rc == 1) {
val= 0;
} else if (rc == 2) {
- val= get_bits1(&s->gb)^1;
+ val= get_bits1(&h->gb)^1;
}else{
- val= get_ue_golomb_31(&s->gb);
+ val= get_ue_golomb_31(&h->gb);
if (val >= rc) {
- av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
+ av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
return -1;
}
}
@@ -997,9 +994,9 @@ decode_intra_mb:
unsigned int val;
if(IS_DIR(mb_type, i, list)){
pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my);
- mx += get_se_golomb(&s->gb);
- my += get_se_golomb(&s->gb);
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ mx += get_se_golomb(&h->gb);
+ my += get_se_golomb(&h->gb);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
val= pack16to32(mx,my);
}else
@@ -1017,11 +1014,11 @@ decode_intra_mb:
if (rc == 1) {
val= 0;
} else if (rc == 2) {
- val= get_bits1(&s->gb)^1;
+ val= get_bits1(&h->gb)^1;
}else{
- val= get_ue_golomb_31(&s->gb);
+ val= get_ue_golomb_31(&h->gb);
if (val >= rc) {
- av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
+ av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
return -1;
}
}
@@ -1035,9 +1032,9 @@ decode_intra_mb:
unsigned int val;
if(IS_DIR(mb_type, i, list)){
pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my);
- mx += get_se_golomb(&s->gb);
- my += get_se_golomb(&s->gb);
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ mx += get_se_golomb(&h->gb);
+ my += get_se_golomb(&h->gb);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
val= pack16to32(mx,my);
}else
@@ -1052,18 +1049,18 @@ decode_intra_mb:
write_back_motion(h, mb_type);
if(!IS_INTRA16x16(mb_type)){
- cbp= get_ue_golomb(&s->gb);
+ cbp= get_ue_golomb(&h->gb);
if(decode_chroma){
if(cbp > 47){
- av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%u) at %d %d\n", cbp, s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR, "cbp too large (%u) at %d %d\n", cbp, h->mb_x, h->mb_y);
return -1;
}
if(IS_INTRA4x4(mb_type)) cbp= golomb_to_intra4x4_cbp[cbp];
else cbp= golomb_to_inter_cbp [cbp];
}else{
if(cbp > 15){
- av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%u) at %d %d\n", cbp, s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR, "cbp too large (%u) at %d %d\n", cbp, h->mb_x, h->mb_y);
return -1;
}
if(IS_INTRA4x4(mb_type)) cbp= golomb_to_intra4x4_cbp_gray[cbp];
@@ -1072,11 +1069,11 @@ decode_intra_mb:
}
if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){
- mb_type |= MB_TYPE_8x8DCT*get_bits1(&s->gb);
+ mb_type |= MB_TYPE_8x8DCT*get_bits1(&h->gb);
}
h->cbp=
h->cbp_table[mb_xy]= cbp;
- s->current_picture.f.mb_type[mb_xy] = mb_type;
+ h->cur_pic.f.mb_type[mb_xy] = mb_type;
if(cbp || IS_INTRA16x16(mb_type)){
int i4x4, i8x8, chroma_idx;
@@ -1087,28 +1084,28 @@ decode_intra_mb:
const int max_qp = 51 + 6*(h->sps.bit_depth_luma-8);
if(IS_INTERLACED(mb_type)){
- scan8x8= s->qscale ? h->field_scan8x8_cavlc : h->field_scan8x8_cavlc_q0;
- scan= s->qscale ? h->field_scan : h->field_scan_q0;
+ scan8x8= h->qscale ? h->field_scan8x8_cavlc : h->field_scan8x8_cavlc_q0;
+ scan= h->qscale ? h->field_scan : h->field_scan_q0;
}else{
- scan8x8= s->qscale ? h->zigzag_scan8x8_cavlc : h->zigzag_scan8x8_cavlc_q0;
- scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
+ scan8x8= h->qscale ? h->zigzag_scan8x8_cavlc : h->zigzag_scan8x8_cavlc_q0;
+ scan= h->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
}
- dquant= get_se_golomb(&s->gb);
+ dquant= get_se_golomb(&h->gb);
- s->qscale += dquant;
+ h->qscale += dquant;
- if(((unsigned)s->qscale) > max_qp){
- if(s->qscale<0) s->qscale+= max_qp+1;
- else s->qscale-= max_qp+1;
- if(((unsigned)s->qscale) > max_qp){
- av_log(h->s.avctx, AV_LOG_ERROR, "dquant out of range (%d) at %d %d\n", dquant, s->mb_x, s->mb_y);
+ if(((unsigned)h->qscale) > max_qp){
+ if(h->qscale<0) h->qscale+= max_qp+1;
+ else h->qscale-= max_qp+1;
+ if(((unsigned)h->qscale) > max_qp){
+ av_log(h->avctx, AV_LOG_ERROR, "dquant out of range (%d) at %d %d\n", dquant, h->mb_x, h->mb_y);
return -1;
}
}
- h->chroma_qp[0]= get_chroma_qp(h, 0, s->qscale);
- h->chroma_qp[1]= get_chroma_qp(h, 1, s->qscale);
+ h->chroma_qp[0]= get_chroma_qp(h, 0, h->qscale);
+ h->chroma_qp[1]= get_chroma_qp(h, 1, h->qscale);
if( (ret = decode_luma_residual(h, gb, scan, scan8x8, pixel_shift, mb_type, cbp, 0)) < 0 ){
return -1;
@@ -1176,7 +1173,7 @@ decode_intra_mb:
fill_rectangle(&h->non_zero_count_cache[scan8[16]], 4, 4, 8, 0, 1);
fill_rectangle(&h->non_zero_count_cache[scan8[32]], 4, 4, 8, 0, 1);
}
- s->current_picture.f.qscale_table[mb_xy] = s->qscale;
+ h->cur_pic.f.qscale_table[mb_xy] = h->qscale;
write_back_non_zero_count(h);
return 0;
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 2306b97..e7a0b61 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -50,14 +50,13 @@ static int get_scale_factor(H264Context * const h, int poc, int poc1, int i){
}
void ff_h264_direct_dist_scale_factor(H264Context * const h){
- MpegEncContext * const s = &h->s;
- const int poc = h->s.current_picture_ptr->field_poc[ s->picture_structure == PICT_BOTTOM_FIELD ];
+ const int poc = h->cur_pic_ptr->field_poc[h->picture_structure == PICT_BOTTOM_FIELD];
const int poc1 = h->ref_list[1][0].poc;
int i, field;
if (FRAME_MBAFF)
for (field = 0; field < 2; field++){
- const int poc = h->s.current_picture_ptr->field_poc[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] =
@@ -70,12 +69,11 @@ void ff_h264_direct_dist_scale_factor(H264Context * const h){
}
static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field, int colfield, int mbafi){
- MpegEncContext * const s = &h->s;
Picture * const ref1 = &h->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 interl= mbafi || s->picture_structure != PICT_FRAME;
+ int interl= mbafi || h->picture_structure != PICT_FRAME;
/* bogus; fills in for missing frames */
memset(map[list], 0, sizeof(map[list]));
@@ -104,11 +102,10 @@ static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field,
}
void ff_h264_direct_ref_list_init(H264Context * const h){
- MpegEncContext * const s = &h->s;
Picture * const ref1 = &h->ref_list[1][0];
- Picture * const cur = s->current_picture_ptr;
+ Picture * const cur = h->cur_pic_ptr;
int list, j, field;
- int sidx= (s->picture_structure&1)^1;
+ int sidx= (h->picture_structure&1)^1;
int ref1sidx = (ref1->f.reference&1)^1;
for(list=0; list<2; list++){
@@ -117,7 +114,7 @@ void ff_h264_direct_ref_list_init(H264Context * const h){
cur->ref_poc[sidx][list][j] = 4 * h->ref_list[list][j].frame_num + (h->ref_list[list][j].f.reference & 3);
}
- if(s->picture_structure == PICT_FRAME){
+ if(h->picture_structure == PICT_FRAME){
memcpy(cur->ref_count[1], cur->ref_count[0], sizeof(cur->ref_count[0]));
memcpy(cur->ref_poc [1], cur->ref_poc [0], sizeof(cur->ref_poc [0]));
}
@@ -125,12 +122,12 @@ void ff_h264_direct_ref_list_init(H264Context * const h){
cur->mbaff= FRAME_MBAFF;
h->col_fieldoff= 0;
- if(s->picture_structure == PICT_FRAME){
- int cur_poc = s->current_picture_ptr->poc;
+ 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));
ref1sidx=sidx= h->col_parity;
- } else if (!(s->picture_structure & h->ref_list[1][0].f.reference) && !h->ref_list[1][0].mbaff) { // FL -> FL & differ parity
+ } else if (!(h->picture_structure & h->ref_list[1][0].f.reference) && !h->ref_list[1][0].mbaff) { // FL -> FL & differ parity
h->col_fieldoff = 2 * h->ref_list[1][0].f.reference - 3;
}
@@ -149,9 +146,9 @@ static void await_reference_mb_row(H264Context * const h, Picture *ref, int mb_y
{
int ref_field = ref->f.reference - 1;
int ref_field_picture = ref->field_picture;
- int ref_height = 16*h->s.mb_height >> ref_field_picture;
+ int ref_height = 16*h->mb_height >> ref_field_picture;
- if(!HAVE_THREADS || !(h->s.avctx->active_thread_type&FF_THREAD_FRAME))
+ if(!HAVE_THREADS || !(h->avctx->active_thread_type&FF_THREAD_FRAME))
return;
//FIXME it can be safe to access mb stuff
@@ -163,10 +160,9 @@ static void await_reference_mb_row(H264Context * const h, Picture *ref, int mb_y
}
static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){
- MpegEncContext * const s = &h->s;
int b8_stride = 2;
int b4_stride = h->b_stride;
- int mb_xy = h->mb_xy, mb_y = s->mb_y;
+ int mb_xy = h->mb_xy, mb_y = h->mb_y;
int mb_type_col[2];
const int16_t (*l1mv0)[2], (*l1mv1)[2];
const int8_t *l1ref0, *l1ref1;
@@ -179,7 +175,7 @@ static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){
assert(h->ref_list[1][0].f.reference & 3);
- await_reference_mb_row(h, &h->ref_list[1][0], s->mb_y + !!IS_INTERLACED(*mb_type));
+ await_reference_mb_row(h, &h->ref_list[1][0], h->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)
@@ -241,21 +237,21 @@ static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){
if (IS_INTERLACED(h->ref_list[1][0].f.mb_type[mb_xy])) { // AFL/AFR/FR/FL -> AFL/FL
if (!IS_INTERLACED(*mb_type)) { // AFR/FR -> AFL/FL
- mb_y = (s->mb_y&~1) + h->col_parity;
- mb_xy= s->mb_x + ((s->mb_y&~1) + h->col_parity)*s->mb_stride;
+ mb_y = (h->mb_y&~1) + h->col_parity;
+ mb_xy= h->mb_x + ((h->mb_y&~1) + h->col_parity)*h->mb_stride;
b8_stride = 0;
}else{
mb_y += h->col_fieldoff;
- mb_xy += s->mb_stride*h->col_fieldoff; // non zero for FL -> FL & differ parity
+ mb_xy += h->mb_stride*h->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 = s->mb_y&~1;
- mb_xy= s->mb_x + (s->mb_y&~1)*s->mb_stride;
+ 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].f.mb_type[mb_xy];
- mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy + s->mb_stride];
- b8_stride = 2+4*s->mb_stride;
+ mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy + h->mb_stride];
+ b8_stride = 2+4*h->mb_stride;
b4_stride *= 6;
if (IS_INTERLACED(mb_type_col[0]) != IS_INTERLACED(mb_type_col[1])) {
mb_type_col[0] &= ~MB_TYPE_INTERLACED;
@@ -298,7 +294,7 @@ single_col:
l1ref0 = &h->ref_list[1][0].f.ref_index [0][4 * mb_xy];
l1ref1 = &h->ref_list[1][0].f.ref_index [1][4 * mb_xy];
if(!b8_stride){
- if(s->mb_y&1){
+ if(h->mb_y&1){
l1ref0 += 2;
l1ref1 += 2;
l1mv0 += 2*b4_stride;
@@ -414,10 +410,9 @@ single_col:
}
static void pred_temp_direct_motion(H264Context * const h, int *mb_type){
- MpegEncContext * const s = &h->s;
int b8_stride = 2;
int b4_stride = h->b_stride;
- int mb_xy = h->mb_xy, mb_y = s->mb_y;
+ int mb_xy = h->mb_xy, mb_y = h->mb_y;
int mb_type_col[2];
const int16_t (*l1mv0)[2], (*l1mv1)[2];
const int8_t *l1ref0, *l1ref1;
@@ -427,25 +422,25 @@ static void pred_temp_direct_motion(H264Context * const h, int *mb_type){
assert(h->ref_list[1][0].f.reference & 3);
- await_reference_mb_row(h, &h->ref_list[1][0], s->mb_y + !!IS_INTERLACED(*mb_type));
+ await_reference_mb_row(h, &h->ref_list[1][0], h->mb_y + !!IS_INTERLACED(*mb_type));
if (IS_INTERLACED(h->ref_list[1][0].f.mb_type[mb_xy])) { // AFL/AFR/FR/FL -> AFL/FL
if (!IS_INTERLACED(*mb_type)) { // AFR/FR -> AFL/FL
- mb_y = (s->mb_y&~1) + h->col_parity;
- mb_xy= s->mb_x + ((s->mb_y&~1) + h->col_parity)*s->mb_stride;
+ mb_y = (h->mb_y&~1) + h->col_parity;
+ mb_xy= h->mb_x + ((h->mb_y&~1) + h->col_parity)*h->mb_stride;
b8_stride = 0;
}else{
mb_y += h->col_fieldoff;
- mb_xy += s->mb_stride*h->col_fieldoff; // non zero for FL -> FL & differ parity
+ mb_xy += h->mb_stride*h->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 = s->mb_y&~1;
- mb_xy= s->mb_x + (s->mb_y&~1)*s->mb_stride;
+ 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].f.mb_type[mb_xy];
- mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy + s->mb_stride];
- b8_stride = 2+4*s->mb_stride;
+ mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy + h->mb_stride];
+ b8_stride = 2+4*h->mb_stride;
b4_stride *= 6;
if (IS_INTERLACED(mb_type_col[0]) != IS_INTERLACED(mb_type_col[1])) {
mb_type_col[0] &= ~MB_TYPE_INTERLACED;
@@ -489,7 +484,7 @@ single_col:
l1ref0 = &h->ref_list[1][0].f.ref_index [0][4 * mb_xy];
l1ref1 = &h->ref_list[1][0].f.ref_index [1][4 * mb_xy];
if(!b8_stride){
- if(s->mb_y&1){
+ if(h->mb_y&1){
l1ref0 += 2;
l1ref1 += 2;
l1mv0 += 2*b4_stride;
@@ -503,9 +498,9 @@ single_col:
int ref_offset;
if(FRAME_MBAFF && IS_INTERLACED(*mb_type)){
- map_col_to_list0[0] = h->map_col_to_list0_field[s->mb_y&1][0];
- map_col_to_list0[1] = h->map_col_to_list0_field[s->mb_y&1][1];
- dist_scale_factor =h->dist_scale_factor_field[s->mb_y&1];
+ 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];
}
ref_offset = (h->ref_list[1][0].mbaff<<4) & (mb_type_col[0]>>3); //if(h->ref_list[1][0].mbaff && IS_INTERLACED(mb_type_col[0])) ref_offset=16 else 0
diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c
index 45e1cdf..929997c 100644
--- a/libavcodec/h264_loopfilter.c
+++ b/libavcodec/h264_loopfilter.c
@@ -244,8 +244,7 @@ static av_always_inline void h264_filter_mb_fast_internal(H264Context *h,
unsigned int uvlinesize,
int pixel_shift)
{
- MpegEncContext * const s = &h->s;
- int chroma = !(CONFIG_GRAY && (s->flags&CODEC_FLAG_GRAY));
+ int chroma = !(CONFIG_GRAY && (h->flags&CODEC_FLAG_GRAY));
int chroma444 = CHROMA444;
int chroma422 = CHROMA422;
@@ -257,10 +256,10 @@ static av_always_inline void h264_filter_mb_fast_internal(H264Context *h,
int a = h->slice_alpha_c0_offset - qp_bd_offset;
int b = h->slice_beta_offset - qp_bd_offset;
- int mb_type = s->current_picture.f.mb_type[mb_xy];
- int qp = s->current_picture.f.qscale_table[mb_xy];
- int qp0 = s->current_picture.f.qscale_table[mb_xy - 1];
- int qp1 = s->current_picture.f.qscale_table[h->top_mb_xy];
+ int mb_type = h->cur_pic.f.mb_type[mb_xy];
+ int qp = h->cur_pic.f.qscale_table[mb_xy];
+ int qp0 = h->cur_pic.f.qscale_table[mb_xy - 1];
+ int qp1 = h->cur_pic.f.qscale_table[h->top_mb_xy];
int qpc = get_chroma_qp( h, 0, qp );
int qpc0 = get_chroma_qp( h, 0, qp0 );
int qpc1 = get_chroma_qp( h, 0, qp1 );
@@ -465,7 +464,6 @@ static int check_mv(H264Context *h, long b_idx, long bn_idx, int mvy_limit){
}
static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize, int mb_xy, int mb_type, int mvy_limit, int first_vertical_edge_done, int a, int b, int chroma, int dir) {
- MpegEncContext * const s = &h->s;
int edge;
int chroma_qp_avg[2];
int chroma444 = CHROMA444;
@@ -493,16 +491,16 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u
//
unsigned int tmp_linesize = 2 * linesize;
unsigned int tmp_uvlinesize = 2 * uvlinesize;
- int mbn_xy = mb_xy - 2 * s->mb_stride;
+ int mbn_xy = mb_xy - 2 * h->mb_stride;
int j;
- for(j=0; j<2; j++, mbn_xy += s->mb_stride){
+ for(j=0; j<2; j++, mbn_xy += h->mb_stride){
DECLARE_ALIGNED(8, int16_t, bS)[4];
int qp;
- if (IS_INTRA(mb_type | s->current_picture.f.mb_type[mbn_xy])) {
+ if (IS_INTRA(mb_type | h->cur_pic.f.mb_type[mbn_xy])) {
AV_WN64A(bS, 0x0003000300030003ULL);
} else {
- if (!CABAC && IS_8x8DCT(s->current_picture.f.mb_type[mbn_xy])) {
+ if (!CABAC && IS_8x8DCT(h->cur_pic.f.mb_type[mbn_xy])) {
bS[0]= 1+((h->cbp_table[mbn_xy] & 0x4000)||h->non_zero_count_cache[scan8[0]+0]);
bS[1]= 1+((h->cbp_table[mbn_xy] & 0x4000)||h->non_zero_count_cache[scan8[0]+1]);
bS[2]= 1+((h->cbp_table[mbn_xy] & 0x8000)||h->non_zero_count_cache[scan8[0]+2]);
@@ -517,12 +515,12 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u
}
// Do not use s->qscale as luma quantizer because it has not the same
// value in IPCM macroblocks.
- qp = (s->current_picture.f.qscale_table[mb_xy] + s->current_picture.f.qscale_table[mbn_xy] + 1) >> 1;
- tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize);
- { int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
+ qp = (h->cur_pic.f.qscale_table[mb_xy] + h->cur_pic.f.qscale_table[mbn_xy] + 1) >> 1;
+ tprintf(h->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize);
+ { int i; for (i = 0; i < 4; i++) tprintf(h->avctx, " bS[%d]:%d", i, bS[i]); tprintf(h->avctx, "\n"); }
filter_mb_edgeh( &img_y[j*linesize], tmp_linesize, bS, qp, a, b, h, 0 );
- chroma_qp_avg[0] = (h->chroma_qp[0] + get_chroma_qp(h, 0, s->current_picture.f.qscale_table[mbn_xy]) + 1) >> 1;
- chroma_qp_avg[1] = (h->chroma_qp[1] + get_chroma_qp(h, 1, s->current_picture.f.qscale_table[mbn_xy]) + 1) >> 1;
+ chroma_qp_avg[0] = (h->chroma_qp[0] + get_chroma_qp(h, 0, h->cur_pic.f.qscale_table[mbn_xy]) + 1) >> 1;
+ chroma_qp_avg[1] = (h->chroma_qp[1] + get_chroma_qp(h, 1, h->cur_pic.f.qscale_table[mbn_xy]) + 1) >> 1;
if (chroma) {
if (chroma444) {
filter_mb_edgeh (&img_cb[j*uvlinesize], tmp_uvlinesize, bS, chroma_qp_avg[0], a, b, h, 0);
@@ -540,7 +538,7 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u
if( IS_INTRA(mb_type|mbm_type)) {
AV_WN64A(bS, 0x0003000300030003ULL);
if ( (!IS_INTERLACED(mb_type|mbm_type))
- || ((FRAME_MBAFF || (s->picture_structure != PICT_FRAME)) && (dir == 0))
+ || ((FRAME_MBAFF || (h->picture_structure != PICT_FRAME)) && (dir == 0))
)
AV_WN64A(bS, 0x0004000400040004ULL);
} else {
@@ -582,10 +580,10 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u
// Do not use s->qscale as luma quantizer because it has not the same
// value in IPCM macroblocks.
if(bS[0]+bS[1]+bS[2]+bS[3]){
- qp = (s->current_picture.f.qscale_table[mb_xy] + s->current_picture.f.qscale_table[mbm_xy] + 1) >> 1;
- tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
- chroma_qp_avg[0] = (h->chroma_qp[0] + get_chroma_qp(h, 0, s->current_picture.f.qscale_table[mbm_xy]) + 1) >> 1;
- chroma_qp_avg[1] = (h->chroma_qp[1] + get_chroma_qp(h, 1, s->current_picture.f.qscale_table[mbm_xy]) + 1) >> 1;
+ qp = (h->cur_pic.f.qscale_table[mb_xy] + h->cur_pic.f.qscale_table[mbm_xy] + 1) >> 1;
+ tprintf(h->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
+ chroma_qp_avg[0] = (h->chroma_qp[0] + get_chroma_qp(h, 0, h->cur_pic.f.qscale_table[mbm_xy]) + 1) >> 1;
+ chroma_qp_avg[1] = (h->chroma_qp[1] + get_chroma_qp(h, 1, h->cur_pic.f.qscale_table[mbm_xy]) + 1) >> 1;
if( dir == 0 ) {
filter_mb_edgev( &img_y[0], linesize, bS, qp, a, b, h, 1 );
if (chroma) {
@@ -665,8 +663,8 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u
/* Filter edge */
// Do not use s->qscale as luma quantizer because it has not the same
// value in IPCM macroblocks.
- qp = s->current_picture.f.qscale_table[mb_xy];
- tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
+ qp = h->cur_pic.f.qscale_table[mb_xy];
+ tprintf(h->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
if( dir == 0 ) {
filter_mb_edgev( &img_y[4*edge << h->pixel_shift], linesize, bS, qp, a, b, h, 0 );
if (chroma) {
@@ -703,13 +701,12 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u
}
void ff_h264_filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize) {
- MpegEncContext * const s = &h->s;
- const int mb_xy= mb_x + mb_y*s->mb_stride;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
+ const int mb_xy= mb_x + mb_y*h->mb_stride;
+ const int mb_type = h->cur_pic.f.mb_type[mb_xy];
const int mvy_limit = IS_INTERLACED(mb_type) ? 2 : 4;
int first_vertical_edge_done = 0;
av_unused int dir;
- int chroma = !(CONFIG_GRAY && (s->flags&CODEC_FLAG_GRAY));
+ int chroma = !(CONFIG_GRAY && (h->flags&CODEC_FLAG_GRAY));
int qp_bd_offset = 6 * (h->sps.bit_depth_luma - 8);
int a = h->slice_alpha_c0_offset - qp_bd_offset;
int b = h->slice_beta_offset - qp_bd_offset;
@@ -761,9 +758,9 @@ void ff_h264_filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint
}
}
- mb_qp = s->current_picture.f.qscale_table[mb_xy];
- mbn0_qp = s->current_picture.f.qscale_table[h->left_mb_xy[0]];
- mbn1_qp = s->current_picture.f.qscale_table[h->left_mb_xy[1]];
+ mb_qp = h->cur_pic.f.qscale_table[mb_xy];
+ mbn0_qp = h->cur_pic.f.qscale_table[h->left_mb_xy[0]];
+ mbn1_qp = h->cur_pic.f.qscale_table[h->left_mb_xy[1]];
qp[0] = ( mb_qp + mbn0_qp + 1 ) >> 1;
bqp[0] = ( get_chroma_qp( h, 0, mb_qp ) +
get_chroma_qp( h, 0, mbn0_qp ) + 1 ) >> 1;
@@ -776,8 +773,8 @@ void ff_h264_filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint
get_chroma_qp( h, 1, mbn1_qp ) + 1 ) >> 1;
/* Filter edge */
- tprintf(s->avctx, "filter mb:%d/%d MBAFF, QPy:%d/%d, QPb:%d/%d QPr:%d/%d ls:%d uvls:%d", mb_x, mb_y, qp[0], qp[1], bqp[0], bqp[1], rqp[0], rqp[1], linesize, uvlinesize);
- { int i; for (i = 0; i < 8; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
+ tprintf(h->avctx, "filter mb:%d/%d MBAFF, QPy:%d/%d, QPb:%d/%d QPr:%d/%d ls:%d uvls:%d", mb_x, mb_y, qp[0], qp[1], bqp[0], bqp[1], rqp[0], rqp[1], linesize, uvlinesize);
+ { int i; for (i = 0; i < 8; i++) tprintf(h->avctx, " bS[%d]:%d", i, bS[i]); tprintf(h->avctx, "\n"); }
if(MB_FIELD){
filter_mb_mbaff_edgev ( h, img_y , linesize, bS , 1, qp [0], a, b, 1 );
filter_mb_mbaff_edgev ( h, img_y + 8* linesize, linesize, bS+4, 1, qp [1], a, b, 1 );
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c
index 167509e..7ff7edd 100644
--- a/libavcodec/h264_mb_template.c
+++ b/libavcodec/h264_mb_template.c
@@ -40,39 +40,38 @@
static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
{
- MpegEncContext *const s = &h->s;
- const int mb_x = s->mb_x;
- const int mb_y = s->mb_y;
+ const int mb_x = h->mb_x;
+ const int mb_y = h->mb_y;
const int mb_xy = h->mb_xy;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
+ const int mb_type = h->cur_pic.f.mb_type[mb_xy];
uint8_t *dest_y, *dest_cb, *dest_cr;
int linesize, uvlinesize /*dct_offset*/;
int i, j;
int *block_offset = &h->block_offset[0];
- const int transform_bypass = !SIMPLE && (s->qscale == 0 && h->sps.transform_bypass);
+ const int transform_bypass = !SIMPLE && (h->qscale == 0 && h->sps.transform_bypass);
/* is_h264 should always be true if SVQ3 is disabled. */
- const int is_h264 = !CONFIG_SVQ3_DECODER || SIMPLE || s->codec_id == AV_CODEC_ID_H264;
+ const int is_h264 = !CONFIG_SVQ3_DECODER || SIMPLE || h->avctx->codec_id == AV_CODEC_ID_H264;
void (*idct_add)(uint8_t *dst, int16_t *block, int stride);
- const int block_h = 16 >> s->chroma_y_shift;
+ const int block_h = 16 >> h->chroma_y_shift;
const int chroma422 = CHROMA422;
- dest_y = s->current_picture.f.data[0] + ((mb_x << PIXEL_SHIFT) + mb_y * s->linesize) * 16;
- dest_cb = s->current_picture.f.data[1] + (mb_x << PIXEL_SHIFT) * 8 + mb_y * s->uvlinesize * block_h;
- dest_cr = s->current_picture.f.data[2] + (mb_x << PIXEL_SHIFT) * 8 + mb_y * s->uvlinesize * block_h;
+ dest_y = h->cur_pic.f.data[0] + ((mb_x << PIXEL_SHIFT) + mb_y * h->linesize) * 16;
+ dest_cb = h->cur_pic.f.data[1] + (mb_x << PIXEL_SHIFT) * 8 + mb_y * h->uvlinesize * block_h;
+ dest_cr = h->cur_pic.f.data[2] + (mb_x << PIXEL_SHIFT) * 8 + mb_y * h->uvlinesize * block_h;
- s->vdsp.prefetch(dest_y + (s->mb_x & 3) * 4 * s->linesize + (64 << PIXEL_SHIFT), s->linesize, 4);
- s->vdsp.prefetch(dest_cb + (s->mb_x & 7) * s->uvlinesize + (64 << PIXEL_SHIFT), dest_cr - dest_cb, 2);
+ h->vdsp.prefetch(dest_y + (h->mb_x & 3) * 4 * h->linesize + (64 << PIXEL_SHIFT), h->linesize, 4);
+ h->vdsp.prefetch(dest_cb + (h->mb_x & 7) * h->uvlinesize + (64 << PIXEL_SHIFT), dest_cr - dest_cb, 2);
h->list_counts[mb_xy] = h->list_count;
if (!SIMPLE && MB_FIELD) {
- linesize = h->mb_linesize = s->linesize * 2;
- uvlinesize = h->mb_uvlinesize = s->uvlinesize * 2;
+ linesize = h->mb_linesize = h->linesize * 2;
+ uvlinesize = h->mb_uvlinesize = h->uvlinesize * 2;
block_offset = &h->block_offset[48];
if (mb_y & 1) { // FIXME move out of this function?
- dest_y -= s->linesize * 15;
- dest_cb -= s->uvlinesize * (block_h - 1);
- dest_cr -= s->uvlinesize * (block_h - 1);
+ dest_y -= h->linesize * 15;
+ dest_cb -= h->uvlinesize * (block_h - 1);
+ dest_cr -= h->uvlinesize * (block_h - 1);
}
if (FRAME_MBAFF) {
int list;
@@ -81,20 +80,20 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
continue;
if (IS_16X16(mb_type)) {
int8_t *ref = &h->ref_cache[list][scan8[0]];
- fill_rectangle(ref, 4, 4, 8, (16 + *ref) ^ (s->mb_y & 1), 1);
+ fill_rectangle(ref, 4, 4, 8, (16 + *ref) ^ (h->mb_y & 1), 1);
} else {
for (i = 0; i < 16; i += 4) {
int ref = h->ref_cache[list][scan8[i]];
if (ref >= 0)
fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2,
- 8, (16 + ref) ^ (s->mb_y & 1), 1);
+ 8, (16 + ref) ^ (h->mb_y & 1), 1);
}
}
}
}
} else {
- linesize = h->mb_linesize = s->linesize;
- uvlinesize = h->mb_uvlinesize = s->uvlinesize;
+ linesize = h->mb_linesize = h->linesize;
+ uvlinesize = h->mb_uvlinesize = h->uvlinesize;
// dct_offset = s->linesize * 16;
}
@@ -111,7 +110,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
for (j = 0; j < 16; j++)
tmp_y[j] = get_bits(&gb, bit_depth);
}
- if (SIMPLE || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
+ if (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) {
if (!h->sps.chroma_format_idc) {
for (i = 0; i < block_h; i++) {
uint16_t *tmp_cb = (uint16_t *)(dest_cb + i * uvlinesize);
@@ -139,7 +138,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
} else {
for (i = 0; i < 16; i++)
memcpy(dest_y + i * linesize, (uint8_t *)h->mb + i * 16, 16);
- if (SIMPLE || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
+ if (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) {
if (!h->sps.chroma_format_idc) {
for (i = 0; i < block_h; i++) {
memset(dest_cb + i * uvlinesize, 128, 8);
@@ -161,7 +160,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize,
uvlinesize, 1, 0, SIMPLE, PIXEL_SHIFT);
- if (SIMPLE || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
+ if (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) {
h->hpc.pred8x8[h->chroma_pred_mode](dest_cb, uvlinesize);
h->hpc.pred8x8[h->chroma_pred_mode](dest_cr, uvlinesize);
}
@@ -176,14 +175,14 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
} else if (is_h264) {
if (chroma422) {
FUNC(hl_motion_422)(h, dest_y, dest_cb, dest_cr,
- s->me.qpel_put, h->h264chroma.put_h264_chroma_pixels_tab,
- s->me.qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab,
+ h->me.qpel_put, h->h264chroma.put_h264_chroma_pixels_tab,
+ h->me.qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab,
h->h264dsp.weight_h264_pixels_tab,
h->h264dsp.biweight_h264_pixels_tab);
} else {
FUNC(hl_motion_420)(h, dest_y, dest_cb, dest_cr,
- s->me.qpel_put, h->h264chroma.put_h264_chroma_pixels_tab,
- s->me.qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab,
+ h->me.qpel_put, h->h264chroma.put_h264_chroma_pixels_tab,
+ h->me.qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab,
h->h264dsp.weight_h264_pixels_tab,
h->h264dsp.biweight_h264_pixels_tab);
}
@@ -192,7 +191,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
hl_decode_mb_idct_luma(h, mb_type, is_h264, SIMPLE, transform_bypass,
PIXEL_SHIFT, block_offset, linesize, dest_y, 0);
- if ((SIMPLE || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) &&
+ if ((SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) &&
(h->cbp & 0x30)) {
uint8_t *dest[2] = { dest_cb, dest_cr };
if (transform_bypass) {
@@ -208,7 +207,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
h->mb + (16 * 16 * 2 << PIXEL_SHIFT),
uvlinesize);
} else {
- idct_add = s->dsp.add_pixels4;
+ idct_add = h->dsp.add_pixels4;
for (j = 1; j < 3; j++) {
for (i = j * 16; i < j * 16 + 4; i++)
if (h->non_zero_count_cache[scan8[i]] ||
@@ -256,7 +255,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
uint8_t *const ptr = dest[j - 1] + block_offset[i];
ff_svq3_add_idct_c(ptr, h->mb + i * 16,
uvlinesize,
- ff_h264_chroma_qp[0][s->qscale + 12] - 12, 2);
+ ff_h264_chroma_qp[0][h->qscale + 12] - 12, 2);
}
}
}
@@ -264,8 +263,8 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
}
}
if (h->cbp || IS_INTRA(mb_type)) {
- s->dsp.clear_blocks(h->mb);
- s->dsp.clear_blocks(h->mb + (24 * 16 << PIXEL_SHIFT));
+ h->dsp.clear_blocks(h->mb);
+ h->dsp.clear_blocks(h->mb + (24 * 16 << PIXEL_SHIFT));
}
}
@@ -277,33 +276,32 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h)
{
- MpegEncContext *const s = &h->s;
- const int mb_x = s->mb_x;
- const int mb_y = s->mb_y;
+ const int mb_x = h->mb_x;
+ const int mb_y = h->mb_y;
const int mb_xy = h->mb_xy;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
+ const int mb_type = h->cur_pic.f.mb_type[mb_xy];
uint8_t *dest[3];
int linesize;
int i, j, p;
int *block_offset = &h->block_offset[0];
- const int transform_bypass = !SIMPLE && (s->qscale == 0 && h->sps.transform_bypass);
- const int plane_count = (SIMPLE || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) ? 3 : 1;
+ const int transform_bypass = !SIMPLE && (h->qscale == 0 && h->sps.transform_bypass);
+ const int plane_count = (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) ? 3 : 1;
for (p = 0; p < plane_count; p++) {
- dest[p] = s->current_picture.f.data[p] +
- ((mb_x << PIXEL_SHIFT) + mb_y * s->linesize) * 16;
- s->vdsp.prefetch(dest[p] + (s->mb_x & 3) * 4 * s->linesize + (64 << PIXEL_SHIFT),
- s->linesize, 4);
+ dest[p] = h->cur_pic.f.data[p] +
+ ((mb_x << PIXEL_SHIFT) + mb_y * h->linesize) * 16;
+ h->vdsp.prefetch(dest[p] + (h->mb_x & 3) * 4 * h->linesize + (64 << PIXEL_SHIFT),
+ h->linesize, 4);
}
h->list_counts[mb_xy] = h->list_count;
if (!SIMPLE && MB_FIELD) {
- linesize = h->mb_linesize = h->mb_uvlinesize = s->linesize * 2;
+ linesize = h->mb_linesize = h->mb_uvlinesize = h->linesize * 2;
block_offset = &h->block_offset[48];
if (mb_y & 1) // FIXME move out of this function?
for (p = 0; p < 3; p++)
- dest[p] -= s->linesize * 15;
+ dest[p] -= h->linesize * 15;
if (FRAME_MBAFF) {
int list;
for (list = 0; list < h->list_count; list++) {
@@ -311,19 +309,19 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h)
continue;
if (IS_16X16(mb_type)) {
int8_t *ref = &h->ref_cache[list][scan8[0]];
- fill_rectangle(ref, 4, 4, 8, (16 + *ref) ^ (s->mb_y & 1), 1);
+ fill_rectangle(ref, 4, 4, 8, (16 + *ref) ^ (h->mb_y & 1), 1);
} else {
for (i = 0; i < 16; i += 4) {
int ref = h->ref_cache[list][scan8[i]];
if (ref >= 0)
fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2,
- 8, (16 + ref) ^ (s->mb_y & 1), 1);
+ 8, (16 + ref) ^ (h->mb_y & 1), 1);
}
}
}
}
} else {
- linesize = h->mb_linesize = h->mb_uvlinesize = s->linesize;
+ linesize = h->mb_linesize = h->mb_uvlinesize = h->linesize;
}
if (!SIMPLE && IS_INTRA_PCM(mb_type)) {
@@ -360,8 +358,8 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h)
linesize, 0, 1, SIMPLE, PIXEL_SHIFT);
} else {
FUNC(hl_motion_444)(h, dest[0], dest[1], dest[2],
- s->me.qpel_put, h->h264chroma.put_h264_chroma_pixels_tab,
- s->me.qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab,
+ h->me.qpel_put, h->h264chroma.put_h264_chroma_pixels_tab,
+ h->me.qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab,
h->h264dsp.weight_h264_pixels_tab,
h->h264dsp.biweight_h264_pixels_tab);
}
@@ -372,8 +370,8 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h)
dest[p], p);
}
if (h->cbp || IS_INTRA(mb_type)) {
- s->dsp.clear_blocks(h->mb);
- s->dsp.clear_blocks(h->mb + (24 * 16 << PIXEL_SHIFT));
+ h->dsp.clear_blocks(h->mb);
+ h->dsp.clear_blocks(h->mb + (24 * 16 << PIXEL_SHIFT));
}
}
diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c
index a3af39b..ad54558 100644
--- a/libavcodec/h264_mc_template.c
+++ b/libavcodec/h264_mc_template.c
@@ -46,7 +46,7 @@ static void mc_part(H264Context *h, int n, int square,
int list0, int list1)
{
if ((h->use_weight == 2 && list0 && list1 &&
- (h->implicit_weight[h->ref_cache[0][scan8[n]]][h->ref_cache[1][scan8[n]]][h->s.mb_y & 1] != 32)) ||
+ (h->implicit_weight[h->ref_cache[0][scan8[n]]][h->ref_cache[1][scan8[n]]][h->mb_y & 1] != 32)) ||
h->use_weight == 1)
mc_part_weighted(h, n, square, height, delta, dest_y, dest_cb, dest_cr,
x_offset, y_offset, qpix_put, chroma_put,
@@ -67,13 +67,12 @@ static void MCFUNC(hl_motion)(H264Context *h, uint8_t *dest_y,
h264_weight_func *weight_op,
h264_biweight_func *weight_avg)
{
- MpegEncContext *const s = &h->s;
const int mb_xy = h->mb_xy;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
+ const int mb_type = h->cur_pic.f.mb_type[mb_xy];
assert(IS_INTER(mb_type));
- if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME))
+ if (HAVE_THREADS && (h->avctx->active_thread_type & FF_THREAD_FRAME))
await_references(h);
prefetch_motion(h, 0, PIXEL_SHIFT, CHROMA_IDC);
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h
index 5244c29..b49ff31 100644
--- a/libavcodec/h264_mvpred.h
+++ b/libavcodec/h264_mvpred.h
@@ -39,32 +39,31 @@ static av_always_inline int fetch_diagonal_mv(H264Context *h, const int16_t **C,
int i, int list, int part_width)
{
const int topright_ref = h->ref_cache[list][i - 8 + part_width];
- MpegEncContext *s = &h->s;
/* there is no consistent mapping of mvs to neighboring locations that will
* make mbaff happy, so we can't move all this logic to fill_caches */
if (FRAME_MBAFF) {
#define SET_DIAG_MV(MV_OP, REF_OP, XY, Y4) \
const int xy = XY, y4 = Y4; \
- const int mb_type = mb_types[xy + (y4 >> 2) * s->mb_stride]; \
+ const int mb_type = mb_types[xy + (y4 >> 2) * h->mb_stride]; \
if (!USES_LIST(mb_type, list)) \
return LIST_NOT_USED; \
- mv = s->current_picture_ptr->f.motion_val[list][h->mb2b_xy[xy] + 3 + y4 * h->b_stride]; \
+ mv = h->cur_pic_ptr->f.motion_val[list][h->mb2b_xy[xy] + 3 + y4 * h->b_stride]; \
h->mv_cache[list][scan8[0] - 2][0] = mv[0]; \
h->mv_cache[list][scan8[0] - 2][1] = mv[1] MV_OP; \
- return s->current_picture_ptr->f.ref_index[list][4 * xy + 1 + (y4 & ~1)] REF_OP;
+ return h->cur_pic_ptr->f.ref_index[list][4 * xy + 1 + (y4 & ~1)] REF_OP;
if (topright_ref == PART_NOT_AVAILABLE
&& i >= scan8[0] + 8 && (i & 7) == 4
&& h->ref_cache[list][scan8[0] - 1] != PART_NOT_AVAILABLE) {
- const uint32_t *mb_types = s->current_picture_ptr->f.mb_type;
+ const uint32_t *mb_types = h->cur_pic_ptr->f.mb_type;
const int16_t *mv;
AV_ZERO32(h->mv_cache[list][scan8[0] - 2]);
*C = h->mv_cache[list][scan8[0] - 2];
if (!MB_FIELD && IS_INTERLACED(h->left_type[0])) {
- SET_DIAG_MV(* 2, >> 1, h->left_mb_xy[0] + s->mb_stride,
- (s->mb_y & 1) * 2 + (i >> 5));
+ SET_DIAG_MV(* 2, >> 1, h->left_mb_xy[0] + h->mb_stride,
+ (h->mb_y & 1) * 2 + (i >> 5));
}
if (MB_FIELD && !IS_INTERLACED(h->left_type[0])) {
// left shift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's OK.
@@ -78,7 +77,7 @@ static av_always_inline int fetch_diagonal_mv(H264Context *h, const int16_t **C,
*C = h->mv_cache[list][i - 8 + part_width];
return topright_ref;
} else {
- tprintf(s->avctx, "topright MV not available\n");
+ tprintf(h->avctx, "topright MV not available\n");
*C = h->mv_cache[list][i - 8 - 1];
return h->ref_cache[list][i - 8 - 1];
@@ -116,7 +115,7 @@ static av_always_inline void pred_motion(H264Context *const h, int n,
diagonal_ref = fetch_diagonal_mv(h, &C, index8, list, part_width);
match_count = (diagonal_ref == ref) + (top_ref == ref) + (left_ref == ref);
- tprintf(h->s.avctx, "pred_motion match_count=%d\n", match_count);
+ tprintf(h->avctx, "pred_motion match_count=%d\n", match_count);
if (match_count > 1) { //most common
*mx = mid_pred(A[0], B[0], C[0]);
*my = mid_pred(A[1], B[1], C[1]);
@@ -143,10 +142,10 @@ static av_always_inline void pred_motion(H264Context *const h, int n,
}
}
- tprintf(h->s.avctx,
+ tprintf(h->avctx,
"pred_motion (%2d %2d %2d) (%2d %2d %2d) (%2d %2d %2d) -> (%2d %2d %2d) at %2d %2d %d list %d\n",
top_ref, B[0], B[1], diagonal_ref, C[0], C[1], left_ref,
- A[0], A[1], ref, *mx, *my, h->s.mb_x, h->s.mb_y, n, list);
+ A[0], A[1], ref, *mx, *my, h->mb_x, h->mb_y, n, list);
}
/**
@@ -163,8 +162,8 @@ static av_always_inline void pred_16x8_motion(H264Context *const h,
const int top_ref = h->ref_cache[list][scan8[0] - 8];
const int16_t *const B = h->mv_cache[list][scan8[0] - 8];
- tprintf(h->s.avctx, "pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n",
- top_ref, B[0], B[1], h->s.mb_x, h->s.mb_y, n, list);
+ tprintf(h->avctx, "pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n",
+ top_ref, B[0], B[1], h->mb_x, h->mb_y, n, list);
if (top_ref == ref) {
*mx = B[0];
@@ -175,8 +174,8 @@ static av_always_inline void pred_16x8_motion(H264Context *const h,
const int left_ref = h->ref_cache[list][scan8[8] - 1];
const int16_t *const A = h->mv_cache[list][scan8[8] - 1];
- tprintf(h->s.avctx, "pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n",
- left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list);
+ tprintf(h->avctx, "pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n",
+ left_ref, A[0], A[1], h->mb_x, h->mb_y, n, list);
if (left_ref == ref) {
*mx = A[0];
@@ -203,8 +202,8 @@ static av_always_inline void pred_8x16_motion(H264Context *const h,
const int left_ref = h->ref_cache[list][scan8[0] - 1];
const int16_t *const A = h->mv_cache[list][scan8[0] - 1];
- tprintf(h->s.avctx, "pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n",
- left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list);
+ tprintf(h->avctx, "pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n",
+ left_ref, A[0], A[1], h->mb_x, h->mb_y, n, list);
if (left_ref == ref) {
*mx = A[0];
@@ -217,8 +216,8 @@ static av_always_inline void pred_8x16_motion(H264Context *const h,
diagonal_ref = fetch_diagonal_mv(h, &C, scan8[4], list, 2);
- tprintf(h->s.avctx, "pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n",
- diagonal_ref, C[0], C[1], h->s.mb_x, h->s.mb_y, n, list);
+ tprintf(h->avctx, "pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n",
+ diagonal_ref, C[0], C[1], h->mb_x, h->mb_y, n, list);
if (diagonal_ref == ref) {
*mx = C[0];
@@ -254,9 +253,8 @@ static av_always_inline void pred_pskip_motion(H264Context *const h)
{
DECLARE_ALIGNED(4, static const int16_t, zeromv)[2] = { 0 };
DECLARE_ALIGNED(4, int16_t, mvbuf)[3][2];
- MpegEncContext *const s = &h->s;
- int8_t *ref = s->current_picture.f.ref_index[0];
- int16_t(*mv)[2] = s->current_picture.f.motion_val[0];
+ int8_t *ref = h->cur_pic.f.ref_index[0];
+ int16_t(*mv)[2] = h->cur_pic.f.motion_val[0];
int top_ref, left_ref, diagonal_ref, match_count, mx, my;
const int16_t *A, *B, *C;
int b_stride = h->b_stride;
@@ -294,8 +292,8 @@ static av_always_inline void pred_pskip_motion(H264Context *const h)
goto zeromv;
}
- tprintf(h->s.avctx, "pred_pskip: (%d) (%d) at %2d %2d\n",
- top_ref, left_ref, h->s.mb_x, h->s.mb_y);
+ tprintf(h->avctx, "pred_pskip: (%d) (%d) at %2d %2d\n",
+ top_ref, left_ref, h->mb_x, h->mb_y);
if (USES_LIST(h->topright_type, 0)) {
diagonal_ref = ref[4 * h->topright_mb_xy + 2];
@@ -321,7 +319,7 @@ static av_always_inline void pred_pskip_motion(H264Context *const h)
}
match_count = !diagonal_ref + !top_ref + !left_ref;
- tprintf(h->s.avctx, "pred_pskip_motion match_count=%d\n", match_count);
+ tprintf(h->avctx, "pred_pskip_motion match_count=%d\n", match_count);
if (match_count > 1) {
mx = mid_pred(A[0], B[0], C[0]);
my = mid_pred(A[1], B[1], C[1]);
@@ -351,7 +349,6 @@ zeromv:
static void fill_decode_neighbors(H264Context *h, int mb_type)
{
- MpegEncContext *const s = &h->s;
const int mb_xy = h->mb_xy;
int topleft_xy, top_xy, topright_xy, left_xy[LEFT_MBS];
static const uint8_t left_block_options[4][32] = {
@@ -363,7 +360,7 @@ static void fill_decode_neighbors(H264Context *h, int mb_type)
h->topleft_partition = -1;
- top_xy = mb_xy - (s->mb_stride << MB_FIELD);
+ top_xy = mb_xy - (h->mb_stride << MB_FIELD);
/* Wow, what a mess, why didn't they simplify the interlacing & intra
* stuff, I can't imagine that these complex rules are worth it. */
@@ -373,16 +370,16 @@ static void fill_decode_neighbors(H264Context *h, int mb_type)
left_xy[LBOT] = left_xy[LTOP] = mb_xy - 1;
h->left_block = left_block_options[0];
if (FRAME_MBAFF) {
- const int left_mb_field_flag = IS_INTERLACED(s->current_picture.f.mb_type[mb_xy - 1]);
+ const int left_mb_field_flag = IS_INTERLACED(h->cur_pic.f.mb_type[mb_xy - 1]);
const int curr_mb_field_flag = IS_INTERLACED(mb_type);
- if (s->mb_y & 1) {
+ if (h->mb_y & 1) {
if (left_mb_field_flag != curr_mb_field_flag) {
- left_xy[LBOT] = left_xy[LTOP] = mb_xy - s->mb_stride - 1;
+ left_xy[LBOT] = left_xy[LTOP] = mb_xy - h->mb_stride - 1;
if (curr_mb_field_flag) {
- left_xy[LBOT] += s->mb_stride;
+ left_xy[LBOT] += h->mb_stride;
h->left_block = left_block_options[3];
} else {
- topleft_xy += s->mb_stride;
+ topleft_xy += h->mb_stride;
/* take top left mv from the middle of the mb, as opposed
* to all other modes which use the bottom right partition */
h->topleft_partition = 0;
@@ -391,13 +388,13 @@ static void fill_decode_neighbors(H264Context *h, int mb_type)
}
} else {
if (curr_mb_field_flag) {
- topleft_xy += s->mb_stride & (((s->current_picture.f.mb_type[top_xy - 1] >> 7) & 1) - 1);
- topright_xy += s->mb_stride & (((s->current_picture.f.mb_type[top_xy + 1] >> 7) & 1) - 1);
- top_xy += s->mb_stride & (((s->current_picture.f.mb_type[top_xy] >> 7) & 1) - 1);
+ topleft_xy += h->mb_stride & (((h->cur_pic.f.mb_type[top_xy - 1] >> 7) & 1) - 1);
+ topright_xy += h->mb_stride & (((h->cur_pic.f.mb_type[top_xy + 1] >> 7) & 1) - 1);
+ top_xy += h->mb_stride & (((h->cur_pic.f.mb_type[top_xy] >> 7) & 1) - 1);
}
if (left_mb_field_flag != curr_mb_field_flag) {
if (curr_mb_field_flag) {
- left_xy[LBOT] += s->mb_stride;
+ left_xy[LBOT] += h->mb_stride;
h->left_block = left_block_options[3];
} else {
h->left_block = left_block_options[2];
@@ -413,11 +410,11 @@ static void fill_decode_neighbors(H264Context *h, int mb_type)
h->left_mb_xy[LBOT] = left_xy[LBOT];
//FIXME do we need all in the context?
- h->topleft_type = s->current_picture.f.mb_type[topleft_xy];
- h->top_type = s->current_picture.f.mb_type[top_xy];
- h->topright_type = s->current_picture.f.mb_type[topright_xy];
- h->left_type[LTOP] = s->current_picture.f.mb_type[left_xy[LTOP]];
- h->left_type[LBOT] = s->current_picture.f.mb_type[left_xy[LBOT]];
+ h->topleft_type = h->cur_pic.f.mb_type[topleft_xy];
+ h->top_type = h->cur_pic.f.mb_type[top_xy];
+ h->topright_type = h->cur_pic.f.mb_type[topright_xy];
+ h->left_type[LTOP] = h->cur_pic.f.mb_type[left_xy[LTOP]];
+ h->left_type[LBOT] = h->cur_pic.f.mb_type[left_xy[LBOT]];
if (FMO) {
if (h->slice_table[topleft_xy] != h->slice_num)
@@ -441,7 +438,6 @@ static void fill_decode_neighbors(H264Context *h, int mb_type)
static void fill_decode_caches(H264Context *h, int mb_type)
{
- MpegEncContext *const s = &h->s;
int topleft_xy, top_xy, topright_xy, left_xy[LEFT_MBS];
int topleft_type, top_type, topright_type, left_type[LEFT_MBS];
const uint8_t *left_block = h->left_block;
@@ -484,7 +480,7 @@ static void fill_decode_caches(H264Context *h, int mb_type)
h->left_samples_available &= 0xFF5F;
}
} else {
- int left_typei = s->current_picture.f.mb_type[left_xy[LTOP] + s->mb_stride];
+ int left_typei = h->cur_pic.f.mb_type[left_xy[LTOP] + h->mb_stride];
assert(left_xy[LTOP] == left_xy[LBOT]);
if (!((left_typei & type_mask) && (left_type[LTOP] & type_mask))) {
@@ -541,7 +537,7 @@ static void fill_decode_caches(H264Context *h, int mb_type)
if (top_type) {
nnz = h->non_zero_count[top_xy];
AV_COPY32(&nnz_cache[4 + 8 * 0], &nnz[4 * 3]);
- if (!s->chroma_y_shift) {
+ if (!h->chroma_y_shift) {
AV_COPY32(&nnz_cache[4 + 8 * 5], &nnz[4 * 7]);
AV_COPY32(&nnz_cache[4 + 8 * 10], &nnz[4 * 11]);
} else {
@@ -606,9 +602,9 @@ static void fill_decode_caches(H264Context *h, int mb_type)
int b_stride = h->b_stride;
for (list = 0; list < h->list_count; list++) {
int8_t *ref_cache = &h->ref_cache[list][scan8[0]];
- int8_t *ref = s->current_picture.f.ref_index[list];
+ int8_t *ref = h->cur_pic.f.ref_index[list];
int16_t(*mv_cache)[2] = &h->mv_cache[list][scan8[0]];
- int16_t(*mv)[2] = s->current_picture.f.motion_val[list];
+ int16_t(*mv)[2] = h->cur_pic.f.motion_val[list];
if (!USES_LIST(mb_type, list))
continue;
assert(!(IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred));
@@ -800,7 +796,6 @@ static void fill_decode_caches(H264Context *h, int mb_type)
*/
static void av_unused decode_mb_skip(H264Context *h)
{
- MpegEncContext *const s = &h->s;
const int mb_xy = h->mb_xy;
int mb_type = 0;
@@ -826,10 +821,10 @@ static void av_unused decode_mb_skip(H264Context *h)
}
write_back_motion(h, mb_type);
- s->current_picture.f.mb_type[mb_xy] = mb_type;
- s->current_picture.f.qscale_table[mb_xy] = s->qscale;
- h->slice_table[mb_xy] = h->slice_num;
- h->prev_mb_skipped = 1;
+ h->cur_pic.f.mb_type[mb_xy] = mb_type;
+ h->cur_pic.f.qscale_table[mb_xy] = h->qscale;
+ h->slice_table[mb_xy] = h->slice_num;
+ h->prev_mb_skipped = 1;
}
#endif /* AVCODEC_H264_MVPRED_H */
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index 0464476..8c84d43 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -36,7 +36,7 @@ static int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_si
{
int i;
uint32_t state;
- ParseContext *pc = &(h->s.parse_context);
+ ParseContext *pc = &h->parse_context;
// mb_addr= pc->mb_addr - 1;
state= pc->state;
if(state>13)
@@ -119,7 +119,7 @@ static inline int parse_nal_units(AVCodecParserContext *s,
s->pict_type = AV_PICTURE_TYPE_I;
s->key_frame = 0;
- h->s.avctx= avctx;
+ h->avctx= avctx;
h->sei_recovery_frame_cnt = -1;
h->sei_dpb_output_delay = 0;
h->sei_cpb_removal_delay = -1;
@@ -147,13 +147,13 @@ static inline int parse_nal_units(AVCodecParserContext *s,
if (ptr==NULL || dst_length < 0)
break;
- init_get_bits(&h->s.gb, ptr, 8*dst_length);
+ init_get_bits(&h->gb, ptr, 8*dst_length);
switch(h->nal_unit_type) {
case NAL_SPS:
ff_h264_decode_seq_parameter_set(h);
break;
case NAL_PPS:
- ff_h264_decode_picture_parameter_set(h, h->s.gb.size_in_bits);
+ ff_h264_decode_picture_parameter_set(h, h->gb.size_in_bits);
break;
case NAL_SEI:
ff_h264_decode_sei(h);
@@ -162,40 +162,40 @@ static inline int parse_nal_units(AVCodecParserContext *s,
s->key_frame = 1;
/* fall through */
case NAL_SLICE:
- get_ue_golomb(&h->s.gb); // skip first_mb_in_slice
- slice_type = get_ue_golomb_31(&h->s.gb);
+ get_ue_golomb(&h->gb); // skip first_mb_in_slice
+ slice_type = get_ue_golomb_31(&h->gb);
s->pict_type = golomb_to_pict_type[slice_type % 5];
if (h->sei_recovery_frame_cnt >= 0) {
/* key frame, since recovery_frame_cnt is set */
s->key_frame = 1;
}
- pps_id= get_ue_golomb(&h->s.gb);
+ pps_id= get_ue_golomb(&h->gb);
if(pps_id>=MAX_PPS_COUNT) {
- av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
+ av_log(h->avctx, AV_LOG_ERROR, "pps_id out of range\n");
return -1;
}
if(!h->pps_buffers[pps_id]) {
- av_log(h->s.avctx, AV_LOG_ERROR, "non-existing PPS referenced\n");
+ av_log(h->avctx, AV_LOG_ERROR, "non-existing PPS referenced\n");
return -1;
}
h->pps= *h->pps_buffers[pps_id];
if(!h->sps_buffers[h->pps.sps_id]) {
- av_log(h->s.avctx, AV_LOG_ERROR, "non-existing SPS referenced\n");
+ av_log(h->avctx, AV_LOG_ERROR, "non-existing SPS referenced\n");
return -1;
}
h->sps = *h->sps_buffers[h->pps.sps_id];
- h->frame_num = get_bits(&h->s.gb, h->sps.log2_max_frame_num);
+ h->frame_num = get_bits(&h->gb, h->sps.log2_max_frame_num);
avctx->profile = ff_h264_get_profile(&h->sps);
avctx->level = h->sps.level_idc;
if(h->sps.frame_mbs_only_flag){
- h->s.picture_structure= PICT_FRAME;
+ h->picture_structure= PICT_FRAME;
}else{
- if(get_bits1(&h->s.gb)) { //field_pic_flag
- h->s.picture_structure= PICT_TOP_FIELD + get_bits1(&h->s.gb); //bottom_field_flag
+ if(get_bits1(&h->gb)) { //field_pic_flag
+ h->picture_structure= PICT_TOP_FIELD + get_bits1(&h->gb); //bottom_field_flag
} else {
- h->s.picture_structure= PICT_FRAME;
+ h->picture_structure= PICT_FRAME;
}
}
@@ -221,11 +221,11 @@ static inline int parse_nal_units(AVCodecParserContext *s,
s->repeat_pict = 5;
break;
default:
- s->repeat_pict = h->s.picture_structure == PICT_FRAME ? 1 : 0;
+ s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0;
break;
}
} else {
- s->repeat_pict = h->s.picture_structure == PICT_FRAME ? 1 : 0;
+ s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0;
}
return 0; /* no need to evaluate the rest */
@@ -233,7 +233,7 @@ static inline int parse_nal_units(AVCodecParserContext *s,
buf += consumed;
}
/* didn't find a picture! */
- av_log(h->s.avctx, AV_LOG_ERROR, "missing picture in access unit\n");
+ av_log(h->avctx, AV_LOG_ERROR, "missing picture in access unit\n");
return -1;
}
@@ -243,20 +243,20 @@ static int h264_parse(AVCodecParserContext *s,
const uint8_t *buf, int buf_size)
{
H264Context *h = s->priv_data;
- ParseContext *pc = &h->s.parse_context;
+ ParseContext *pc = &h->parse_context;
int next;
if (!h->got_first) {
h->got_first = 1;
if (avctx->extradata_size) {
- h->s.avctx = avctx;
+ h->avctx = avctx;
// must be done like in the decoder.
// otherwise opening the parser, creating extradata,
// and then closing and opening again
// will cause has_b_frames to be always set.
// NB: estimate_timings_from_pts behaves exactly like this.
if (!avctx->has_b_frames)
- h->s.low_delay = 1;
+ h->low_delay = 1;
ff_h264_decode_extradata(h);
}
}
@@ -326,7 +326,7 @@ static int h264_split(AVCodecContext *avctx,
static void close(AVCodecParserContext *s)
{
H264Context *h = s->priv_data;
- ParseContext *pc = &h->s.parse_context;
+ ParseContext *pc = &h->parse_context;
av_free(pc->buffer);
ff_h264_free_context(h);
@@ -336,7 +336,7 @@ static int init(AVCodecParserContext *s)
{
H264Context *h = s->priv_data;
h->thread_context[0] = h;
- h->s.slice_context_count = 1;
+ h->slice_context_count = 1;
return 0;
}
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 63f371c..e35dab2 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -121,46 +121,44 @@ static const uint8_t default_scaling8[2][64]={
}};
static inline int decode_hrd_parameters(H264Context *h, SPS *sps){
- MpegEncContext * const s = &h->s;
int cpb_count, i;
- cpb_count = get_ue_golomb_31(&s->gb) + 1;
+ cpb_count = get_ue_golomb_31(&h->gb) + 1;
if(cpb_count > 32U){
- av_log(h->s.avctx, AV_LOG_ERROR, "cpb_count %d invalid\n", cpb_count);
+ av_log(h->avctx, AV_LOG_ERROR, "cpb_count %d invalid\n", cpb_count);
return -1;
}
- get_bits(&s->gb, 4); /* bit_rate_scale */
- get_bits(&s->gb, 4); /* cpb_size_scale */
+ get_bits(&h->gb, 4); /* bit_rate_scale */
+ get_bits(&h->gb, 4); /* cpb_size_scale */
for(i=0; i<cpb_count; i++){
- get_ue_golomb_long(&s->gb); /* bit_rate_value_minus1 */
- get_ue_golomb_long(&s->gb); /* cpb_size_value_minus1 */
- get_bits1(&s->gb); /* cbr_flag */
+ get_ue_golomb_long(&h->gb); /* bit_rate_value_minus1 */
+ get_ue_golomb_long(&h->gb); /* cpb_size_value_minus1 */
+ get_bits1(&h->gb); /* cbr_flag */
}
- sps->initial_cpb_removal_delay_length = get_bits(&s->gb, 5) + 1;
- sps->cpb_removal_delay_length = get_bits(&s->gb, 5) + 1;
- sps->dpb_output_delay_length = get_bits(&s->gb, 5) + 1;
- sps->time_offset_length = get_bits(&s->gb, 5);
+ sps->initial_cpb_removal_delay_length = get_bits(&h->gb, 5) + 1;
+ sps->cpb_removal_delay_length = get_bits(&h->gb, 5) + 1;
+ sps->dpb_output_delay_length = get_bits(&h->gb, 5) + 1;
+ sps->time_offset_length = get_bits(&h->gb, 5);
sps->cpb_cnt = cpb_count;
return 0;
}
static inline int decode_vui_parameters(H264Context *h, SPS *sps){
- MpegEncContext * const s = &h->s;
int aspect_ratio_info_present_flag;
unsigned int aspect_ratio_idc;
- aspect_ratio_info_present_flag= get_bits1(&s->gb);
+ aspect_ratio_info_present_flag= get_bits1(&h->gb);
if( aspect_ratio_info_present_flag ) {
- aspect_ratio_idc= get_bits(&s->gb, 8);
+ aspect_ratio_idc= get_bits(&h->gb, 8);
if( aspect_ratio_idc == EXTENDED_SAR ) {
- sps->sar.num= get_bits(&s->gb, 16);
- sps->sar.den= get_bits(&s->gb, 16);
+ sps->sar.num= get_bits(&h->gb, 16);
+ sps->sar.den= get_bits(&h->gb, 16);
}else if(aspect_ratio_idc < FF_ARRAY_ELEMS(pixel_aspect)){
sps->sar= pixel_aspect[aspect_ratio_idc];
}else{
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
+ av_log(h->avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
return -1;
}
}else{
@@ -169,20 +167,20 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps){
}
// s->avctx->aspect_ratio= sar_width*s->width / (float)(s->height*sar_height);
- if(get_bits1(&s->gb)){ /* overscan_info_present_flag */
- get_bits1(&s->gb); /* overscan_appropriate_flag */
+ if(get_bits1(&h->gb)){ /* overscan_info_present_flag */
+ get_bits1(&h->gb); /* overscan_appropriate_flag */
}
- sps->video_signal_type_present_flag = get_bits1(&s->gb);
+ sps->video_signal_type_present_flag = get_bits1(&h->gb);
if(sps->video_signal_type_present_flag){
- get_bits(&s->gb, 3); /* video_format */
- sps->full_range = get_bits1(&s->gb); /* video_full_range_flag */
+ get_bits(&h->gb, 3); /* video_format */
+ sps->full_range = get_bits1(&h->gb); /* video_full_range_flag */
- sps->colour_description_present_flag = get_bits1(&s->gb);
+ sps->colour_description_present_flag = get_bits1(&h->gb);
if(sps->colour_description_present_flag){
- sps->color_primaries = get_bits(&s->gb, 8); /* colour_primaries */
- sps->color_trc = get_bits(&s->gb, 8); /* transfer_characteristics */
- sps->colorspace = get_bits(&s->gb, 8); /* matrix_coefficients */
+ sps->color_primaries = get_bits(&h->gb, 8); /* colour_primaries */
+ sps->color_trc = get_bits(&h->gb, 8); /* transfer_characteristics */
+ sps->colorspace = get_bits(&h->gb, 8); /* matrix_coefficients */
if (sps->color_primaries >= AVCOL_PRI_NB)
sps->color_primaries = AVCOL_PRI_UNSPECIFIED;
if (sps->color_trc >= AVCOL_TRC_NB)
@@ -192,56 +190,56 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps){
}
}
- if(get_bits1(&s->gb)){ /* chroma_location_info_present_flag */
- s->avctx->chroma_sample_location = get_ue_golomb(&s->gb)+1; /* chroma_sample_location_type_top_field */
- get_ue_golomb(&s->gb); /* chroma_sample_location_type_bottom_field */
+ if(get_bits1(&h->gb)){ /* chroma_location_info_present_flag */
+ h->avctx->chroma_sample_location = get_ue_golomb(&h->gb)+1; /* chroma_sample_location_type_top_field */
+ get_ue_golomb(&h->gb); /* chroma_sample_location_type_bottom_field */
}
- sps->timing_info_present_flag = get_bits1(&s->gb);
+ sps->timing_info_present_flag = get_bits1(&h->gb);
if(sps->timing_info_present_flag){
- sps->num_units_in_tick = get_bits_long(&s->gb, 32);
- sps->time_scale = get_bits_long(&s->gb, 32);
+ sps->num_units_in_tick = get_bits_long(&h->gb, 32);
+ sps->time_scale = get_bits_long(&h->gb, 32);
if(!sps->num_units_in_tick || !sps->time_scale){
- av_log(h->s.avctx, AV_LOG_ERROR, "time_scale/num_units_in_tick invalid or unsupported (%d/%d)\n", sps->time_scale, sps->num_units_in_tick);
+ av_log(h->avctx, AV_LOG_ERROR, "time_scale/num_units_in_tick invalid or unsupported (%d/%d)\n", sps->time_scale, sps->num_units_in_tick);
return -1;
}
- sps->fixed_frame_rate_flag = get_bits1(&s->gb);
+ sps->fixed_frame_rate_flag = get_bits1(&h->gb);
}
- sps->nal_hrd_parameters_present_flag = get_bits1(&s->gb);
+ sps->nal_hrd_parameters_present_flag = get_bits1(&h->gb);
if(sps->nal_hrd_parameters_present_flag)
if(decode_hrd_parameters(h, sps) < 0)
return -1;
- sps->vcl_hrd_parameters_present_flag = get_bits1(&s->gb);
+ sps->vcl_hrd_parameters_present_flag = get_bits1(&h->gb);
if(sps->vcl_hrd_parameters_present_flag)
if(decode_hrd_parameters(h, sps) < 0)
return -1;
if(sps->nal_hrd_parameters_present_flag || sps->vcl_hrd_parameters_present_flag)
- get_bits1(&s->gb); /* low_delay_hrd_flag */
- sps->pic_struct_present_flag = get_bits1(&s->gb);
+ get_bits1(&h->gb); /* low_delay_hrd_flag */
+ sps->pic_struct_present_flag = get_bits1(&h->gb);
- sps->bitstream_restriction_flag = get_bits1(&s->gb);
+ sps->bitstream_restriction_flag = get_bits1(&h->gb);
if(sps->bitstream_restriction_flag){
- get_bits1(&s->gb); /* motion_vectors_over_pic_boundaries_flag */
- get_ue_golomb(&s->gb); /* max_bytes_per_pic_denom */
- get_ue_golomb(&s->gb); /* max_bits_per_mb_denom */
- get_ue_golomb(&s->gb); /* log2_max_mv_length_horizontal */
- get_ue_golomb(&s->gb); /* log2_max_mv_length_vertical */
- sps->num_reorder_frames= get_ue_golomb(&s->gb);
- get_ue_golomb(&s->gb); /*max_dec_frame_buffering*/
-
- if (get_bits_left(&s->gb) < 0) {
+ get_bits1(&h->gb); /* motion_vectors_over_pic_boundaries_flag */
+ get_ue_golomb(&h->gb); /* max_bytes_per_pic_denom */
+ get_ue_golomb(&h->gb); /* max_bits_per_mb_denom */
+ get_ue_golomb(&h->gb); /* log2_max_mv_length_horizontal */
+ get_ue_golomb(&h->gb); /* log2_max_mv_length_vertical */
+ sps->num_reorder_frames= get_ue_golomb(&h->gb);
+ get_ue_golomb(&h->gb); /*max_dec_frame_buffering*/
+
+ if (get_bits_left(&h->gb) < 0) {
sps->num_reorder_frames=0;
sps->bitstream_restriction_flag= 0;
}
if(sps->num_reorder_frames > 16U /*max_dec_frame_buffering || max_dec_frame_buffering > 16*/){
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal num_reorder_frames %d\n", sps->num_reorder_frames);
+ av_log(h->avctx, AV_LOG_ERROR, "illegal num_reorder_frames %d\n", sps->num_reorder_frames);
return -1;
}
}
- if (get_bits_left(&s->gb) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR, "Overread VUI by %d bits\n", -get_bits_left(&s->gb));
+ if (get_bits_left(&h->gb) < 0) {
+ av_log(h->avctx, AV_LOG_ERROR, "Overread VUI by %d bits\n", -get_bits_left(&h->gb));
return AVERROR_INVALIDDATA;
}
@@ -250,15 +248,14 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps){
static void decode_scaling_list(H264Context *h, uint8_t *factors, int size,
const uint8_t *jvt_list, const uint8_t *fallback_list){
- MpegEncContext * const s = &h->s;
int i, last = 8, next = 8;
const uint8_t *scan = size == 16 ? zigzag_scan : ff_zigzag_direct;
- if(!get_bits1(&s->gb)) /* matrix not written, we use the predicted one */
+ if(!get_bits1(&h->gb)) /* matrix not written, we use the predicted one */
memcpy(factors, fallback_list, size*sizeof(uint8_t));
else
for(i=0;i<size;i++){
if(next)
- next = (last + get_se_golomb(&s->gb)) & 0xff;
+ next = (last + get_se_golomb(&h->gb)) & 0xff;
if(!i && !next){ /* matrix not written, we use the preset one */
memcpy(factors, jvt_list, size*sizeof(uint8_t));
break;
@@ -269,7 +266,6 @@ static void decode_scaling_list(H264Context *h, uint8_t *factors, int size,
static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_sps,
uint8_t (*scaling_matrix4)[16], uint8_t (*scaling_matrix8)[64]){
- MpegEncContext * const s = &h->s;
int fallback_sps = !is_sps && sps->scaling_matrix_present;
const uint8_t *fallback[4] = {
fallback_sps ? sps->scaling_matrix4[0] : default_scaling4[0],
@@ -277,7 +273,7 @@ static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_s
fallback_sps ? sps->scaling_matrix8[0] : default_scaling8[0],
fallback_sps ? sps->scaling_matrix8[3] : default_scaling8[1]
};
- if(get_bits1(&s->gb)){
+ if(get_bits1(&h->gb)){
sps->scaling_matrix_present |= is_sps;
decode_scaling_list(h,scaling_matrix4[0],16,default_scaling4[0],fallback[0]); // Intra, Y
decode_scaling_list(h,scaling_matrix4[1],16,default_scaling4[0],scaling_matrix4[0]); // Intra, Cr
@@ -301,23 +297,22 @@ static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_s
}
int ff_h264_decode_seq_parameter_set(H264Context *h){
- MpegEncContext * const s = &h->s;
int profile_idc, level_idc, constraint_set_flags = 0;
unsigned int sps_id;
int i, log2_max_frame_num_minus4;
SPS *sps;
- profile_idc= get_bits(&s->gb, 8);
- constraint_set_flags |= get_bits1(&s->gb) << 0; //constraint_set0_flag
- constraint_set_flags |= get_bits1(&s->gb) << 1; //constraint_set1_flag
- constraint_set_flags |= get_bits1(&s->gb) << 2; //constraint_set2_flag
- constraint_set_flags |= get_bits1(&s->gb) << 3; //constraint_set3_flag
- get_bits(&s->gb, 4); // reserved
- level_idc= get_bits(&s->gb, 8);
- sps_id= get_ue_golomb_31(&s->gb);
+ profile_idc= get_bits(&h->gb, 8);
+ constraint_set_flags |= get_bits1(&h->gb) << 0; //constraint_set0_flag
+ constraint_set_flags |= get_bits1(&h->gb) << 1; //constraint_set1_flag
+ constraint_set_flags |= get_bits1(&h->gb) << 2; //constraint_set2_flag
+ constraint_set_flags |= get_bits1(&h->gb) << 3; //constraint_set3_flag
+ get_bits(&h->gb, 4); // reserved
+ level_idc= get_bits(&h->gb, 8);
+ sps_id= get_ue_golomb_31(&h->gb);
if(sps_id >= MAX_SPS_COUNT) {
- av_log(h->s.avctx, AV_LOG_ERROR, "sps_id (%d) out of range\n", sps_id);
+ av_log(h->avctx, AV_LOG_ERROR, "sps_id (%d) out of range\n", sps_id);
return -1;
}
sps= av_mallocz(sizeof(SPS));
@@ -338,16 +333,16 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
sps->profile_idc == 44 || sps->profile_idc == 83 ||
sps->profile_idc == 86 || sps->profile_idc == 118 ||
sps->profile_idc == 128 || sps->profile_idc == 144) {
- sps->chroma_format_idc= get_ue_golomb_31(&s->gb);
+ sps->chroma_format_idc= get_ue_golomb_31(&h->gb);
if(sps->chroma_format_idc > 3) {
- av_log(h->s.avctx, AV_LOG_ERROR, "chroma_format_idc (%u) out of range\n", sps->chroma_format_idc);
+ av_log(h->avctx, AV_LOG_ERROR, "chroma_format_idc (%u) out of range\n", sps->chroma_format_idc);
goto fail;
} else if(sps->chroma_format_idc == 3) {
- sps->residual_color_transform_flag = get_bits1(&s->gb);
+ sps->residual_color_transform_flag = get_bits1(&h->gb);
}
- sps->bit_depth_luma = get_ue_golomb(&s->gb) + 8;
- sps->bit_depth_chroma = get_ue_golomb(&s->gb) + 8;
- sps->transform_bypass = get_bits1(&s->gb);
+ sps->bit_depth_luma = get_ue_golomb(&h->gb) + 8;
+ sps->bit_depth_chroma = get_ue_golomb(&h->gb) + 8;
+ sps->transform_bypass = get_bits1(&h->gb);
decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8);
}else{
sps->chroma_format_idc= 1;
@@ -355,78 +350,78 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
sps->bit_depth_chroma = 8;
}
- log2_max_frame_num_minus4 = get_ue_golomb(&s->gb);
+ log2_max_frame_num_minus4 = get_ue_golomb(&h->gb);
if (log2_max_frame_num_minus4 < MIN_LOG2_MAX_FRAME_NUM - 4 ||
log2_max_frame_num_minus4 > MAX_LOG2_MAX_FRAME_NUM - 4) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"log2_max_frame_num_minus4 out of range (0-12): %d\n",
log2_max_frame_num_minus4);
goto fail;
}
sps->log2_max_frame_num = log2_max_frame_num_minus4 + 4;
- sps->poc_type= get_ue_golomb_31(&s->gb);
+ sps->poc_type= get_ue_golomb_31(&h->gb);
if(sps->poc_type == 0){ //FIXME #define
- sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4;
+ sps->log2_max_poc_lsb= get_ue_golomb(&h->gb) + 4;
} else if(sps->poc_type == 1){//FIXME #define
- sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb);
- sps->offset_for_non_ref_pic= get_se_golomb(&s->gb);
- sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb);
- sps->poc_cycle_length = get_ue_golomb(&s->gb);
+ sps->delta_pic_order_always_zero_flag= get_bits1(&h->gb);
+ sps->offset_for_non_ref_pic= get_se_golomb(&h->gb);
+ sps->offset_for_top_to_bottom_field= get_se_golomb(&h->gb);
+ sps->poc_cycle_length = get_ue_golomb(&h->gb);
if((unsigned)sps->poc_cycle_length >= FF_ARRAY_ELEMS(sps->offset_for_ref_frame)){
- av_log(h->s.avctx, AV_LOG_ERROR, "poc_cycle_length overflow %u\n", sps->poc_cycle_length);
+ av_log(h->avctx, AV_LOG_ERROR, "poc_cycle_length overflow %u\n", sps->poc_cycle_length);
goto fail;
}
for(i=0; i<sps->poc_cycle_length; i++)
- sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb);
+ sps->offset_for_ref_frame[i]= get_se_golomb(&h->gb);
}else if(sps->poc_type != 2){
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type);
+ av_log(h->avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type);
goto fail;
}
- sps->ref_frame_count= get_ue_golomb_31(&s->gb);
+ sps->ref_frame_count= get_ue_golomb_31(&h->gb);
if(sps->ref_frame_count > MAX_PICTURE_COUNT-2 || sps->ref_frame_count >= 32U){
- av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n");
+ av_log(h->avctx, AV_LOG_ERROR, "too many reference frames\n");
goto fail;
}
- sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb);
- sps->mb_width = get_ue_golomb(&s->gb) + 1;
- sps->mb_height= get_ue_golomb(&s->gb) + 1;
+ sps->gaps_in_frame_num_allowed_flag= get_bits1(&h->gb);
+ sps->mb_width = get_ue_golomb(&h->gb) + 1;
+ sps->mb_height= get_ue_golomb(&h->gb) + 1;
if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 ||
- av_image_check_size(16*sps->mb_width, 16*sps->mb_height, 0, h->s.avctx)){
- av_log(h->s.avctx, AV_LOG_ERROR, "mb_width/height overflow\n");
+ av_image_check_size(16*sps->mb_width, 16*sps->mb_height, 0, h->avctx)){
+ av_log(h->avctx, AV_LOG_ERROR, "mb_width/height overflow\n");
goto fail;
}
- sps->frame_mbs_only_flag= get_bits1(&s->gb);
+ sps->frame_mbs_only_flag= get_bits1(&h->gb);
if(!sps->frame_mbs_only_flag)
- sps->mb_aff= get_bits1(&s->gb);
+ sps->mb_aff= get_bits1(&h->gb);
else
sps->mb_aff= 0;
- sps->direct_8x8_inference_flag= get_bits1(&s->gb);
+ sps->direct_8x8_inference_flag= get_bits1(&h->gb);
if(!sps->frame_mbs_only_flag && !sps->direct_8x8_inference_flag){
- av_log(h->s.avctx, AV_LOG_ERROR, "This stream was generated by a broken encoder, invalid 8x8 inference\n");
+ av_log(h->avctx, AV_LOG_ERROR, "This stream was generated by a broken encoder, invalid 8x8 inference\n");
goto fail;
}
#ifndef ALLOW_INTERLACE
if(sps->mb_aff)
- av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF support not included; enable it at compile-time.\n");
+ av_log(h->avctx, AV_LOG_ERROR, "MBAFF support not included; enable it at compile-time.\n");
#endif
- sps->crop= get_bits1(&s->gb);
+ sps->crop= get_bits1(&h->gb);
if(sps->crop){
int crop_vertical_limit = sps->chroma_format_idc & 2 ? 16 : 8;
int crop_horizontal_limit = sps->chroma_format_idc == 3 ? 16 : 8;
- sps->crop_left = get_ue_golomb(&s->gb);
- sps->crop_right = get_ue_golomb(&s->gb);
- sps->crop_top = get_ue_golomb(&s->gb);
- sps->crop_bottom= get_ue_golomb(&s->gb);
- if (h->s.avctx->flags2 & CODEC_FLAG2_IGNORE_CROP) {
- av_log(h->s.avctx, AV_LOG_DEBUG,
+ sps->crop_left = get_ue_golomb(&h->gb);
+ sps->crop_right = get_ue_golomb(&h->gb);
+ sps->crop_top = get_ue_golomb(&h->gb);
+ sps->crop_bottom= get_ue_golomb(&h->gb);
+ if (h->avctx->flags2 & CODEC_FLAG2_IGNORE_CROP) {
+ av_log(h->avctx, AV_LOG_DEBUG,
"discarding sps cropping, "
"original values are l:%u r:%u t:%u b:%u\n",
sps->crop_left,
@@ -440,10 +435,10 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
sps->crop_bottom = 0;
}
if(sps->crop_left || sps->crop_top){
- av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n");
+ av_log(h->avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n");
}
if(sps->crop_right >= crop_horizontal_limit || sps->crop_bottom >= crop_vertical_limit){
- av_log(h->s.avctx, AV_LOG_ERROR, "brainfart cropping not supported, this could look slightly wrong ...\n");
+ av_log(h->avctx, AV_LOG_ERROR, "brainfart cropping not supported, this could look slightly wrong ...\n");
}
}else{
sps->crop_left =
@@ -452,7 +447,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
sps->crop_bottom= 0;
}
- sps->vui_parameters_present_flag= get_bits1(&s->gb);
+ sps->vui_parameters_present_flag= get_bits1(&h->gb);
if( sps->vui_parameters_present_flag )
if (decode_vui_parameters(h, sps) < 0)
goto fail;
@@ -460,9 +455,9 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
if(!sps->sar.den)
sps->sar.den= 1;
- if(s->avctx->debug&FF_DEBUG_PICT_INFO){
+ if(h->avctx->debug&FF_DEBUG_PICT_INFO){
static const char csp[4][5] = { "Gray", "420", "422", "444" };
- av_log(h->s.avctx, AV_LOG_DEBUG, "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s %s %d/%d\n",
+ av_log(h->avctx, AV_LOG_DEBUG, "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s %s %d/%d\n",
sps_id, sps->profile_idc, sps->level_idc,
sps->poc_type,
sps->ref_frame_count,
@@ -500,35 +495,34 @@ build_qp_table(PPS *pps, int t, int index, const int depth)
}
int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length){
- MpegEncContext * const s = &h->s;
- unsigned int pps_id= get_ue_golomb(&s->gb);
+ unsigned int pps_id= get_ue_golomb(&h->gb);
PPS *pps;
const int qp_bd_offset = 6*(h->sps.bit_depth_luma-8);
int bits_left;
if(pps_id >= MAX_PPS_COUNT) {
- av_log(h->s.avctx, AV_LOG_ERROR, "pps_id (%d) out of range\n", pps_id);
+ av_log(h->avctx, AV_LOG_ERROR, "pps_id (%d) out of range\n", pps_id);
return -1;
} else if (h->sps.bit_depth_luma > 10) {
- av_log(h->s.avctx, AV_LOG_ERROR, "Unimplemented luma bit depth=%d (max=10)\n", h->sps.bit_depth_luma);
+ av_log(h->avctx, AV_LOG_ERROR, "Unimplemented luma bit depth=%d (max=10)\n", h->sps.bit_depth_luma);
return AVERROR_PATCHWELCOME;
}
pps= av_mallocz(sizeof(PPS));
if(pps == NULL)
return -1;
- pps->sps_id= get_ue_golomb_31(&s->gb);
+ pps->sps_id= get_ue_golomb_31(&h->gb);
if((unsigned)pps->sps_id>=MAX_SPS_COUNT || h->sps_buffers[pps->sps_id] == NULL){
- av_log(h->s.avctx, AV_LOG_ERROR, "sps_id out of range\n");
+ av_log(h->avctx, AV_LOG_ERROR, "sps_id out of range\n");
goto fail;
}
- pps->cabac= get_bits1(&s->gb);
- pps->pic_order_present= get_bits1(&s->gb);
- pps->slice_group_count= get_ue_golomb(&s->gb) + 1;
+ pps->cabac= get_bits1(&h->gb);
+ pps->pic_order_present= get_bits1(&h->gb);
+ pps->slice_group_count= get_ue_golomb(&h->gb) + 1;
if(pps->slice_group_count > 1 ){
- pps->mb_slice_group_map_type= get_ue_golomb(&s->gb);
- av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n");
+ pps->mb_slice_group_map_type= get_ue_golomb(&h->gb);
+ av_log(h->avctx, AV_LOG_ERROR, "FMO not supported\n");
switch(pps->mb_slice_group_map_type){
case 0:
#if 0
@@ -563,33 +557,33 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length){
break;
}
}
- pps->ref_count[0]= get_ue_golomb(&s->gb) + 1;
- pps->ref_count[1]= get_ue_golomb(&s->gb) + 1;
+ pps->ref_count[0]= get_ue_golomb(&h->gb) + 1;
+ pps->ref_count[1]= get_ue_golomb(&h->gb) + 1;
if(pps->ref_count[0]-1 > 32-1 || pps->ref_count[1]-1 > 32-1){
- av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n");
+ av_log(h->avctx, AV_LOG_ERROR, "reference overflow (pps)\n");
goto fail;
}
- pps->weighted_pred= get_bits1(&s->gb);
- pps->weighted_bipred_idc= get_bits(&s->gb, 2);
- pps->init_qp= get_se_golomb(&s->gb) + 26 + qp_bd_offset;
- pps->init_qs= get_se_golomb(&s->gb) + 26 + qp_bd_offset;
- pps->chroma_qp_index_offset[0]= get_se_golomb(&s->gb);
- pps->deblocking_filter_parameters_present= get_bits1(&s->gb);
- pps->constrained_intra_pred= get_bits1(&s->gb);
- pps->redundant_pic_cnt_present = get_bits1(&s->gb);
+ pps->weighted_pred= get_bits1(&h->gb);
+ pps->weighted_bipred_idc= get_bits(&h->gb, 2);
+ pps->init_qp= get_se_golomb(&h->gb) + 26 + qp_bd_offset;
+ pps->init_qs= get_se_golomb(&h->gb) + 26 + qp_bd_offset;
+ pps->chroma_qp_index_offset[0]= get_se_golomb(&h->gb);
+ pps->deblocking_filter_parameters_present= get_bits1(&h->gb);
+ pps->constrained_intra_pred= get_bits1(&h->gb);
+ pps->redundant_pic_cnt_present = get_bits1(&h->gb);
pps->transform_8x8_mode= 0;
h->dequant_coeff_pps= -1; //contents of sps/pps can change even if id doesn't, so reinit
memcpy(pps->scaling_matrix4, h->sps_buffers[pps->sps_id]->scaling_matrix4, sizeof(pps->scaling_matrix4));
memcpy(pps->scaling_matrix8, h->sps_buffers[pps->sps_id]->scaling_matrix8, sizeof(pps->scaling_matrix8));
- bits_left = bit_length - get_bits_count(&s->gb);
+ bits_left = bit_length - get_bits_count(&h->gb);
if (bits_left && (bits_left > 8 ||
- show_bits(&s->gb, bits_left) != 1 << (bits_left - 1))) {
- pps->transform_8x8_mode= get_bits1(&s->gb);
+ show_bits(&h->gb, bits_left) != 1 << (bits_left - 1))) {
+ pps->transform_8x8_mode= get_bits1(&h->gb);
decode_scaling_matrices(h, h->sps_buffers[pps->sps_id], pps, 0, pps->scaling_matrix4, pps->scaling_matrix8);
- pps->chroma_qp_index_offset[1]= get_se_golomb(&s->gb); //second_chroma_qp_index_offset
+ pps->chroma_qp_index_offset[1]= get_se_golomb(&h->gb); //second_chroma_qp_index_offset
} else {
pps->chroma_qp_index_offset[1]= pps->chroma_qp_index_offset[0];
}
@@ -599,8 +593,8 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length){
if(pps->chroma_qp_index_offset[0] != pps->chroma_qp_index_offset[1])
pps->chroma_qp_diff= 1;
- if(s->avctx->debug&FF_DEBUG_PICT_INFO){
- av_log(h->s.avctx, AV_LOG_DEBUG, "pps:%u sps:%u %s slice_groups:%d ref:%d/%d %s qp:%d/%d/%d/%d %s %s %s %s\n",
+ if(h->avctx->debug&FF_DEBUG_PICT_INFO){
+ av_log(h->avctx, AV_LOG_DEBUG, "pps:%u sps:%u %s slice_groups:%d ref:%d/%d %s qp:%d/%d/%d/%d %s %s %s %s\n",
pps_id, pps->sps_id,
pps->cabac ? "CABAC" : "CAVLC",
pps->slice_group_count,
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 0e4bd76..f855bcb 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -106,7 +106,6 @@ static int add_sorted(Picture **sorted, Picture **src, int len, int limit, int d
}
int ff_h264_fill_default_ref_list(H264Context *h){
- MpegEncContext * const s = &h->s;
int i, len;
if(h->slice_type_nos==AV_PICTURE_TYPE_B){
@@ -115,16 +114,16 @@ int ff_h264_fill_default_ref_list(H264Context *h){
int lens[2];
if(FIELD_PICTURE)
- cur_poc= s->current_picture_ptr->field_poc[ s->picture_structure == PICT_BOTTOM_FIELD ];
+ cur_poc= h->cur_pic_ptr->field_poc[h->picture_structure == PICT_BOTTOM_FIELD];
else
- cur_poc= s->current_picture_ptr->poc;
+ cur_poc= h->cur_pic_ptr->poc;
for(list= 0; list<2; list++){
len= add_sorted(sorted , h->short_ref, h->short_ref_count, cur_poc, 1^list);
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] , sorted , len, 0, s->picture_structure);
- len+=build_def_list(h->default_ref_list[list]+len, h->long_ref, 16 , 1, s->picture_structure);
+ len= build_def_list(h->default_ref_list[list] , sorted , len, 0, h->picture_structure);
+ len+=build_def_list(h->default_ref_list[list]+len, h->long_ref, 16 , 1, h->picture_structure);
assert(len<=32);
if(len < h->ref_count[list])
@@ -138,19 +137,19 @@ int ff_h264_fill_default_ref_list(H264Context *h){
FFSWAP(Picture, h->default_ref_list[1][0], h->default_ref_list[1][1]);
}
}else{
- len = build_def_list(h->default_ref_list[0] , h->short_ref, h->short_ref_count, 0, s->picture_structure);
- len+= build_def_list(h->default_ref_list[0]+len, h-> long_ref, 16 , 1, s->picture_structure);
+ len = build_def_list(h->default_ref_list[0] , h->short_ref, h->short_ref_count, 0, h->picture_structure);
+ len+= build_def_list(h->default_ref_list[0]+len, h-> long_ref, 16 , 1, h->picture_structure);
assert(len <= 32);
if(len < h->ref_count[0])
memset(&h->default_ref_list[0][len], 0, sizeof(Picture)*(h->ref_count[0] - len));
}
#ifdef TRACE
for (i=0; i<h->ref_count[0]; i++) {
- tprintf(h->s.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]);
+ 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(h->slice_type_nos==AV_PICTURE_TYPE_B){
for (i=0; i<h->ref_count[1]; i++) {
- tprintf(h->s.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]);
+ 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]);
}
}
#endif
@@ -171,9 +170,7 @@ static void print_long_term(H264Context *h);
* described by pic_num
*/
static int pic_num_extract(H264Context *h, int pic_num, int *structure){
- MpegEncContext * const s = &h->s;
-
- *structure = s->picture_structure;
+ *structure = h->picture_structure;
if(FIELD_PICTURE){
if (!(pic_num & 1))
/* opposite field */
@@ -185,7 +182,6 @@ static int pic_num_extract(H264Context *h, int pic_num, int *structure){
}
int ff_h264_decode_ref_pic_list_reordering(H264Context *h){
- MpegEncContext * const s = &h->s;
int list, index, pic_structure;
print_short_term(h);
@@ -194,11 +190,11 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h){
for(list=0; list<h->list_count; list++){
memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]);
- if(get_bits1(&s->gb)){
+ if(get_bits1(&h->gb)){
int pred= h->curr_pic_num;
for(index=0; ; index++){
- unsigned int reordering_of_pic_nums_idc= get_ue_golomb_31(&s->gb);
+ unsigned int reordering_of_pic_nums_idc= get_ue_golomb_31(&h->gb);
unsigned int pic_id;
int i;
Picture *ref = NULL;
@@ -207,17 +203,17 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h){
break;
if(index >= h->ref_count[list]){
- av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n");
+ av_log(h->avctx, AV_LOG_ERROR, "reference count overflow\n");
return -1;
}
if(reordering_of_pic_nums_idc<3){
if(reordering_of_pic_nums_idc<2){
- const unsigned int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1;
+ const unsigned int abs_diff_pic_num= get_ue_golomb(&h->gb) + 1;
int frame_num;
if(abs_diff_pic_num > h->max_pic_num){
- av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n");
+ av_log(h->avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n");
return -1;
}
@@ -241,12 +237,12 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h){
ref->pic_id= pred;
}else{
int long_idx;
- pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx
+ pic_id= get_ue_golomb(&h->gb); //long_term_pic_idx
long_idx= pic_num_extract(h, pic_id, &pic_structure);
if(long_idx>31){
- av_log(h->s.avctx, AV_LOG_ERROR, "long_term_pic_idx overflow\n");
+ av_log(h->avctx, AV_LOG_ERROR, "long_term_pic_idx overflow\n");
return -1;
}
ref = h->long_ref[long_idx];
@@ -261,7 +257,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h){
}
if (i < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
+ av_log(h->avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME
} else {
for(i=index; i+1<h->ref_count[list]; i++){
@@ -277,7 +273,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h){
}
}
}else{
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
+ av_log(h->avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
return -1;
}
}
@@ -286,7 +282,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h){
for(list=0; list<h->list_count; list++){
for(index= 0; index < h->ref_count[list]; index++){
if (!h->ref_list[list][index].f.data[0]) {
- av_log(h->s.avctx, AV_LOG_ERROR, "Missing reference picture\n");
+ av_log(h->avctx, AV_LOG_ERROR, "Missing reference picture\n");
if (h->default_ref_list[list][0].f.data[0])
h->ref_list[list][index]= h->default_ref_list[list][0];
else
@@ -359,13 +355,12 @@ static inline int unreference_pic(H264Context *h, Picture *pic, int refmask){
* frame number is found
*/
static Picture * find_short(H264Context *h, int frame_num, int *idx){
- MpegEncContext * const s = &h->s;
int i;
for(i=0; i<h->short_ref_count; i++){
Picture *pic= h->short_ref[i];
- if(s->avctx->debug&FF_DEBUG_MMCO)
- av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic);
+ if(h->avctx->debug&FF_DEBUG_MMCO)
+ av_log(h->avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic);
if(pic->frame_num == frame_num) {
*idx = i;
return pic;
@@ -392,12 +387,11 @@ static void remove_short_at_index(H264Context *h, int i){
* @return the removed picture or NULL if an error occurs
*/
static Picture * remove_short(H264Context *h, int frame_num, int ref_mask){
- MpegEncContext * const s = &h->s;
Picture *pic;
int i;
- if(s->avctx->debug&FF_DEBUG_MMCO)
- av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count);
+ if(h->avctx->debug&FF_DEBUG_MMCO)
+ av_log(h->avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count);
pic = find_short(h, frame_num, &i);
if (pic){
@@ -449,11 +443,11 @@ void ff_h264_remove_all_refs(H264Context *h){
*/
static void print_short_term(H264Context *h) {
uint32_t i;
- if(h->s.avctx->debug&FF_DEBUG_MMCO) {
- av_log(h->s.avctx, AV_LOG_DEBUG, "short term list:\n");
+ 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++){
Picture *pic= h->short_ref[i];
- av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n",
+ av_log(h->avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n",
i, pic->frame_num, pic->poc, pic->f.data[0]);
}
}
@@ -464,12 +458,12 @@ static void print_short_term(H264Context *h) {
*/
static void print_long_term(H264Context *h) {
uint32_t i;
- if(h->s.avctx->debug&FF_DEBUG_MMCO) {
- av_log(h->s.avctx, AV_LOG_DEBUG, "long term list:\n");
+ if(h->avctx->debug&FF_DEBUG_MMCO) {
+ av_log(h->avctx, AV_LOG_DEBUG, "long term list:\n");
for(i = 0; i < 16; i++){
Picture *pic= h->long_ref[i];
if (pic) {
- av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n",
+ av_log(h->avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n",
i, pic->frame_num, pic->poc, pic->f.data[0]);
}
}
@@ -490,7 +484,6 @@ static int check_opcodes(MMCO *mmco1, MMCO *mmco2, int n_mmcos)
int ff_generate_sliding_window_mmcos(H264Context *h, int first_slice)
{
- MpegEncContext * const s = &h->s;
MMCO mmco_temp[MAX_MMCO_COUNT], *mmco = first_slice ? h->mmco : mmco_temp;
int mmco_index = 0, i;
@@ -498,8 +491,7 @@ int ff_generate_sliding_window_mmcos(H264Context *h, int first_slice)
if (h->short_ref_count &&
h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count &&
- !(FIELD_PICTURE && !s->first_field &&
- s->current_picture_ptr->f.reference)) {
+ !(FIELD_PICTURE && !h->first_field && h->cur_pic_ptr->f.reference)) {
mmco[0].opcode = MMCO_SHORT2UNUSED;
mmco[0].short_pic_num = h->short_ref[h->short_ref_count - 1]->frame_num;
mmco_index = 1;
@@ -516,7 +508,7 @@ int ff_generate_sliding_window_mmcos(H264Context *h, int first_slice)
} else if (!first_slice && mmco_index >= 0 &&
(mmco_index != h->mmco_index ||
(i = check_opcodes(h->mmco, mmco_temp, mmco_index)))) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"Inconsistent MMCO state between slices [%d, %d, %d]\n",
mmco_index, h->mmco_index, i);
return AVERROR_INVALIDDATA;
@@ -525,18 +517,17 @@ int ff_generate_sliding_window_mmcos(H264Context *h, int first_slice)
}
int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
- MpegEncContext * const s = &h->s;
int i, av_uninit(j);
int current_ref_assigned=0, err=0;
Picture *av_uninit(pic);
- if((s->avctx->debug&FF_DEBUG_MMCO) && mmco_count==0)
- av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n");
+ if((h->avctx->debug&FF_DEBUG_MMCO) && mmco_count==0)
+ av_log(h->avctx, AV_LOG_DEBUG, "no mmco here\n");
for(i=0; i<mmco_count; i++){
int av_uninit(structure), av_uninit(frame_num);
- if(s->avctx->debug&FF_DEBUG_MMCO)
- av_log(h->s.avctx, AV_LOG_DEBUG, "mmco:%d %d %d\n", h->mmco[i].opcode, h->mmco[i].short_pic_num, h->mmco[i].long_arg);
+ if(h->avctx->debug&FF_DEBUG_MMCO)
+ av_log(h->avctx, AV_LOG_DEBUG, "mmco:%d %d %d\n", h->mmco[i].opcode, h->mmco[i].short_pic_num, h->mmco[i].long_arg);
if( mmco[i].opcode == MMCO_SHORT2UNUSED
|| mmco[i].opcode == MMCO_SHORT2LONG){
@@ -545,7 +536,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
if(!pic){
if(mmco[i].opcode != MMCO_SHORT2LONG || !h->long_ref[mmco[i].long_arg]
|| h->long_ref[mmco[i].long_arg]->frame_num != frame_num) {
- av_log(h->s.avctx, AV_LOG_ERROR, "mmco: unref short failure\n");
+ av_log(h->avctx, AV_LOG_ERROR, "mmco: unref short failure\n");
err = AVERROR_INVALIDDATA;
}
continue;
@@ -554,8 +545,8 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
switch(mmco[i].opcode){
case MMCO_SHORT2UNUSED:
- if(s->avctx->debug&FF_DEBUG_MMCO)
- av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref short %d count %d\n", h->mmco[i].short_pic_num, h->short_ref_count);
+ if(h->avctx->debug&FF_DEBUG_MMCO)
+ av_log(h->avctx, AV_LOG_DEBUG, "mmco: unref short %d count %d\n", h->mmco[i].short_pic_num, h->short_ref_count);
remove_short(h, frame_num, structure ^ PICT_FRAME);
break;
case MMCO_SHORT2LONG:
@@ -574,8 +565,8 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
pic = h->long_ref[j];
if (pic) {
remove_long(h, j, structure ^ PICT_FRAME);
- } else if(s->avctx->debug&FF_DEBUG_MMCO)
- av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref long failure\n");
+ } else if(h->avctx->debug&FF_DEBUG_MMCO)
+ 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.
@@ -586,15 +577,15 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
* and mark this field valid.
*/
- if (h->long_ref[mmco[i].long_arg] != s->current_picture_ptr) {
+ if (h->long_ref[mmco[i].long_arg] != h->cur_pic_ptr) {
remove_long(h, mmco[i].long_arg, 0);
- h->long_ref[ mmco[i].long_arg ]= s->current_picture_ptr;
+ h->long_ref[ mmco[i].long_arg ]= h->cur_pic_ptr;
h->long_ref[ mmco[i].long_arg ]->long_ref=1;
h->long_ref_count++;
}
- s->current_picture_ptr->f.reference |= s->picture_structure;
+ h->cur_pic_ptr->f.reference |= h->picture_structure;
current_ref_assigned=1;
break;
case MMCO_SET_MAX_LONG:
@@ -612,9 +603,9 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
remove_long(h, j, 0);
}
h->frame_num=
- s->current_picture_ptr->frame_num= 0;
+ h->cur_pic_ptr->frame_num= 0;
h->mmco_reset = 1;
- s->current_picture_ptr->mmco_reset=1;
+ h->cur_pic_ptr->mmco_reset=1;
break;
default: assert(0);
}
@@ -627,39 +618,39 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
* in long_ref; trying to put it on the short list here is an
* error in the encoded bit stream (ref: 7.4.3.3, NOTE 2 and 3).
*/
- if (h->short_ref_count && h->short_ref[0] == s->current_picture_ptr) {
+ if (h->short_ref_count && h->short_ref[0] == h->cur_pic_ptr) {
/* Just mark the second field valid */
- s->current_picture_ptr->f.reference = PICT_FRAME;
- } else if (s->current_picture_ptr->long_ref) {
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term reference "
- "assignment for second field "
- "in complementary field pair "
- "(first field is long term)\n");
+ h->cur_pic_ptr->f.reference = PICT_FRAME;
+ } else if (h->cur_pic_ptr->long_ref) {
+ av_log(h->avctx, AV_LOG_ERROR, "illegal short term reference "
+ "assignment for second field "
+ "in complementary field pair "
+ "(first field is long term)\n");
err = AVERROR_INVALIDDATA;
} else {
- pic= remove_short(h, s->current_picture_ptr->frame_num, 0);
+ pic= remove_short(h, h->cur_pic_ptr->frame_num, 0);
if(pic){
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
+ av_log(h->avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
err = AVERROR_INVALIDDATA;
}
if(h->short_ref_count)
memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*));
- h->short_ref[0]= s->current_picture_ptr;
+ h->short_ref[0]= h->cur_pic_ptr;
h->short_ref_count++;
- s->current_picture_ptr->f.reference |= s->picture_structure;
+ h->cur_pic_ptr->f.reference |= h->picture_structure;
}
}
if (h->long_ref_count + h->short_ref_count -
- (h->short_ref[0] == s->current_picture_ptr) > h->sps.ref_frame_count){
+ (h->short_ref[0] == h->cur_pic_ptr) > h->sps.ref_frame_count){
/* We have too many reference frames, probably due to corrupted
* stream. Need to discard one frame. Prevents overrun of the
* short_ref and long_ref buffers.
*/
- av_log(h->s.avctx, AV_LOG_ERROR,
+ 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);
@@ -680,19 +671,18 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
print_short_term(h);
print_long_term(h);
- return (h->s.avctx->err_recognition & AV_EF_EXPLODE) ? err : 0;
+ return (h->avctx->err_recognition & AV_EF_EXPLODE) ? err : 0;
}
int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb,
int first_slice)
{
- MpegEncContext * const s = &h->s;
int i, ret;
MMCO mmco_temp[MAX_MMCO_COUNT], *mmco = first_slice ? h->mmco : mmco_temp;
int mmco_index = 0;
if (h->nal_unit_type == NAL_IDR_SLICE){ // FIXME fields
- s->broken_link = get_bits1(gb) - 1;
+ skip_bits1(gb); // broken_link
if (get_bits1(gb)){
mmco[0].opcode = MMCO_LONG;
mmco[0].long_arg = 0;
@@ -725,7 +715,7 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb,
(long_arg >= 16 && !(opcode == MMCO_SET_MAX_LONG &&
long_arg == 16) &&
!(opcode == MMCO_LONG2UNUSED && FIELD_PICTURE))){
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"illegal long ref in memory management control "
"operation %d\n", opcode);
return -1;
@@ -734,7 +724,7 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb,
}
if (opcode > (unsigned) MMCO_LONG){
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"illegal memory management control operation %d\n",
opcode);
return -1;
@@ -746,7 +736,7 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb,
} else {
if (first_slice) {
ret = ff_generate_sliding_window_mmcos(h, first_slice);
- if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE)
+ if (ret < 0 && h->avctx->err_recognition & AV_EF_EXPLODE)
return ret;
}
mmco_index = -1;
@@ -758,7 +748,7 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb,
} else if (!first_slice && mmco_index >= 0 &&
(mmco_index != h->mmco_index ||
(i = check_opcodes(h->mmco, mmco_temp, mmco_index)))) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"Inconsistent MMCO state between slices [%d, %d, %d]\n",
mmco_index, h->mmco_index, i);
return AVERROR_INVALIDDATA;
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
index 2e5fb65..df4c49f 100644
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@@ -45,14 +45,13 @@ void ff_h264_reset_sei(H264Context *h) {
}
static int decode_picture_timing(H264Context *h){
- MpegEncContext * const s = &h->s;
if(h->sps.nal_hrd_parameters_present_flag || h->sps.vcl_hrd_parameters_present_flag){
- h->sei_cpb_removal_delay = get_bits(&s->gb, h->sps.cpb_removal_delay_length);
- h->sei_dpb_output_delay = get_bits(&s->gb, h->sps.dpb_output_delay_length);
+ h->sei_cpb_removal_delay = get_bits(&h->gb, h->sps.cpb_removal_delay_length);
+ h->sei_dpb_output_delay = get_bits(&h->gb, h->sps.dpb_output_delay_length);
}
if(h->sps.pic_struct_present_flag){
unsigned int i, num_clock_ts;
- h->sei_pic_struct = get_bits(&s->gb, 4);
+ h->sei_pic_struct = get_bits(&h->gb, 4);
h->sei_ct_type = 0;
if (h->sei_pic_struct > SEI_PIC_STRUCT_FRAME_TRIPLING)
@@ -61,42 +60,41 @@ static int decode_picture_timing(H264Context *h){
num_clock_ts = sei_num_clock_ts_table[h->sei_pic_struct];
for (i = 0 ; i < num_clock_ts ; i++){
- if(get_bits(&s->gb, 1)){ /* clock_timestamp_flag */
+ if(get_bits(&h->gb, 1)){ /* clock_timestamp_flag */
unsigned int full_timestamp_flag;
- h->sei_ct_type |= 1<<get_bits(&s->gb, 2);
- skip_bits(&s->gb, 1); /* nuit_field_based_flag */
- skip_bits(&s->gb, 5); /* counting_type */
- full_timestamp_flag = get_bits(&s->gb, 1);
- skip_bits(&s->gb, 1); /* discontinuity_flag */
- skip_bits(&s->gb, 1); /* cnt_dropped_flag */
- skip_bits(&s->gb, 8); /* n_frames */
+ h->sei_ct_type |= 1<<get_bits(&h->gb, 2);
+ skip_bits(&h->gb, 1); /* nuit_field_based_flag */
+ skip_bits(&h->gb, 5); /* counting_type */
+ full_timestamp_flag = get_bits(&h->gb, 1);
+ skip_bits(&h->gb, 1); /* discontinuity_flag */
+ skip_bits(&h->gb, 1); /* cnt_dropped_flag */
+ skip_bits(&h->gb, 8); /* n_frames */
if(full_timestamp_flag){
- skip_bits(&s->gb, 6); /* seconds_value 0..59 */
- skip_bits(&s->gb, 6); /* minutes_value 0..59 */
- skip_bits(&s->gb, 5); /* hours_value 0..23 */
+ skip_bits(&h->gb, 6); /* seconds_value 0..59 */
+ skip_bits(&h->gb, 6); /* minutes_value 0..59 */
+ skip_bits(&h->gb, 5); /* hours_value 0..23 */
}else{
- if(get_bits(&s->gb, 1)){ /* seconds_flag */
- skip_bits(&s->gb, 6); /* seconds_value range 0..59 */
- if(get_bits(&s->gb, 1)){ /* minutes_flag */
- skip_bits(&s->gb, 6); /* minutes_value 0..59 */
- if(get_bits(&s->gb, 1)) /* hours_flag */
- skip_bits(&s->gb, 5); /* hours_value 0..23 */
+ if(get_bits(&h->gb, 1)){ /* seconds_flag */
+ skip_bits(&h->gb, 6); /* seconds_value range 0..59 */
+ if(get_bits(&h->gb, 1)){ /* minutes_flag */
+ skip_bits(&h->gb, 6); /* minutes_value 0..59 */
+ if(get_bits(&h->gb, 1)) /* hours_flag */
+ skip_bits(&h->gb, 5); /* hours_value 0..23 */
}
}
}
if(h->sps.time_offset_length > 0)
- skip_bits(&s->gb, h->sps.time_offset_length); /* time_offset */
+ skip_bits(&h->gb, h->sps.time_offset_length); /* time_offset */
}
}
- if(s->avctx->debug & FF_DEBUG_PICT_INFO)
- av_log(s->avctx, AV_LOG_DEBUG, "ct_type:%X pic_struct:%d\n", h->sei_ct_type, h->sei_pic_struct);
+ if(h->avctx->debug & FF_DEBUG_PICT_INFO)
+ av_log(h->avctx, AV_LOG_DEBUG, "ct_type:%X pic_struct:%d\n", h->sei_ct_type, h->sei_pic_struct);
}
return 0;
}
static int decode_unregistered_user_data(H264Context *h, int size){
- MpegEncContext * const s = &h->s;
uint8_t user_data[16+256];
int e, build, i;
@@ -104,7 +102,7 @@ static int decode_unregistered_user_data(H264Context *h, int size){
return -1;
for(i=0; i<sizeof(user_data)-1 && i<size; i++){
- user_data[i]= get_bits(&s->gb, 8);
+ user_data[i]= get_bits(&h->gb, 8);
}
user_data[i]= 0;
@@ -112,33 +110,30 @@ static int decode_unregistered_user_data(H264Context *h, int size){
if(e==1 && build>0)
h->x264_build= build;
- if(s->avctx->debug & FF_DEBUG_BUGS)
- av_log(s->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data+16);
+ if(h->avctx->debug & FF_DEBUG_BUGS)
+ av_log(h->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data+16);
for(; i<size; i++)
- skip_bits(&s->gb, 8);
+ skip_bits(&h->gb, 8);
return 0;
}
static int decode_recovery_point(H264Context *h){
- MpegEncContext * const s = &h->s;
-
- h->sei_recovery_frame_cnt = get_ue_golomb(&s->gb);
- skip_bits(&s->gb, 4); /* 1b exact_match_flag, 1b broken_link_flag, 2b changing_slice_group_idc */
+ h->sei_recovery_frame_cnt = get_ue_golomb(&h->gb);
+ skip_bits(&h->gb, 4); /* 1b exact_match_flag, 1b broken_link_flag, 2b changing_slice_group_idc */
return 0;
}
static int decode_buffering_period(H264Context *h){
- MpegEncContext * const s = &h->s;
unsigned int sps_id;
int sched_sel_idx;
SPS *sps;
- sps_id = get_ue_golomb_31(&s->gb);
+ sps_id = get_ue_golomb_31(&h->gb);
if(sps_id > 31 || !h->sps_buffers[sps_id]) {
- av_log(h->s.avctx, AV_LOG_ERROR, "non-existing SPS %d referenced in buffering period\n", sps_id);
+ av_log(h->avctx, AV_LOG_ERROR, "non-existing SPS %d referenced in buffering period\n", sps_id);
return -1;
}
sps = h->sps_buffers[sps_id];
@@ -146,14 +141,14 @@ static int decode_buffering_period(H264Context *h){
// NOTE: This is really so duplicated in the standard... See H.264, D.1.1
if (sps->nal_hrd_parameters_present_flag) {
for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) {
- h->initial_cpb_removal_delay[sched_sel_idx] = get_bits(&s->gb, sps->initial_cpb_removal_delay_length);
- skip_bits(&s->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
+ h->initial_cpb_removal_delay[sched_sel_idx] = get_bits(&h->gb, sps->initial_cpb_removal_delay_length);
+ skip_bits(&h->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
}
}
if (sps->vcl_hrd_parameters_present_flag) {
for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) {
- h->initial_cpb_removal_delay[sched_sel_idx] = get_bits(&s->gb, sps->initial_cpb_removal_delay_length);
- skip_bits(&s->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
+ h->initial_cpb_removal_delay[sched_sel_idx] = get_bits(&h->gb, sps->initial_cpb_removal_delay_length);
+ skip_bits(&h->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
}
}
@@ -162,20 +157,18 @@ static int decode_buffering_period(H264Context *h){
}
int ff_h264_decode_sei(H264Context *h){
- MpegEncContext * const s = &h->s;
-
- while (get_bits_left(&s->gb) > 16) {
+ while (get_bits_left(&h->gb) > 16) {
int size, type;
type=0;
do{
- type+= show_bits(&s->gb, 8);
- }while(get_bits(&s->gb, 8) == 255);
+ type+= show_bits(&h->gb, 8);
+ }while(get_bits(&h->gb, 8) == 255);
size=0;
do{
- size+= show_bits(&s->gb, 8);
- }while(get_bits(&s->gb, 8) == 255);
+ size+= show_bits(&h->gb, 8);
+ }while(get_bits(&h->gb, 8) == 255);
switch(type){
case SEI_TYPE_PIC_TIMING: // Picture timing SEI
@@ -195,11 +188,11 @@ int ff_h264_decode_sei(H264Context *h){
return -1;
break;
default:
- skip_bits(&s->gb, 8*size);
+ skip_bits(&h->gb, 8*size);
}
//FIXME check bits here
- align_get_bits(&s->gb);
+ align_get_bits(&h->gb);
}
return 0;
diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c
index 94cf9d0..48a4a79 100644
--- a/libavcodec/h264pred.c
+++ b/libavcodec/h264pred.c
@@ -399,8 +399,6 @@ static void pred8x8_tm_vp8_c(uint8_t *src, ptrdiff_t stride)
void ff_h264_pred_init(H264PredContext *h, int codec_id, const int bit_depth,
const int chroma_format_idc)
{
-// MpegEncContext * const s = &h->s;
-
#undef FUNC
#undef FUNCC
#define FUNC(a, depth) a ## _ ## depth
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index d5074d2..cd11ecd 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -141,7 +141,7 @@ typedef struct Picture{
uint16_t *mc_mb_var; ///< Table for motion compensated MB variances
uint8_t *mb_mean; ///< Table for MB luminance
int b_frame_score; /* */
- struct MpegEncContext *owner2; ///< pointer to the MpegEncContext that allocated this picture
+ void *owner2; ///< pointer to the context that allocated this picture
int needs_realloc; ///< Picture needs to be reallocated (eg due to a frame size change)
} Picture;
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index ee54a17..6c695f7 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -66,11 +66,19 @@
typedef struct {
H264Context h;
+ Picture *cur_pic;
+ Picture *next_pic;
+ Picture *last_pic;
int halfpel_flag;
int thirdpel_flag;
int unknown_flag;
int next_slice_index;
uint32_t watermark_key;
+ int adaptive_quant;
+ int next_p_frame_damaged;
+ int h_edge_pos;
+ int v_edge_pos;
+ int last_frame_output;
} SVQ3Context;
#define FULLPEL_MODE 1
@@ -267,12 +275,13 @@ static inline int svq3_decode_block(GetBitContext *gb, int16_t *block,
return 0;
}
-static inline void svq3_mc_dir_part(MpegEncContext *s,
+static inline void svq3_mc_dir_part(SVQ3Context *s,
int x, int y, int width, int height,
int mx, int my, int dxy,
int thirdpel, int dir, int avg)
{
- const Picture *pic = (dir == 0) ? &s->last_picture : &s->next_picture;
+ H264Context *h = &s->h;
+ const Picture *pic = (dir == 0) ? s->last_pic : s->next_pic;
uint8_t *src, *dest;
int i, emu = 0;
int blocksize = 2 - (width >> 3); // 16->0, 8->1, 4->2
@@ -282,7 +291,7 @@ static inline void svq3_mc_dir_part(MpegEncContext *s,
if (mx < 0 || mx >= s->h_edge_pos - width - 1 ||
my < 0 || my >= s->v_edge_pos - height - 1) {
- if ((s->flags & CODEC_FLAG_EMU_EDGE))
+ if ((h->flags & CODEC_FLAG_EMU_EDGE))
emu = 1;
mx = av_clip(mx, -16, s->h_edge_pos - width + 15);
@@ -290,25 +299,25 @@ static inline void svq3_mc_dir_part(MpegEncContext *s,
}
/* form component predictions */
- dest = s->current_picture.f.data[0] + x + y * s->linesize;
- src = pic->f.data[0] + mx + my * s->linesize;
+ dest = h->cur_pic.f.data[0] + x + y * h->linesize;
+ src = pic->f.data[0] + mx + my * h->linesize;
if (emu) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src, s->linesize,
+ h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src, h->linesize,
width + 1, height + 1,
mx, my, s->h_edge_pos, s->v_edge_pos);
- src = s->edge_emu_buffer;
+ src = h->edge_emu_buffer;
}
if (thirdpel)
- (avg ? s->dsp.avg_tpel_pixels_tab
- : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->linesize,
+ (avg ? h->dsp.avg_tpel_pixels_tab
+ : h->dsp.put_tpel_pixels_tab)[dxy](dest, src, h->linesize,
width, height);
else
- (avg ? s->dsp.avg_pixels_tab
- : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->linesize,
+ (avg ? h->dsp.avg_pixels_tab
+ : h->dsp.put_pixels_tab)[blocksize][dxy](dest, src, h->linesize,
height);
- if (!(s->flags & CODEC_FLAG_GRAY)) {
+ if (!(h->flags & CODEC_FLAG_GRAY)) {
mx = mx + (mx < (int) x) >> 1;
my = my + (my < (int) y) >> 1;
width = width >> 1;
@@ -316,35 +325,35 @@ static inline void svq3_mc_dir_part(MpegEncContext *s,
blocksize++;
for (i = 1; i < 3; i++) {
- dest = s->current_picture.f.data[i] + (x >> 1) + (y >> 1) * s->uvlinesize;
- src = pic->f.data[i] + mx + my * s->uvlinesize;
+ dest = h->cur_pic.f.data[i] + (x >> 1) + (y >> 1) * h->uvlinesize;
+ src = pic->f.data[i] + mx + my * h->uvlinesize;
if (emu) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src, s->uvlinesize,
+ h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src, h->uvlinesize,
width + 1, height + 1,
mx, my, (s->h_edge_pos >> 1),
s->v_edge_pos >> 1);
- src = s->edge_emu_buffer;
+ src = h->edge_emu_buffer;
}
if (thirdpel)
- (avg ? s->dsp.avg_tpel_pixels_tab
- : s->dsp.put_tpel_pixels_tab)[dxy](dest, src,
- s->uvlinesize,
+ (avg ? h->dsp.avg_tpel_pixels_tab
+ : h->dsp.put_tpel_pixels_tab)[dxy](dest, src,
+ h->uvlinesize,
width, height);
else
- (avg ? s->dsp.avg_pixels_tab
- : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src,
- s->uvlinesize,
+ (avg ? h->dsp.avg_pixels_tab
+ : h->dsp.put_pixels_tab)[blocksize][dxy](dest, src,
+ h->uvlinesize,
height);
}
}
}
-static inline int svq3_mc_dir(H264Context *h, int size, int mode,
+static inline int svq3_mc_dir(SVQ3Context *s, int size, int mode,
int dir, int avg)
{
int i, j, k, mx, my, dx, dy, x, y;
- MpegEncContext *const s = (MpegEncContext *)h;
+ H264Context *h = &s->h;
const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1);
const int part_height = 16 >> ((unsigned)(size + 1) / 3);
const int extra_width = (mode == PREDICT_MODE) ? -16 * 6 : 0;
@@ -353,19 +362,19 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode,
for (i = 0; i < 16; i += part_height)
for (j = 0; j < 16; j += part_width) {
- const int b_xy = (4 * s->mb_x + (j >> 2)) +
- (4 * s->mb_y + (i >> 2)) * h->b_stride;
+ const int b_xy = (4 * h->mb_x + (j >> 2)) +
+ (4 * h->mb_y + (i >> 2)) * h->b_stride;
int dxy;
- x = 16 * s->mb_x + j;
- y = 16 * s->mb_y + i;
+ x = 16 * h->mb_x + j;
+ y = 16 * h->mb_y + i;
k = (j >> 2 & 1) + (i >> 1 & 2) +
(j >> 1 & 4) + (i & 8);
if (mode != PREDICT_MODE) {
pred_motion(h, k, part_width >> 2, dir, 1, &mx, &my);
} else {
- mx = s->next_picture.f.motion_val[0][b_xy][0] << 1;
- my = s->next_picture.f.motion_val[0][b_xy][1] << 1;
+ mx = s->next_pic->f.motion_val[0][b_xy][0] << 1;
+ my = s->next_pic->f.motion_val[0][b_xy][1] << 1;
if (dir == 0) {
mx = mx * h->frame_num_offset /
@@ -388,11 +397,11 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode,
if (mode == PREDICT_MODE) {
dx = dy = 0;
} else {
- dy = svq3_get_se_golomb(&s->gb);
- dx = svq3_get_se_golomb(&s->gb);
+ dy = svq3_get_se_golomb(&h->gb);
+ dx = svq3_get_se_golomb(&h->gb);
if (dx == INVALID_VLC || dy == INVALID_VLC) {
- av_log(h->s.avctx, AV_LOG_ERROR, "invalid MV vlc\n");
+ av_log(h->avctx, AV_LOG_ERROR, "invalid MV vlc\n");
return -1;
}
}
@@ -446,7 +455,7 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode,
}
/* write back motion vectors */
- fill_rectangle(s->current_picture.f.motion_val[dir][b_xy],
+ fill_rectangle(h->cur_pic.f.motion_val[dir][b_xy],
part_width >> 2, part_height >> 2, h->b_stride,
pack16to32(mx, my), 4);
}
@@ -454,46 +463,45 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode,
return 0;
}
-static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
+static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
{
- H264Context *h = &svq3->h;
+ H264Context *h = &s->h;
int i, j, k, m, dir, mode;
int cbp = 0;
uint32_t vlc;
int8_t *top, *left;
- MpegEncContext *const s = (MpegEncContext *)h;
const int mb_xy = h->mb_xy;
- const int b_xy = 4 * s->mb_x + 4 * s->mb_y * h->b_stride;
+ const int b_xy = 4 * h->mb_x + 4 * h->mb_y * h->b_stride;
- h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
- h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF;
+ h->top_samples_available = (h->mb_y == 0) ? 0x33FF : 0xFFFF;
+ h->left_samples_available = (h->mb_x == 0) ? 0x5F5F : 0xFFFF;
h->topright_samples_available = 0xFFFF;
if (mb_type == 0) { /* SKIP */
- if (s->pict_type == AV_PICTURE_TYPE_P ||
- s->next_picture.f.mb_type[mb_xy] == -1) {
- svq3_mc_dir_part(s, 16 * s->mb_x, 16 * s->mb_y, 16, 16,
+ if (h->pict_type == AV_PICTURE_TYPE_P ||
+ s->next_pic->f.mb_type[mb_xy] == -1) {
+ svq3_mc_dir_part(s, 16 * h->mb_x, 16 * h->mb_y, 16, 16,
0, 0, 0, 0, 0, 0);
- if (s->pict_type == AV_PICTURE_TYPE_B)
- svq3_mc_dir_part(s, 16 * s->mb_x, 16 * s->mb_y, 16, 16,
+ if (h->pict_type == AV_PICTURE_TYPE_B)
+ svq3_mc_dir_part(s, 16 * h->mb_x, 16 * h->mb_y, 16, 16,
0, 0, 0, 0, 1, 1);
mb_type = MB_TYPE_SKIP;
} else {
- mb_type = FFMIN(s->next_picture.f.mb_type[mb_xy], 6);
- if (svq3_mc_dir(h, mb_type, PREDICT_MODE, 0, 0) < 0)
+ mb_type = FFMIN(s->next_pic->f.mb_type[mb_xy], 6);
+ if (svq3_mc_dir(s, mb_type, PREDICT_MODE, 0, 0) < 0)
return -1;
- if (svq3_mc_dir(h, mb_type, PREDICT_MODE, 1, 1) < 0)
+ if (svq3_mc_dir(s, mb_type, PREDICT_MODE, 1, 1) < 0)
return -1;
mb_type = MB_TYPE_16x16;
}
} else if (mb_type < 8) { /* INTER */
- if (svq3->thirdpel_flag && svq3->halfpel_flag == !get_bits1(&s->gb))
+ if (s->thirdpel_flag && s->halfpel_flag == !get_bits1(&h->gb))
mode = THIRDPEL_MODE;
- else if (svq3->halfpel_flag &&
- svq3->thirdpel_flag == !get_bits1(&s->gb))
+ else if (s->halfpel_flag &&
+ s->thirdpel_flag == !get_bits1(&h->gb))
mode = HALFPEL_MODE;
else
mode = FULLPEL_MODE;
@@ -508,62 +516,62 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
*/
for (m = 0; m < 2; m++) {
- if (s->mb_x > 0 && h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6] != -1) {
+ if (h->mb_x > 0 && h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6] != -1) {
for (i = 0; i < 4; i++)
AV_COPY32(h->mv_cache[m][scan8[0] - 1 + i * 8],
- s->current_picture.f.motion_val[m][b_xy - 1 + i * h->b_stride]);
+ h->cur_pic.f.motion_val[m][b_xy - 1 + i * h->b_stride]);
} else {
for (i = 0; i < 4; i++)
AV_ZERO32(h->mv_cache[m][scan8[0] - 1 + i * 8]);
}
- if (s->mb_y > 0) {
+ if (h->mb_y > 0) {
memcpy(h->mv_cache[m][scan8[0] - 1 * 8],
- s->current_picture.f.motion_val[m][b_xy - h->b_stride],
+ h->cur_pic.f.motion_val[m][b_xy - h->b_stride],
4 * 2 * sizeof(int16_t));
memset(&h->ref_cache[m][scan8[0] - 1 * 8],
- (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1, 4);
+ (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1, 4);
- if (s->mb_x < s->mb_width - 1) {
+ if (h->mb_x < h->mb_width - 1) {
AV_COPY32(h->mv_cache[m][scan8[0] + 4 - 1 * 8],
- s->current_picture.f.motion_val[m][b_xy - h->b_stride + 4]);
+ h->cur_pic.f.motion_val[m][b_xy - h->b_stride + 4]);
h->ref_cache[m][scan8[0] + 4 - 1 * 8] =
- (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride + 1] + 6] == -1 ||
- h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1;
+ (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride + 1] + 6] == -1 ||
+ h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1;
} else
h->ref_cache[m][scan8[0] + 4 - 1 * 8] = PART_NOT_AVAILABLE;
- if (s->mb_x > 0) {
+ if (h->mb_x > 0) {
AV_COPY32(h->mv_cache[m][scan8[0] - 1 - 1 * 8],
- s->current_picture.f.motion_val[m][b_xy - h->b_stride - 1]);
+ h->cur_pic.f.motion_val[m][b_xy - h->b_stride - 1]);
h->ref_cache[m][scan8[0] - 1 - 1 * 8] =
- (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride - 1] + 3] == -1) ? PART_NOT_AVAILABLE : 1;
+ (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride - 1] + 3] == -1) ? PART_NOT_AVAILABLE : 1;
} else
h->ref_cache[m][scan8[0] - 1 - 1 * 8] = PART_NOT_AVAILABLE;
} else
memset(&h->ref_cache[m][scan8[0] - 1 * 8 - 1],
PART_NOT_AVAILABLE, 8);
- if (s->pict_type != AV_PICTURE_TYPE_B)
+ if (h->pict_type != AV_PICTURE_TYPE_B)
break;
}
/* decode motion vector(s) and form prediction(s) */
- if (s->pict_type == AV_PICTURE_TYPE_P) {
- if (svq3_mc_dir(h, mb_type - 1, mode, 0, 0) < 0)
+ if (h->pict_type == AV_PICTURE_TYPE_P) {
+ if (svq3_mc_dir(s, mb_type - 1, mode, 0, 0) < 0)
return -1;
} else { /* AV_PICTURE_TYPE_B */
if (mb_type != 2)
- if (svq3_mc_dir(h, 0, mode, 0, 0) < 0)
+ if (svq3_mc_dir(s, 0, mode, 0, 0) < 0)
return -1;
else
for (i = 0; i < 4; i++)
- memset(s->current_picture.f.motion_val[0][b_xy + i * h->b_stride],
+ memset(h->cur_pic.f.motion_val[0][b_xy + i * h->b_stride],
0, 4 * 2 * sizeof(int16_t));
if (mb_type != 1)
- if (svq3_mc_dir(h, 0, mode, 1, mb_type == 3) < 0)
+ if (svq3_mc_dir(s, 0, mode, 1, mb_type == 3) < 0)
return -1;
else
for (i = 0; i < 4; i++)
- memset(s->current_picture.f.motion_val[1][b_xy + i * h->b_stride],
+ memset(h->cur_pic.f.motion_val[1][b_xy + i * h->b_stride],
0, 4 * 2 * sizeof(int16_t));
}
@@ -572,17 +580,17 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
memset(h->intra4x4_pred_mode_cache, -1, 8 * 5 * sizeof(int8_t));
if (mb_type == 8) {
- if (s->mb_x > 0) {
+ if (h->mb_x > 0) {
for (i = 0; i < 4; i++)
h->intra4x4_pred_mode_cache[scan8[0] - 1 + i * 8] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6 - i];
if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1)
h->left_samples_available = 0x5F5F;
}
- if (s->mb_y > 0) {
- h->intra4x4_pred_mode_cache[4 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 0];
- h->intra4x4_pred_mode_cache[5 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 1];
- h->intra4x4_pred_mode_cache[6 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 2];
- h->intra4x4_pred_mode_cache[7 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 3];
+ if (h->mb_y > 0) {
+ h->intra4x4_pred_mode_cache[4 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 0];
+ h->intra4x4_pred_mode_cache[5 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 1];
+ h->intra4x4_pred_mode_cache[6 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 2];
+ h->intra4x4_pred_mode_cache[7 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 3];
if (h->intra4x4_pred_mode_cache[4 + 8 * 0] == -1)
h->top_samples_available = 0x33FF;
@@ -590,10 +598,10 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
/* decode prediction codes for luma blocks */
for (i = 0; i < 16; i += 2) {
- vlc = svq3_get_ue_golomb(&s->gb);
+ vlc = svq3_get_ue_golomb(&h->gb);
if (vlc >= 25) {
- av_log(h->s.avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc);
+ av_log(h->avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc);
return -1;
}
@@ -604,7 +612,7 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
left[2] = svq3_pred_1[top[1] + 1][left[1] + 1][svq3_pred_0[vlc][1]];
if (left[1] == -1 || left[2] == -1) {
- av_log(h->s.avctx, AV_LOG_ERROR, "weird prediction\n");
+ av_log(h->avctx, AV_LOG_ERROR, "weird prediction\n");
return -1;
}
}
@@ -618,8 +626,8 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
if (mb_type == 8) {
ff_h264_check_intra4x4_pred_mode(h);
- h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
- h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF;
+ h->top_samples_available = (h->mb_y == 0) ? 0x33FF : 0xFFFF;
+ h->left_samples_available = (h->mb_x == 0) ? 0x5F5F : 0xFFFF;
} else {
for (i = 0; i < 4; i++)
memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8 * i], DC_128_PRED, 4);
@@ -634,7 +642,7 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
dir = (dir >> 1) ^ 3 * (dir & 1) ^ 1;
if ((h->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, dir, 0)) == -1) {
- av_log(h->s.avctx, AV_LOG_ERROR, "check_intra_pred_mode = -1\n");
+ av_log(h->avctx, AV_LOG_ERROR, "check_intra_pred_mode = -1\n");
return -1;
}
@@ -642,29 +650,29 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
mb_type = MB_TYPE_INTRA16x16;
}
- if (!IS_INTER(mb_type) && s->pict_type != AV_PICTURE_TYPE_I) {
+ if (!IS_INTER(mb_type) && h->pict_type != AV_PICTURE_TYPE_I) {
for (i = 0; i < 4; i++)
- memset(s->current_picture.f.motion_val[0][b_xy + i * h->b_stride],
+ memset(h->cur_pic.f.motion_val[0][b_xy + i * h->b_stride],
0, 4 * 2 * sizeof(int16_t));
- if (s->pict_type == AV_PICTURE_TYPE_B) {
+ if (h->pict_type == AV_PICTURE_TYPE_B) {
for (i = 0; i < 4; i++)
- memset(s->current_picture.f.motion_val[1][b_xy + i * h->b_stride],
+ memset(h->cur_pic.f.motion_val[1][b_xy + i * h->b_stride],
0, 4 * 2 * sizeof(int16_t));
}
}
if (!IS_INTRA4x4(mb_type)) {
memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy], DC_PRED, 8);
}
- if (!IS_SKIP(mb_type) || s->pict_type == AV_PICTURE_TYPE_B) {
+ if (!IS_SKIP(mb_type) || h->pict_type == AV_PICTURE_TYPE_B) {
memset(h->non_zero_count_cache + 8, 0, 14 * 8 * sizeof(uint8_t));
- s->dsp.clear_blocks(h->mb + 0);
- s->dsp.clear_blocks(h->mb + 384);
+ h->dsp.clear_blocks(h->mb + 0);
+ h->dsp.clear_blocks(h->mb + 384);
}
if (!IS_INTRA16x16(mb_type) &&
- (!IS_SKIP(mb_type) || s->pict_type == AV_PICTURE_TYPE_B)) {
- if ((vlc = svq3_get_ue_golomb(&s->gb)) >= 48) {
- av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc);
+ (!IS_SKIP(mb_type) || h->pict_type == AV_PICTURE_TYPE_B)) {
+ if ((vlc = svq3_get_ue_golomb(&h->gb)) >= 48) {
+ av_log(h->avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc);
return -1;
}
@@ -672,19 +680,19 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
: golomb_to_inter_cbp[vlc];
}
if (IS_INTRA16x16(mb_type) ||
- (s->pict_type != AV_PICTURE_TYPE_I && s->adaptive_quant && cbp)) {
- s->qscale += svq3_get_se_golomb(&s->gb);
+ (h->pict_type != AV_PICTURE_TYPE_I && s->adaptive_quant && cbp)) {
+ h->qscale += svq3_get_se_golomb(&h->gb);
- if (s->qscale > 31u) {
- av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale);
+ if (h->qscale > 31u) {
+ av_log(h->avctx, AV_LOG_ERROR, "qscale:%d\n", h->qscale);
return -1;
}
}
if (IS_INTRA16x16(mb_type)) {
AV_ZERO128(h->mb_luma_dc[0] + 0);
AV_ZERO128(h->mb_luma_dc[0] + 8);
- if (svq3_decode_block(&s->gb, h->mb_luma_dc[0], 0, 1)) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ if (svq3_decode_block(&h->gb, h->mb_luma_dc[0], 0, 1)) {
+ av_log(h->avctx, AV_LOG_ERROR,
"error while decoding intra luma dc\n");
return -1;
}
@@ -692,7 +700,7 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
if (cbp) {
const int index = IS_INTRA16x16(mb_type) ? 1 : 0;
- const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1);
+ const int type = ((h->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1);
for (i = 0; i < 4; i++)
if ((cbp & (1 << i))) {
@@ -702,8 +710,8 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
: (4 * i + j);
h->non_zero_count_cache[scan8[k]] = 1;
- if (svq3_decode_block(&s->gb, &h->mb[16 * k], index, type)) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ if (svq3_decode_block(&h->gb, &h->mb[16 * k], index, type)) {
+ av_log(h->avctx, AV_LOG_ERROR,
"error while decoding block\n");
return -1;
}
@@ -712,8 +720,8 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
if ((cbp & 0x30)) {
for (i = 1; i < 3; ++i)
- if (svq3_decode_block(&s->gb, &h->mb[16 * 16 * i], 0, 3)) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ if (svq3_decode_block(&h->gb, &h->mb[16 * 16 * i], 0, 3)) {
+ av_log(h->avctx, AV_LOG_ERROR,
"error while decoding chroma dc block\n");
return -1;
}
@@ -724,8 +732,8 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
k = 16 * i + j;
h->non_zero_count_cache[scan8[k]] = 1;
- if (svq3_decode_block(&s->gb, &h->mb[16 * k], 1, 1)) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ if (svq3_decode_block(&h->gb, &h->mb[16 * k], 1, 1)) {
+ av_log(h->avctx, AV_LOG_ERROR,
"error while decoding chroma ac block\n");
return -1;
}
@@ -736,7 +744,7 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
}
h->cbp = cbp;
- s->current_picture.f.mb_type[mb_xy] = mb_type;
+ h->cur_pic.f.mb_type[mb_xy] = mb_type;
if (IS_INTRA(mb_type))
h->chroma_pred_mode = ff_h264_check_intra_pred_mode(h, DC_PRED8x8, 1);
@@ -746,14 +754,13 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
static int svq3_decode_slice_header(AVCodecContext *avctx)
{
- SVQ3Context *svq3 = avctx->priv_data;
- H264Context *h = &svq3->h;
- MpegEncContext *s = &h->s;
+ SVQ3Context *s = avctx->priv_data;
+ H264Context *h = &s->h;
const int mb_xy = h->mb_xy;
int i, header;
unsigned slice_id;
- header = get_bits(&s->gb, 8);
+ header = get_bits(&h->gb, 8);
if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) {
/* TODO: what? */
@@ -762,75 +769,75 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
} else {
int length = header >> 5 & 3;
- svq3->next_slice_index = get_bits_count(&s->gb) +
- 8 * show_bits(&s->gb, 8 * length) +
- 8 * length;
+ s->next_slice_index = get_bits_count(&h->gb) +
+ 8 * show_bits(&h->gb, 8 * length) +
+ 8 * length;
- if (svq3->next_slice_index > s->gb.size_in_bits) {
+ if (s->next_slice_index > h->gb.size_in_bits) {
av_log(avctx, AV_LOG_ERROR, "slice after bitstream end\n");
return -1;
}
- s->gb.size_in_bits = svq3->next_slice_index - 8 * (length - 1);
- skip_bits(&s->gb, 8);
+ h->gb.size_in_bits = s->next_slice_index - 8 * (length - 1);
+ skip_bits(&h->gb, 8);
- if (svq3->watermark_key) {
- uint32_t header = AV_RL32(&s->gb.buffer[(get_bits_count(&s->gb) >> 3) + 1]);
- AV_WL32(&s->gb.buffer[(get_bits_count(&s->gb) >> 3) + 1],
- header ^ svq3->watermark_key);
+ if (s->watermark_key) {
+ uint32_t header = AV_RL32(&h->gb.buffer[(get_bits_count(&h->gb) >> 3) + 1]);
+ AV_WL32(&h->gb.buffer[(get_bits_count(&h->gb) >> 3) + 1],
+ header ^ s->watermark_key);
}
if (length > 0) {
- memcpy((uint8_t *) &s->gb.buffer[get_bits_count(&s->gb) >> 3],
- &s->gb.buffer[s->gb.size_in_bits >> 3], length - 1);
+ memcpy((uint8_t *) &h->gb.buffer[get_bits_count(&h->gb) >> 3],
+ &h->gb.buffer[h->gb.size_in_bits >> 3], length - 1);
}
- skip_bits_long(&s->gb, 0);
+ skip_bits_long(&h->gb, 0);
}
- if ((slice_id = svq3_get_ue_golomb(&s->gb)) >= 3) {
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", slice_id);
+ if ((slice_id = svq3_get_ue_golomb(&h->gb)) >= 3) {
+ av_log(h->avctx, AV_LOG_ERROR, "illegal slice type %d \n", slice_id);
return -1;
}
h->slice_type = golomb_to_pict_type[slice_id];
if ((header & 0x9F) == 2) {
- i = (s->mb_num < 64) ? 6 : (1 + av_log2(s->mb_num - 1));
- s->mb_skip_run = get_bits(&s->gb, i) -
- (s->mb_y * s->mb_width + s->mb_x);
+ i = (h->mb_num < 64) ? 6 : (1 + av_log2(h->mb_num - 1));
+ h->mb_skip_run = get_bits(&h->gb, i) -
+ (h->mb_y * h->mb_width + h->mb_x);
} else {
- skip_bits1(&s->gb);
- s->mb_skip_run = 0;
+ skip_bits1(&h->gb);
+ h->mb_skip_run = 0;
}
- h->slice_num = get_bits(&s->gb, 8);
- s->qscale = get_bits(&s->gb, 5);
- s->adaptive_quant = get_bits1(&s->gb);
+ h->slice_num = get_bits(&h->gb, 8);
+ h->qscale = get_bits(&h->gb, 5);
+ s->adaptive_quant = get_bits1(&h->gb);
/* unknown fields */
- skip_bits1(&s->gb);
+ skip_bits1(&h->gb);
- if (svq3->unknown_flag)
- skip_bits1(&s->gb);
+ if (s->unknown_flag)
+ skip_bits1(&h->gb);
- skip_bits1(&s->gb);
- skip_bits(&s->gb, 2);
+ skip_bits1(&h->gb);
+ skip_bits(&h->gb, 2);
- while (get_bits1(&s->gb))
- skip_bits(&s->gb, 8);
+ while (get_bits1(&h->gb))
+ skip_bits(&h->gb, 8);
/* reset intra predictors and invalidate motion vector references */
- if (s->mb_x > 0) {
+ if (h->mb_x > 0) {
memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - 1] + 3,
-1, 4 * sizeof(int8_t));
- memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - s->mb_x],
- -1, 8 * sizeof(int8_t) * s->mb_x);
+ memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - h->mb_x],
+ -1, 8 * sizeof(int8_t) * h->mb_x);
}
- if (s->mb_y > 0) {
- memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - s->mb_stride],
- -1, 8 * sizeof(int8_t) * (s->mb_width - s->mb_x));
+ if (h->mb_y > 0) {
+ memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - h->mb_stride],
+ -1, 8 * sizeof(int8_t) * (h->mb_width - h->mb_x));
- if (s->mb_x > 0)
- h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride - 1] + 3] = -1;
+ if (h->mb_x > 0)
+ h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride - 1] + 3] = -1;
}
return 0;
@@ -838,29 +845,38 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
static av_cold int svq3_decode_init(AVCodecContext *avctx)
{
- SVQ3Context *svq3 = avctx->priv_data;
- H264Context *h = &svq3->h;
- MpegEncContext *s = &h->s;
+ SVQ3Context *s = avctx->priv_data;
+ H264Context *h = &s->h;
int m;
unsigned char *extradata;
unsigned char *extradata_end;
unsigned int size;
int marker_found = 0;
+ s->cur_pic = av_mallocz(sizeof(*s->cur_pic));
+ s->last_pic = av_mallocz(sizeof(*s->last_pic));
+ s->next_pic = av_mallocz(sizeof(*s->next_pic));
+ if (!s->next_pic || !s->last_pic || !s->cur_pic) {
+ av_freep(&s->cur_pic);
+ av_freep(&s->last_pic);
+ av_freep(&s->next_pic);
+ return AVERROR(ENOMEM);
+ }
+
if (ff_h264_decode_init(avctx) < 0)
return -1;
- s->flags = avctx->flags;
- s->flags2 = avctx->flags2;
- s->unrestricted_mv = 1;
+ h->flags = avctx->flags;
h->is_complex = 1;
+ h->picture_structure = PICT_FRAME;
avctx->pix_fmt = avctx->codec->pix_fmts[0];
h->chroma_qp[0] = h->chroma_qp[1] = 4;
+ h->chroma_x_shift = h->chroma_y_shift = 1;
- svq3->halfpel_flag = 1;
- svq3->thirdpel_flag = 1;
- svq3->unknown_flag = 0;
+ s->halfpel_flag = 1;
+ s->thirdpel_flag = 1;
+ s->unknown_flag = 0;
/* prowl for the "SEQH" marker in the extradata */
extradata = (unsigned char *)avctx->extradata;
@@ -922,8 +938,8 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
break;
}
- svq3->halfpel_flag = get_bits1(&gb);
- svq3->thirdpel_flag = get_bits1(&gb);
+ s->halfpel_flag = get_bits1(&gb);
+ s->thirdpel_flag = get_bits1(&gb);
/* unknown fields */
skip_bits1(&gb);
@@ -931,7 +947,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
skip_bits1(&gb);
skip_bits1(&gb);
- s->low_delay = get_bits1(&gb);
+ h->low_delay = get_bits1(&gb);
/* unknown field */
skip_bits1(&gb);
@@ -939,9 +955,9 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
while (get_bits1(&gb))
skip_bits(&gb, 8);
- svq3->unknown_flag = get_bits1(&gb);
- avctx->has_b_frames = !s->low_delay;
- if (svq3->unknown_flag) {
+ s->unknown_flag = get_bits1(&gb);
+ avctx->has_b_frames = !h->low_delay;
+ if (s->unknown_flag) {
#if CONFIG_ZLIB
unsigned watermark_width = svq3_get_ue_golomb(&gb);
unsigned watermark_height = svq3_get_ue_golomb(&gb);
@@ -970,11 +986,10 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
av_free(buf);
return -1;
}
- svq3->watermark_key = ff_svq1_packet_checksum(buf, buf_len, 0);
- svq3->watermark_key = svq3->watermark_key << 16 |
- svq3->watermark_key;
+ s->watermark_key = ff_svq1_packet_checksum(buf, buf_len, 0);
+ s->watermark_key = s->watermark_key << 16 | s->watermark_key;
av_log(avctx, AV_LOG_DEBUG,
- "watermark key %#x\n", svq3->watermark_key);
+ "watermark key %#x\n", s->watermark_key);
av_free(buf);
#else
av_log(avctx, AV_LOG_ERROR,
@@ -984,13 +999,15 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
}
}
- s->width = avctx->width;
- s->height = avctx->height;
-
- if (ff_MPV_common_init(s) < 0)
- return -1;
-
- h->b_stride = 4 * s->mb_width;
+ h->width = avctx->width;
+ h->height = avctx->height;
+ h->mb_width = (h->width + 15) / 16;
+ h->mb_height = (h->height + 15) / 16;
+ h->mb_stride = h->mb_width + 1;
+ h->mb_num = h->mb_width * h->mb_height;
+ h->b_stride = 4 * h->mb_width;
+ s->h_edge_pos = h->mb_width * 16;
+ s->v_edge_pos = h->mb_height * 16;
if (ff_h264_alloc_tables(h) < 0) {
av_log(avctx, AV_LOG_ERROR, "svq3 memory allocation failed\n");
@@ -1000,73 +1017,153 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
return 0;
}
+static int get_buffer(AVCodecContext *avctx, Picture *pic)
+{
+ SVQ3Context *s = avctx->priv_data;
+ H264Context *h = &s->h;
+ const int big_mb_num = h->mb_stride * (h->mb_height + 1) + 1;
+ const int mb_array_size = h->mb_stride * h->mb_height;
+ const int b4_stride = h->mb_width * 4 + 1;
+ const int b4_array_size = b4_stride * h->mb_height * 4;
+ int ret;
+
+ if (!pic->motion_val_base[0]) {
+ int i;
+
+ pic->mb_type_base = av_mallocz((big_mb_num + h->mb_stride) * sizeof(uint32_t));
+ if (!pic->mb_type_base)
+ return AVERROR(ENOMEM);
+ pic->f.mb_type = pic->mb_type_base + 2 * h->mb_stride + 1;
+
+ for (i = 0; i < 2; i++) {
+ pic->motion_val_base[i] = av_mallocz(2 * (b4_array_size + 4) * sizeof(int16_t));
+ pic->f.ref_index[i] = av_mallocz(4 * mb_array_size);
+ if (!pic->motion_val_base[i] || !pic->f.ref_index[i])
+ return AVERROR(ENOMEM);
+
+ pic->f.motion_val[i] = pic->motion_val_base[i] + 4;
+ }
+ }
+ pic->f.motion_subsample_log2 = 2;
+ pic->f.reference = !(h->pict_type == AV_PICTURE_TYPE_B);
+
+ ret = ff_get_buffer(avctx, &pic->f);
+
+ h->linesize = pic->f.linesize[0];
+ h->uvlinesize = pic->f.linesize[1];
+
+ return ret;
+}
+
static int svq3_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame, AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
- SVQ3Context *svq3 = avctx->priv_data;
- H264Context *h = &svq3->h;
- MpegEncContext *s = &h->s;
+ SVQ3Context *s = avctx->priv_data;
+ H264Context *h = &s->h;
int buf_size = avpkt->size;
- int m;
+ int ret, m, i;
/* special case for last picture */
if (buf_size == 0) {
- if (s->next_picture_ptr && !s->low_delay) {
- *(AVFrame *) data = s->next_picture.f;
- s->next_picture_ptr = NULL;
+ if (s->next_pic->f.data[0] && !h->low_delay && !s->last_frame_output) {
+ *(AVFrame *) data = s->next_pic->f;
+ s->last_frame_output = 1;
*got_frame = 1;
}
return 0;
}
- init_get_bits(&s->gb, buf, 8 * buf_size);
+ init_get_bits(&h->gb, buf, 8 * buf_size);
- s->mb_x = s->mb_y = h->mb_xy = 0;
+ h->mb_x = h->mb_y = h->mb_xy = 0;
if (svq3_decode_slice_header(avctx))
return -1;
- s->pict_type = h->slice_type;
- s->picture_number = h->slice_num;
+ h->pict_type = h->slice_type;
- if (avctx->debug & FF_DEBUG_PICT_INFO)
- av_log(h->s.avctx, AV_LOG_DEBUG,
- "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n",
- av_get_picture_type_char(s->pict_type),
- svq3->halfpel_flag, svq3->thirdpel_flag,
- s->adaptive_quant, s->qscale, h->slice_num);
+ if (h->pict_type != AV_PICTURE_TYPE_B)
+ FFSWAP(Picture*, s->next_pic, s->last_pic);
+
+ if (s->cur_pic->f.data[0])
+ avctx->release_buffer(avctx, &s->cur_pic->f);
/* for skipping the frame */
- s->current_picture.f.pict_type = s->pict_type;
- s->current_picture.f.key_frame = (s->pict_type == AV_PICTURE_TYPE_I);
+ s->cur_pic->f.pict_type = h->pict_type;
+ s->cur_pic->f.key_frame = (h->pict_type == AV_PICTURE_TYPE_I);
- /* Skip B-frames if we do not have reference frames. */
- if (s->last_picture_ptr == NULL && s->pict_type == AV_PICTURE_TYPE_B)
- return 0;
- if (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == AV_PICTURE_TYPE_B ||
- avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != AV_PICTURE_TYPE_I ||
+ ret = get_buffer(avctx, s->cur_pic);
+ if (ret < 0)
+ return ret;
+
+ h->cur_pic_ptr = s->cur_pic;
+ h->cur_pic = *s->cur_pic;
+
+ for (i = 0; i < 16; i++) {
+ h->block_offset[i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 4 * h->linesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[48 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 8 * h->linesize * ((scan8[i] - scan8[0]) >> 3);
+ }
+ for (i = 0; i < 16; i++) {
+ h->block_offset[16 + i] =
+ h->block_offset[32 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 4 * h->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[48 + 16 + i] =
+ h->block_offset[48 + 32 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 8 * h->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
+ }
+
+ if (h->pict_type != AV_PICTURE_TYPE_I) {
+ if (!s->last_pic->f.data[0]) {
+ av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
+ ret = get_buffer(avctx, s->last_pic);
+ if (ret < 0)
+ return ret;
+ memset(s->last_pic->f.data[0], 0, avctx->height * s->last_pic->f.linesize[0]);
+ memset(s->last_pic->f.data[1], 0x80, (avctx->height / 2) *
+ s->last_pic->f.linesize[1]);
+ memset(s->last_pic->f.data[2], 0x80, (avctx->height / 2) *
+ s->last_pic->f.linesize[2]);
+ }
+
+ if (h->pict_type == AV_PICTURE_TYPE_B && !s->next_pic->f.data[0]) {
+ av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
+ ret = get_buffer(avctx, s->next_pic);
+ if (ret < 0)
+ return ret;
+ memset(s->next_pic->f.data[0], 0, avctx->height * s->next_pic->f.linesize[0]);
+ memset(s->next_pic->f.data[1], 0x80, (avctx->height / 2) *
+ s->next_pic->f.linesize[1]);
+ memset(s->next_pic->f.data[2], 0x80, (avctx->height / 2) *
+ s->next_pic->f.linesize[2]);
+ }
+ }
+
+ if (avctx->debug & FF_DEBUG_PICT_INFO)
+ av_log(h->avctx, AV_LOG_DEBUG,
+ "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n",
+ av_get_picture_type_char(h->pict_type),
+ s->halfpel_flag, s->thirdpel_flag,
+ s->adaptive_quant, h->qscale, h->slice_num);
+
+ if (avctx->skip_frame >= AVDISCARD_NONREF && h->pict_type == AV_PICTURE_TYPE_B ||
+ avctx->skip_frame >= AVDISCARD_NONKEY && h->pict_type != AV_PICTURE_TYPE_I ||
avctx->skip_frame >= AVDISCARD_ALL)
return 0;
if (s->next_p_frame_damaged) {
- if (s->pict_type == AV_PICTURE_TYPE_B)
+ if (h->pict_type == AV_PICTURE_TYPE_B)
return 0;
else
s->next_p_frame_damaged = 0;
}
- if (ff_h264_frame_start(h) < 0)
- return -1;
-
- if (s->pict_type == AV_PICTURE_TYPE_B) {
+ if (h->pict_type == AV_PICTURE_TYPE_B) {
h->frame_num_offset = h->slice_num - h->prev_frame_num;
if (h->frame_num_offset < 0)
h->frame_num_offset += 256;
if (h->frame_num_offset == 0 ||
h->frame_num_offset >= h->prev_frame_num_offset) {
- av_log(h->s.avctx, AV_LOG_ERROR, "error in B-frame picture id\n");
+ av_log(h->avctx, AV_LOG_ERROR, "error in B-frame picture id\n");
return -1;
}
} else {
@@ -1089,16 +1186,16 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data,
}
}
- for (s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
- for (s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) {
+ for (h->mb_y = 0; h->mb_y < h->mb_height; h->mb_y++) {
+ for (h->mb_x = 0; h->mb_x < h->mb_width; h->mb_x++) {
unsigned mb_type;
- h->mb_xy = s->mb_x + s->mb_y * s->mb_stride;
+ h->mb_xy = h->mb_x + h->mb_y * h->mb_stride;
- if ((get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits &&
- ((get_bits_count(&s->gb) & 7) == 0 ||
- show_bits(&s->gb, -get_bits_count(&s->gb) & 7) == 0)) {
- skip_bits(&s->gb, svq3->next_slice_index - get_bits_count(&s->gb));
- s->gb.size_in_bits = 8 * buf_size;
+ if ((get_bits_count(&h->gb) + 7) >= h->gb.size_in_bits &&
+ ((get_bits_count(&h->gb) & 7) == 0 ||
+ show_bits(&h->gb, -get_bits_count(&h->gb) & 7) == 0)) {
+ skip_bits(&h->gb, s->next_slice_index - get_bits_count(&h->gb));
+ h->gb.size_in_bits = 8 * buf_size;
if (svq3_decode_slice_header(avctx))
return -1;
@@ -1106,52 +1203,71 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data,
/* TODO: support s->mb_skip_run */
}
- mb_type = svq3_get_ue_golomb(&s->gb);
+ mb_type = svq3_get_ue_golomb(&h->gb);
- if (s->pict_type == AV_PICTURE_TYPE_I)
+ if (h->pict_type == AV_PICTURE_TYPE_I)
mb_type += 8;
- else if (s->pict_type == AV_PICTURE_TYPE_B && mb_type >= 4)
+ else if (h->pict_type == AV_PICTURE_TYPE_B && mb_type >= 4)
mb_type += 4;
- if (mb_type > 33 || svq3_decode_mb(svq3, mb_type)) {
- av_log(h->s.avctx, AV_LOG_ERROR,
- "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
+ if (mb_type > 33 || svq3_decode_mb(s, mb_type)) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "error while decoding MB %d %d\n", h->mb_x, h->mb_y);
return -1;
}
if (mb_type != 0)
ff_h264_hl_decode_mb(h);
- if (s->pict_type != AV_PICTURE_TYPE_B && !s->low_delay)
- s->current_picture.f.mb_type[s->mb_x + s->mb_y * s->mb_stride] =
- (s->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1;
+ if (h->pict_type != AV_PICTURE_TYPE_B && !h->low_delay)
+ h->cur_pic.f.mb_type[h->mb_x + h->mb_y * h->mb_stride] =
+ (h->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1;
}
- ff_mpeg_draw_horiz_band(s, 16 * s->mb_y, 16);
+ ff_draw_horiz_band(avctx, &h->dsp, s->cur_pic, s->last_pic->f.data[0] ? s->last_pic : NULL,
+ 16 * h->mb_y, 16, h->picture_structure, 0, 1,
+ h->low_delay, h->mb_height * 16, h->mb_width * 16);
}
- ff_MPV_frame_end(s);
-
- if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay)
- *(AVFrame *)data = s->current_picture.f;
+ if (h->pict_type == AV_PICTURE_TYPE_B || h->low_delay)
+ *(AVFrame *)data = s->cur_pic->f;
else
- *(AVFrame *)data = s->last_picture.f;
+ *(AVFrame *)data = s->last_pic->f;
/* Do not output the last pic after seeking. */
- if (s->last_picture_ptr || s->low_delay)
+ if (s->last_pic->f.data[0] || h->low_delay)
*got_frame = 1;
+ if (h->pict_type != AV_PICTURE_TYPE_B) {
+ FFSWAP(Picture*, s->cur_pic, s->next_pic);
+ }
+
return buf_size;
}
+static void free_picture(AVCodecContext *avctx, Picture *pic)
+{
+ int i;
+ for (i = 0; i < 2; i++) {
+ av_freep(&pic->motion_val_base[i]);
+ av_freep(&pic->f.ref_index[i]);
+ }
+ av_freep(&pic->mb_type_base);
+
+ if (pic->f.data[0])
+ avctx->release_buffer(avctx, &pic->f);
+ av_freep(&pic);
+}
+
static int svq3_decode_end(AVCodecContext *avctx)
{
- SVQ3Context *svq3 = avctx->priv_data;
- H264Context *h = &svq3->h;
- MpegEncContext *s = &h->s;
+ SVQ3Context *s = avctx->priv_data;
+ H264Context *h = &s->h;
- ff_h264_free_context(h);
+ free_picture(avctx, s->cur_pic);
+ free_picture(avctx, s->next_pic);
+ free_picture(avctx, s->last_pic);
- ff_MPV_common_end(s);
+ ff_h264_free_context(h);
return 0;
}
diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index b74604e..9c07c8d 100644
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "h264.h"
#include "vaapi_internal.h"
/**
@@ -40,7 +41,7 @@ static void destroy_buffers(VADisplay display, VABufferID *buffers, unsigned int
}
}
-static int render_picture(struct vaapi_context *vactx, VASurfaceID surface)
+int ff_vaapi_render_picture(struct vaapi_context *vactx, VASurfaceID surface)
{
VABufferID va_buffers[3];
unsigned int n_va_buffers = 0;
@@ -77,7 +78,7 @@ static int render_picture(struct vaapi_context *vactx, VASurfaceID surface)
return 0;
}
-static int commit_slices(struct vaapi_context *vactx)
+int ff_vaapi_commit_slices(struct vaapi_context *vactx)
{
VABufferID *slice_buf_ids;
VABufferID slice_param_buf_id, slice_data_buf_id;
@@ -152,7 +153,7 @@ VASliceParameterBufferBase *ff_vaapi_alloc_slice(struct vaapi_context *vactx, co
if (!vactx->slice_data)
vactx->slice_data = buffer;
if (vactx->slice_data + vactx->slice_data_size != buffer) {
- if (commit_slices(vactx) < 0)
+ if (ff_vaapi_commit_slices(vactx) < 0)
return NULL;
vactx->slice_data = buffer;
}
@@ -175,23 +176,12 @@ VASliceParameterBufferBase *ff_vaapi_alloc_slice(struct vaapi_context *vactx, co
return slice_param;
}
-int ff_vaapi_common_end_frame(MpegEncContext *s)
+void ff_vaapi_common_end_frame(AVCodecContext *avctx)
{
- struct vaapi_context * const vactx = s->avctx->hwaccel_context;
- int ret = -1;
+ struct vaapi_context * const vactx = avctx->hwaccel_context;
- av_dlog(s->avctx, "ff_vaapi_common_end_frame()\n");
+ av_dlog(avctx, "ff_vaapi_common_end_frame()\n");
- if (commit_slices(vactx) < 0)
- goto done;
- if (vactx->n_slice_buf_ids > 0) {
- if (render_picture(vactx, ff_vaapi_get_surface_id(s->current_picture_ptr)) < 0)
- goto done;
- ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
- }
- ret = 0;
-
-done:
destroy_buffers(vactx->display, &vactx->pic_param_buf_id, 1);
destroy_buffers(vactx->display, &vactx->iq_matrix_buf_id, 1);
destroy_buffers(vactx->display, &vactx->bitplane_buf_id, 1);
@@ -202,6 +192,27 @@ done:
vactx->slice_buf_ids_alloc = 0;
vactx->slice_count = 0;
vactx->slice_params_alloc = 0;
+}
+
+int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx)
+{
+ struct vaapi_context * const vactx = avctx->hwaccel_context;
+ MpegEncContext *s = avctx->priv_data;
+ int ret;
+
+ ret = ff_vaapi_commit_slices(vactx);
+ if (ret < 0)
+ goto finish;
+
+ ret = ff_vaapi_render_picture(vactx,
+ ff_vaapi_get_surface_id(s->current_picture_ptr));
+ if (ret < 0)
+ goto finish;
+
+ ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
+
+finish:
+ ff_vaapi_common_end_frame(avctx->priv_data);
return ret;
}
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index 4ffc7d8..5e98312 100644
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -224,7 +224,6 @@ static int start_frame(AVCodecContext *avctx,
av_unused uint32_t size)
{
H264Context * const h = avctx->priv_data;
- MpegEncContext * const s = &h->s;
struct vaapi_context * const vactx = avctx->hwaccel_context;
VAPictureParameterBufferH264 *pic_param;
VAIQMatrixBufferH264 *iq_matrix;
@@ -237,11 +236,11 @@ static int start_frame(AVCodecContext *avctx,
pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferH264));
if (!pic_param)
return -1;
- fill_vaapi_pic(&pic_param->CurrPic, s->current_picture_ptr, s->picture_structure);
+ fill_vaapi_pic(&pic_param->CurrPic, h->cur_pic_ptr, h->picture_structure);
if (fill_vaapi_ReferenceFrames(pic_param, h) < 0)
return -1;
- pic_param->picture_width_in_mbs_minus1 = s->mb_width - 1;
- pic_param->picture_height_in_mbs_minus1 = s->mb_height - 1;
+ pic_param->picture_width_in_mbs_minus1 = h->mb_width - 1;
+ pic_param->picture_height_in_mbs_minus1 = h->mb_height - 1;
pic_param->bit_depth_luma_minus8 = h->sps.bit_depth_luma - 8;
pic_param->bit_depth_chroma_minus8 = h->sps.bit_depth_chroma - 8;
pic_param->num_ref_frames = h->sps.ref_frame_count;
@@ -269,7 +268,7 @@ static int start_frame(AVCodecContext *avctx,
pic_param->pic_fields.bits.weighted_pred_flag = h->pps.weighted_pred;
pic_param->pic_fields.bits.weighted_bipred_idc = h->pps.weighted_bipred_idc;
pic_param->pic_fields.bits.transform_8x8_mode_flag = h->pps.transform_8x8_mode;
- pic_param->pic_fields.bits.field_pic_flag = s->picture_structure != PICT_FRAME;
+ pic_param->pic_fields.bits.field_pic_flag = h->picture_structure != PICT_FRAME;
pic_param->pic_fields.bits.constrained_intra_pred_flag = h->pps.constrained_intra_pred;
pic_param->pic_fields.bits.pic_order_present_flag = h->pps.pic_order_present;
pic_param->pic_fields.bits.deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present;
@@ -289,10 +288,24 @@ static int start_frame(AVCodecContext *avctx,
/** End a hardware decoding based frame. */
static int end_frame(AVCodecContext *avctx)
{
+ struct vaapi_context * const vactx = avctx->hwaccel_context;
H264Context * const h = avctx->priv_data;
+ int ret;
av_dlog(avctx, "end_frame()\n");
- return ff_vaapi_common_end_frame(&h->s);
+ ret = ff_vaapi_commit_slices(vactx);
+ if (ret < 0)
+ goto finish;
+
+ ret = ff_vaapi_render_picture(vactx, ff_vaapi_get_surface_id(h->cur_pic_ptr));
+ if (ret < 0)
+ goto finish;
+
+ ff_h264_draw_horiz_band(h, 0, h->avctx->height);
+
+finish:
+ ff_vaapi_common_end_frame(avctx);
+ return ret;
}
/** Decode the given H.264 slice with VA API. */
@@ -301,7 +314,6 @@ static int decode_slice(AVCodecContext *avctx,
uint32_t size)
{
H264Context * const h = avctx->priv_data;
- MpegEncContext * const s = &h->s;
VASliceParameterBufferH264 *slice_param;
av_dlog(avctx, "decode_slice(): buffer %p, size %d\n", buffer, size);
@@ -310,14 +322,14 @@ static int decode_slice(AVCodecContext *avctx,
slice_param = (VASliceParameterBufferH264 *)ff_vaapi_alloc_slice(avctx->hwaccel_context, buffer, size);
if (!slice_param)
return -1;
- slice_param->slice_data_bit_offset = get_bits_count(&h->s.gb) + 8; /* bit buffer started beyond nal_unit_type */
- slice_param->first_mb_in_slice = (s->mb_y >> FIELD_OR_MBAFF_PICTURE) * s->mb_width + s->mb_x;
+ slice_param->slice_data_bit_offset = get_bits_count(&h->gb) + 8; /* bit buffer started beyond nal_unit_type */
+ slice_param->first_mb_in_slice = (h->mb_y >> FIELD_OR_MBAFF_PICTURE) * h->mb_width + h->mb_x;
slice_param->slice_type = ff_h264_get_slice_type(h);
slice_param->direct_spatial_mv_pred_flag = h->slice_type == AV_PICTURE_TYPE_B ? h->direct_spatial_mv_pred : 0;
slice_param->num_ref_idx_l0_active_minus1 = h->list_count > 0 ? h->ref_count[0] - 1 : 0;
slice_param->num_ref_idx_l1_active_minus1 = h->list_count > 1 ? h->ref_count[1] - 1 : 0;
slice_param->cabac_init_idc = h->cabac_init_idc;
- slice_param->slice_qp_delta = s->qscale - h->pps.init_qp;
+ slice_param->slice_qp_delta = h->qscale - h->pps.init_qp;
slice_param->disable_deblocking_filter_idc = h->deblocking_filter < 2 ? !h->deblocking_filter : h->deblocking_filter;
slice_param->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2 - 26;
slice_param->slice_beta_offset_div2 = h->slice_beta_offset / 2 - 26;
diff --git a/libavcodec/vaapi_internal.h b/libavcodec/vaapi_internal.h
index c6d5d6e..0292654 100644
--- a/libavcodec/vaapi_internal.h
+++ b/libavcodec/vaapi_internal.h
@@ -42,7 +42,7 @@ static inline VASurfaceID ff_vaapi_get_surface_id(Picture *pic)
}
/** Common AVHWAccel.end_frame() implementation */
-int ff_vaapi_common_end_frame(MpegEncContext *s);
+void ff_vaapi_common_end_frame(AVCodecContext *avctx);
/** Allocate a new picture parameter buffer */
void *ff_vaapi_alloc_pic_param(struct vaapi_context *vactx, unsigned int size);
@@ -63,6 +63,10 @@ uint8_t *ff_vaapi_alloc_bitplane(struct vaapi_context *vactx, uint32_t size);
*/
VASliceParameterBufferBase *ff_vaapi_alloc_slice(struct vaapi_context *vactx, const uint8_t *buffer, uint32_t size);
+int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx);
+int ff_vaapi_commit_slices(struct vaapi_context *vactx);
+int ff_vaapi_render_picture(struct vaapi_context *vactx, VASurfaceID surface);
+
/* @} */
#endif /* AVCODEC_VAAPI_INTERNAL_H */
diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index cfe5d3a..eb94131 100644
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -99,11 +99,6 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_
return 0;
}
-static int vaapi_mpeg2_end_frame(AVCodecContext *avctx)
-{
- return ff_vaapi_common_end_frame(avctx->priv_data);
-}
-
static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
{
MpegEncContext * const s = avctx->priv_data;
@@ -144,6 +139,6 @@ AVHWAccel ff_mpeg2_vaapi_hwaccel = {
.id = AV_CODEC_ID_MPEG2VIDEO,
.pix_fmt = AV_PIX_FMT_VAAPI_VLD,
.start_frame = vaapi_mpeg2_start_frame,
- .end_frame = vaapi_mpeg2_end_frame,
+ .end_frame = ff_vaapi_mpeg_end_frame,
.decode_slice = vaapi_mpeg2_decode_slice,
};
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
index 7d9ffd7..a0f2966 100644
--- a/libavcodec/vaapi_mpeg4.c
+++ b/libavcodec/vaapi_mpeg4.c
@@ -115,11 +115,6 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_
return 0;
}
-static int vaapi_mpeg4_end_frame(AVCodecContext *avctx)
-{
- return ff_vaapi_common_end_frame(avctx->priv_data);
-}
-
static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
{
MpegEncContext * const s = avctx->priv_data;
@@ -156,7 +151,7 @@ AVHWAccel ff_mpeg4_vaapi_hwaccel = {
.id = AV_CODEC_ID_MPEG4,
.pix_fmt = AV_PIX_FMT_VAAPI_VLD,
.start_frame = vaapi_mpeg4_start_frame,
- .end_frame = vaapi_mpeg4_end_frame,
+ .end_frame = ff_vaapi_mpeg_end_frame,
.decode_slice = vaapi_mpeg4_decode_slice,
};
#endif
@@ -168,7 +163,7 @@ AVHWAccel ff_h263_vaapi_hwaccel = {
.id = AV_CODEC_ID_H263,
.pix_fmt = AV_PIX_FMT_VAAPI_VLD,
.start_frame = vaapi_mpeg4_start_frame,
- .end_frame = vaapi_mpeg4_end_frame,
+ .end_frame = ff_vaapi_mpeg_end_frame,
.decode_slice = vaapi_mpeg4_decode_slice,
};
#endif
diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c
index 4a98ba7..a9ab3c7 100644
--- a/libavcodec/vaapi_vc1.c
+++ b/libavcodec/vaapi_vc1.c
@@ -310,13 +310,6 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
return 0;
}
-static int vaapi_vc1_end_frame(AVCodecContext *avctx)
-{
- VC1Context * const v = avctx->priv_data;
-
- return ff_vaapi_common_end_frame(&v->s);
-}
-
static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
{
VC1Context * const v = avctx->priv_data;
@@ -347,7 +340,7 @@ AVHWAccel ff_wmv3_vaapi_hwaccel = {
.id = AV_CODEC_ID_WMV3,
.pix_fmt = AV_PIX_FMT_VAAPI_VLD,
.start_frame = vaapi_vc1_start_frame,
- .end_frame = vaapi_vc1_end_frame,
+ .end_frame = ff_vaapi_mpeg_end_frame,
.decode_slice = vaapi_vc1_decode_slice,
};
#endif
@@ -358,6 +351,6 @@ AVHWAccel ff_vc1_vaapi_hwaccel = {
.id = AV_CODEC_ID_VC1,
.pix_fmt = AV_PIX_FMT_VAAPI_VLD,
.start_frame = vaapi_vc1_start_frame,
- .end_frame = vaapi_vc1_end_frame,
+ .end_frame = ff_vaapi_mpeg_end_frame,
.decode_slice = vaapi_vc1_decode_slice,
};
diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c
index 34fcd3c..a1efbcd 100644
--- a/libavcodec/vda_h264.c
+++ b/libavcodec/vda_h264.c
@@ -241,7 +241,7 @@ static int end_frame(AVCodecContext *avctx)
{
H264Context *h = avctx->priv_data;
struct vda_context *vda_ctx = avctx->hwaccel_context;
- AVFrame *frame = &h->s.current_picture_ptr->f;
+ AVFrame *frame = &h->cur_pic_ptr->f;
int status;
if (!vda_ctx->decoder || !vda_ctx->priv_bitstream)
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 3b77386..e5c459b 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -48,20 +48,18 @@ int ff_vdpau_common_start_frame(AVCodecContext *avctx,
return 0;
}
-int ff_vdpau_common_end_frame(AVCodecContext *avctx)
+int ff_vdpau_mpeg_end_frame(AVCodecContext *avctx)
{
- MpegEncContext * const s = avctx->priv_data;
AVVDPAUContext *hwctx = avctx->hwaccel_context;
+ MpegEncContext *s = avctx->priv_data;
+ VdpVideoSurface surf = ff_vdpau_get_surface_id(s->current_picture_ptr);
- if (hwctx->bitstream_buffers_used) {
- VdpVideoSurface surf = ff_vdpau_get_surface_id(s->current_picture_ptr);
+ hwctx->render(hwctx->decoder, surf, (void *)&hwctx->info,
+ hwctx->bitstream_buffers_used, hwctx->bitstream_buffers);
- hwctx->render(hwctx->decoder, surf, (void *)&hwctx->info,
- hwctx->bitstream_buffers_used, hwctx->bitstream_buffers);
+ ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
+ hwctx->bitstream_buffers_used = 0;
- ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
- hwctx->bitstream_buffers_used = 0;
- }
return 0;
}
@@ -87,15 +85,14 @@ int ff_vdpau_add_buffer(AVCodecContext *avctx,
/* Obsolete non-hwaccel VDPAU support below... */
-void ff_vdpau_h264_set_reference_frames(MpegEncContext *s)
+void ff_vdpau_h264_set_reference_frames(H264Context *h)
{
- H264Context *h = s->avctx->priv_data;
struct vdpau_render_state *render, *render_ref;
VdpReferenceFrameH264 *rf, *rf2;
Picture *pic;
int i, list, pic_frame_idx;
- render = (struct vdpau_render_state *)s->current_picture_ptr->f.data[0];
+ render = (struct vdpau_render_state *)h->cur_pic_ptr->f.data[0];
assert(render);
rf = &render->info.h264.referenceFrames[0];
@@ -156,12 +153,9 @@ void ff_vdpau_h264_set_reference_frames(MpegEncContext *s)
}
}
-void ff_vdpau_add_data_chunk(MpegEncContext *s,
- const uint8_t *buf, int buf_size)
+void ff_vdpau_add_data_chunk(uint8_t *data, const uint8_t *buf, int buf_size)
{
- struct vdpau_render_state *render;
-
- render = (struct vdpau_render_state *)s->current_picture_ptr->f.data[0];
+ struct vdpau_render_state *render = (struct vdpau_render_state*)data;
assert(render);
render->bitstream_buffers= av_fast_realloc(
@@ -176,17 +170,16 @@ void ff_vdpau_add_data_chunk(MpegEncContext *s,
render->bitstream_buffers_used++;
}
-void ff_vdpau_h264_picture_start(MpegEncContext *s)
+void ff_vdpau_h264_picture_start(H264Context *h)
{
- H264Context *h = s->avctx->priv_data;
struct vdpau_render_state *render;
int i;
- render = (struct vdpau_render_state *)s->current_picture_ptr->f.data[0];
+ render = (struct vdpau_render_state *)h->cur_pic_ptr->f.data[0];
assert(render);
for (i = 0; i < 2; ++i) {
- int foc = s->current_picture_ptr->field_poc[i];
+ int foc = h->cur_pic_ptr->field_poc[i];
if (foc == INT_MAX)
foc = 0;
render->info.h264.field_order_cnt[i] = foc;
@@ -195,21 +188,20 @@ void ff_vdpau_h264_picture_start(MpegEncContext *s)
render->info.h264.frame_num = h->frame_num;
}
-void ff_vdpau_h264_picture_complete(MpegEncContext *s)
+void ff_vdpau_h264_picture_complete(H264Context *h)
{
- H264Context *h = s->avctx->priv_data;
struct vdpau_render_state *render;
- render = (struct vdpau_render_state *)s->current_picture_ptr->f.data[0];
+ render = (struct vdpau_render_state *)h->cur_pic_ptr->f.data[0];
assert(render);
render->info.h264.slice_count = h->slice_num;
if (render->info.h264.slice_count < 1)
return;
- render->info.h264.is_reference = (s->current_picture_ptr->f.reference & 3) ? VDP_TRUE : VDP_FALSE;
- render->info.h264.field_pic_flag = s->picture_structure != PICT_FRAME;
- render->info.h264.bottom_field_flag = s->picture_structure == PICT_BOTTOM_FIELD;
+ render->info.h264.is_reference = (h->cur_pic_ptr->f.reference & 3) ? VDP_TRUE : VDP_FALSE;
+ render->info.h264.field_pic_flag = h->picture_structure != PICT_FRAME;
+ render->info.h264.bottom_field_flag = h->picture_structure == PICT_BOTTOM_FIELD;
render->info.h264.num_ref_frames = h->sps.ref_frame_count;
render->info.h264.mb_adaptive_frame_field_flag = h->sps.mb_aff && !render->info.h264.field_pic_flag;
render->info.h264.constrained_intra_pred_flag = h->pps.constrained_intra_pred;
@@ -235,7 +227,7 @@ void ff_vdpau_h264_picture_complete(MpegEncContext *s)
memcpy(render->info.h264.scaling_lists_8x8[0], h->pps.scaling_matrix8[0], sizeof(render->info.h264.scaling_lists_8x8[0]));
memcpy(render->info.h264.scaling_lists_8x8[1], h->pps.scaling_matrix8[3], sizeof(render->info.h264.scaling_lists_8x8[0]));
- ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
+ ff_h264_draw_horiz_band(h, 0, h->avctx->height);
render->bitstream_buffers_used = 0;
}
@@ -287,7 +279,7 @@ void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
render->info.mpeg.forward_reference = last->surface;
}
- ff_vdpau_add_data_chunk(s, buf, buf_size);
+ ff_vdpau_add_data_chunk(s->current_picture_ptr->f.data[0], buf, buf_size);
render->info.mpeg.slice_count = slice_count;
@@ -357,7 +349,7 @@ void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
render->info.vc1.forward_reference = last->surface;
}
- ff_vdpau_add_data_chunk(s, buf, buf_size);
+ ff_vdpau_add_data_chunk(s->current_picture_ptr->f.data[0], buf, buf_size);
render->info.vc1.slice_count = 1;
@@ -413,7 +405,7 @@ void ff_vdpau_mpeg4_decode_picture(MpegEncContext *s, const uint8_t *buf,
render->info.mpeg4.forward_reference = last->surface;
}
- ff_vdpau_add_data_chunk(s, buf, buf_size);
+ ff_vdpau_add_data_chunk(s->current_picture_ptr->f.data[0], buf, buf_size);
ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
render->bitstream_buffers_used = 0;
diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c
index 09b7ad5..91f8008 100644
--- a/libavcodec/vdpau_h264.c
+++ b/libavcodec/vdpau_h264.c
@@ -119,9 +119,8 @@ static int vdpau_h264_start_frame(AVCodecContext *avctx,
{
H264Context * const h = avctx->priv_data;
AVVDPAUContext *hwctx = avctx->hwaccel_context;
- MpegEncContext * const s = &h->s;
VdpPictureInfoH264 *info = &hwctx->info.h264;
- Picture *pic = s->current_picture_ptr;
+ Picture *pic = h->cur_pic_ptr;
/* init VdpPictureInfoH264 */
info->slice_count = 0;
@@ -129,8 +128,8 @@ static int vdpau_h264_start_frame(AVCodecContext *avctx,
info->field_order_cnt[1] = h264_foc(pic->field_poc[1]);
info->is_reference = h->nal_ref_idc != 0;
info->frame_num = h->frame_num;
- info->field_pic_flag = s->picture_structure != PICT_FRAME;
- info->bottom_field_flag = s->picture_structure == PICT_BOTTOM_FIELD;
+ info->field_pic_flag = h->picture_structure != PICT_FRAME;
+ info->bottom_field_flag = h->picture_structure == PICT_BOTTOM_FIELD;
info->num_ref_frames = h->sps.ref_frame_count;
info->mb_adaptive_frame_field_flag = h->sps.mb_aff && !info->field_pic_flag;
info->constrained_intra_pred_flag = h->pps.constrained_intra_pred;
@@ -185,12 +184,27 @@ static int vdpau_h264_decode_slice(AVCodecContext *avctx,
return 0;
}
+static int vdpau_h264_end_frame(AVCodecContext *avctx)
+{
+ AVVDPAUContext *hwctx = avctx->hwaccel_context;
+ H264Context *h = avctx->priv_data;
+ VdpVideoSurface surf = ff_vdpau_get_surface_id(h->cur_pic_ptr);
+
+ hwctx->render(hwctx->decoder, surf, (void *)&hwctx->info,
+ hwctx->bitstream_buffers_used, hwctx->bitstream_buffers);
+
+ ff_h264_draw_horiz_band(h, 0, h->avctx->height);
+ hwctx->bitstream_buffers_used = 0;
+
+ return 0;
+}
+
AVHWAccel ff_h264_vdpau_hwaccel = {
.name = "h264_vdpau",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H264,
.pix_fmt = AV_PIX_FMT_VDPAU,
.start_frame = vdpau_h264_start_frame,
- .end_frame = ff_vdpau_common_end_frame,
+ .end_frame = vdpau_h264_end_frame,
.decode_slice = vdpau_h264_decode_slice,
};
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index 4aefc85..4dbda79 100644
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -25,6 +25,7 @@
#define AVCODEC_VDPAU_INTERNAL_H
#include <stdint.h>
+#include "h264.h"
#include "mpegvideo.h"
/** Extract VdpVideoSurface from a Picture */
@@ -35,20 +36,20 @@ static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic)
int ff_vdpau_common_start_frame(AVCodecContext *avctx,
const uint8_t *buffer, uint32_t size);
-int ff_vdpau_common_end_frame(AVCodecContext *avctx);
+int ff_vdpau_mpeg_end_frame(AVCodecContext *avctx);
int ff_vdpau_add_buffer(AVCodecContext *avctx,
const uint8_t *buf, uint32_t buf_size);
-void ff_vdpau_add_data_chunk(MpegEncContext *s, const uint8_t *buf,
+void ff_vdpau_add_data_chunk(uint8_t *data, const uint8_t *buf,
int buf_size);
void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
int buf_size, int slice_count);
-void ff_vdpau_h264_picture_start(MpegEncContext *s);
-void ff_vdpau_h264_set_reference_frames(MpegEncContext *s);
-void ff_vdpau_h264_picture_complete(MpegEncContext *s);
+void ff_vdpau_h264_picture_start(H264Context *h);
+void ff_vdpau_h264_set_reference_frames(H264Context *h);
+void ff_vdpau_h264_picture_complete(H264Context *h);
void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
int buf_size);
diff --git a/libavcodec/vdpau_mpeg12.c b/libavcodec/vdpau_mpeg12.c
index d2d4ac3..20031ea 100644
--- a/libavcodec/vdpau_mpeg12.c
+++ b/libavcodec/vdpau_mpeg12.c
@@ -98,7 +98,7 @@ AVHWAccel ff_mpeg1_vdpau_hwaccel = {
.id = AV_CODEC_ID_MPEG1VIDEO,
.pix_fmt = AV_PIX_FMT_VDPAU,
.start_frame = vdpau_mpeg_start_frame,
- .end_frame = ff_vdpau_common_end_frame,
+ .end_frame = ff_vdpau_mpeg_end_frame,
.decode_slice = vdpau_mpeg_decode_slice,
};
#endif
@@ -110,7 +110,7 @@ AVHWAccel ff_mpeg2_vdpau_hwaccel = {
.id = AV_CODEC_ID_MPEG2VIDEO,
.pix_fmt = AV_PIX_FMT_VDPAU,
.start_frame = vdpau_mpeg_start_frame,
- .end_frame = ff_vdpau_common_end_frame,
+ .end_frame = ff_vdpau_mpeg_end_frame,
.decode_slice = vdpau_mpeg_decode_slice,
};
#endif
diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c
index 706e2b6..6555872 100644
--- a/libavcodec/vdpau_mpeg4.c
+++ b/libavcodec/vdpau_mpeg4.c
@@ -92,7 +92,7 @@ AVHWAccel ff_h263_vdpau_hwaccel = {
.id = AV_CODEC_ID_H263,
.pix_fmt = AV_PIX_FMT_VDPAU,
.start_frame = vdpau_mpeg4_start_frame,
- .end_frame = ff_vdpau_common_end_frame,
+ .end_frame = ff_vdpau_mpeg_end_frame,
.decode_slice = vdpau_mpeg4_decode_slice,
};
#endif
@@ -104,7 +104,7 @@ AVHWAccel ff_mpeg4_vdpau_hwaccel = {
.id = AV_CODEC_ID_MPEG4,
.pix_fmt = AV_PIX_FMT_VDPAU,
.start_frame = vdpau_mpeg4_start_frame,
- .end_frame = ff_vdpau_common_end_frame,
+ .end_frame = ff_vdpau_mpeg_end_frame,
.decode_slice = vdpau_mpeg4_decode_slice,
};
#endif
diff --git a/libavcodec/vdpau_vc1.c b/libavcodec/vdpau_vc1.c
index 638c07a..4d84cd2 100644
--- a/libavcodec/vdpau_vc1.c
+++ b/libavcodec/vdpau_vc1.c
@@ -112,7 +112,7 @@ AVHWAccel ff_wmv3_vdpau_hwaccel = {
.id = AV_CODEC_ID_WMV3,
.pix_fmt = AV_PIX_FMT_VDPAU,
.start_frame = vdpau_vc1_start_frame,
- .end_frame = ff_vdpau_common_end_frame,
+ .end_frame = ff_vdpau_mpeg_end_frame,
.decode_slice = vdpau_vc1_decode_slice,
};
#endif
@@ -123,6 +123,6 @@ AVHWAccel ff_vc1_vdpau_hwaccel = {
.id = AV_CODEC_ID_VC1,
.pix_fmt = AV_PIX_FMT_VDPAU,
.start_frame = vdpau_vc1_start_frame,
- .end_frame = ff_vdpau_common_end_frame,
+ .end_frame = ff_vdpau_mpeg_end_frame,
.decode_slice = vdpau_vc1_decode_slice,
};
More information about the ffmpeg-cvslog
mailing list