---
libavcodec/vdpau.c | 49 ++++++++++++++++++++++++++++
libavcodec/vdpau.h | 75 +++++++++++++++++++++++++++++++++++++++----
libavcodec/vdpau_internal.h | 15 +++++++++
3 files changed, 133 insertions(+), 6 deletions(-)
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 6daf494..dffa7f7 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)
+{
+ struct vdpau_context *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;
+ struct vdpau_context *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)
+{
+ struct vdpau_context *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 241ff19..fb7ac8a 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -52,6 +52,74 @@
#include <vdpau/vdpau.h>
#include <vdpau/vdpau_x11.h>
+union VdpPictureInfo {
+ VdpPictureInfoH264 h264;
+ VdpPictureInfoMPEG1Or2 mpeg;
+ VdpPictureInfoVC1 vc1;
+ VdpPictureInfoMPEG4Part2 mpeg4;
+};
+
+/**
+ * This structure is used to share data between the Libav library and
+ * the client video application.
+ * This shall be zero-allocated and available as
+ * AVCodecContext.hwaccel_context. All user members can be set 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 vdpau_context {
+ /**
+ * VDPAU decoder handle
+ *
+ * - encoding: unused
+ * - decoding: Set by user
+ */
+ VdpDecoder decoder;
+
+ /**
+ * VDPAU decoder render callback
+ *
+ * - encoding: unused
+ * - decoding: Set by the user
+ */
+ VdpDecoderRender *render;
+
+ /**
+ * VDPAU picture information
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ union VdpPictureInfo info;
+
+ /**
+ * Allocated size of the bitstream_buffers table.
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ int bitstream_buffers_allocated;
+
+ /**
+ * Useful bitstream buffers in the bitstream buffers table.
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ int bitstream_buffers_used;
+
+ /**
+ * Table of bitstream buffers.
+ * The user is responsible for freeing this buffer using av_freep().
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ VdpBitstreamBuffer *bitstream_buffers;
+} AVVDPAUContext;
+
+
/** @brief The videoSurface is used for rendering. */
#define FF_VDPAU_STATE_USED_FOR_RENDER 1
@@ -74,12 +142,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 673fd33..0658479 100644
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -25,8 +25,23 @@
#define AVCODEC_VDPAU_INTERNAL_H
#include <stdint.h>
+#include "vdpau.h"
#include "mpegvideo.h"
+/** Extract VdpVideoSurface from a Picture */
+static inline VdpVideoSurface 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);
--
1.7.10.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
