From 44e065d56c87d6a9d0effccec5f31517f72924ec Mon Sep 17 00:00:00 2001 From: Rémi Denis-Courmont Date: Sat, 12 Jan 2013 17:53:43 +0200 Subject: vdpau: Add context and common helpers for hwaccel support Signed-off-by: Diego Biurrun --- libavcodec/vdpau.c | 49 ++++++++++++++++++++++++++++++++ libavcodec/vdpau.h | 69 +++++++++++++++++++++++++++++++++++++++++---- libavcodec/vdpau_internal.h | 14 +++++++++ libavcodec/version.h | 2 +- 4 files changed, 127 insertions(+), 7 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 6daf494b60..851c7cb9f3 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -38,6 +38,55 @@ * @{ */ +int ff_vdpau_common_start_frame(AVCodecContext *avctx, + av_unused const uint8_t *buffer, + av_unused uint32_t size) +{ + AVVDPAUContext *hwctx = avctx->hwaccel_context; + + hwctx->bitstream_buffers_used = 0; + return 0; +} + +int ff_vdpau_common_end_frame(AVCodecContext *avctx) +{ + MpegEncContext * const s = avctx->priv_data; + AVVDPAUContext *hwctx = avctx->hwaccel_context; + + 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); + + ff_draw_horiz_band(s, 0, s->avctx->height); + hwctx->bitstream_buffers_used = 0; + } + return 0; +} + +int ff_vdpau_add_buffer(AVCodecContext *avctx, + const uint8_t *buf, uint32_t size) +{ + AVVDPAUContext *hwctx = avctx->hwaccel_context; + VdpBitstreamBuffer *buffers = hwctx->bitstream_buffers; + + buffers = av_fast_realloc(buffers, &hwctx->bitstream_buffers_allocated, + (hwctx->bitstream_buffers_used + 1) * sizeof(*buffers)); + if (!buffers) + return AVERROR(ENOMEM); + + hwctx->bitstream_buffers = buffers; + buffers += hwctx->bitstream_buffers_used++; + + buffers->struct_version = VDP_BITSTREAM_BUFFER_VERSION; + buffers->bitstream = buf; + buffers->bitstream_bytes = size; + return 0; +} + +/* Obsolete non-hwaccel VDPAU support below... */ + void ff_vdpau_h264_set_reference_frames(MpegEncContext *s) { H264Context *h = s->avctx->priv_data; diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 241ff19051..7e692f767b 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -52,6 +52,68 @@ #include #include +union VdpPictureInfo { + VdpPictureInfoH264 h264; + VdpPictureInfoMPEG1Or2 mpeg; + VdpPictureInfoVC1 vc1; + VdpPictureInfoMPEG4Part2 mpeg4; +}; + +/** + * This structure is used to share data between the libavcodec library and + * the client video application. + * The user shall zero-allocate the structure and make it available as + * AVCodecContext.hwaccel_context. Members can be set by the user once + * during initialization or through each AVCodecContext.get_buffer() + * function call. In any case, they must be valid prior to calling + * decoding functions. + */ +typedef struct AVVDPAUContext { + /** + * VDPAU decoder handle + * + * Set by user. + */ + VdpDecoder decoder; + + /** + * VDPAU decoder render callback + * + * Set by the user. + */ + VdpDecoderRender *render; + + /** + * VDPAU picture information + * + * Set by libavcodec. + */ + union VdpPictureInfo info; + + /** + * Allocated size of the bitstream_buffers table. + * + * Set by libavcodec. + */ + int bitstream_buffers_allocated; + + /** + * Useful bitstream buffers in the bitstream buffers table. + * + * Set by libavcodec. + */ + int bitstream_buffers_used; + + /** + * Table of bitstream buffers. + * The user is responsible for freeing this buffer using av_freep(). + * + * Set by libavcodec. + */ + VdpBitstreamBuffer *bitstream_buffers; +} AVVDPAUContext; + + /** @brief The videoSurface is used for rendering. */ #define FF_VDPAU_STATE_USED_FOR_RENDER 1 @@ -74,12 +136,7 @@ struct vdpau_render_state { int state; ///< Holds FF_VDPAU_STATE_* values. /** picture parameter information for all supported codecs */ - union VdpPictureInfo { - VdpPictureInfoH264 h264; - VdpPictureInfoMPEG1Or2 mpeg; - VdpPictureInfoVC1 vc1; - VdpPictureInfoMPEG4Part2 mpeg4; - } info; + union VdpPictureInfo info; /** Describe size/location of the compressed video data. Set to 0 when freeing bitstream_buffers. */ diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 673fd3349b..87c94c803b 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -27,6 +27,20 @@ #include #include "mpegvideo.h" +/** Extract VdpVideoSurface from a Picture */ +static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic) +{ + return (uintptr_t)pic->f.data[3]; +} + +int ff_vdpau_common_start_frame(AVCodecContext *avctx, + av_unused const uint8_t *buffer, + av_unused uint32_t size); +int ff_vdpau_common_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, int buf_size); diff --git a/libavcodec/version.h b/libavcodec/version.h index 47a9822361..3af1e5f9ed 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -27,7 +27,7 @@ */ #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 35 +#define LIBAVCODEC_VERSION_MINOR 36 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ -- cgit v1.2.3