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/vdpau_internal.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'libavcodec/vdpau_internal.h') diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 4aefc85196..4dbda79b17 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -25,6 +25,7 @@ #define AVCODEC_VDPAU_INTERNAL_H #include +#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); -- cgit v1.2.3