From 2c541554076cc8a72e7145d4da30389ca763f32f Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 3 Feb 2013 11:10:05 +0100 Subject: 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 Signed-off-by: Anton Khirnov --- libavcodec/dxva2.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libavcodec/dxva2.c') diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 63addb7f49..bc43cae813 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; } -- cgit v1.2.3