X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvdpau_internal.h;h=c7281a6b5e6d7e9225d28d897567be9a1a8fc0ae;hb=788544ff0ed6fe67fda80ad6d3a0796ace035584;hp=4dbda79b17109b6cb17520aae32a365c4e1e1b4c;hpb=2c541554076cc8a72e7145d4da30389ca763f32f;p=ffmpeg

diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index 4dbda79b171..c7281a6b5e6 100644
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -25,36 +25,97 @@
 #define AVCODEC_VDPAU_INTERNAL_H
 
 #include <stdint.h>
-#include "h264.h"
-#include "mpegvideo.h"
+#include <vdpau/vdpau.h>
 
-/** Extract VdpVideoSurface from a Picture */
-static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic)
+#include "libavutil/frame.h"
+
+#include "avcodec.h"
+#include "vdpau.h"
+
+/** Extract VdpVideoSurface from an AVFrame */
+static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic)
 {
-    return (uintptr_t)pic->f.data[3];
+    return (uintptr_t)pic->data[3];
 }
 
-int ff_vdpau_common_start_frame(AVCodecContext *avctx,
-                                const uint8_t *buffer, uint32_t size);
-int ff_vdpau_mpeg_end_frame(AVCodecContext *avctx);
-int ff_vdpau_add_buffer(AVCodecContext *avctx,
-                        const uint8_t *buf, uint32_t buf_size);
+union VDPAUPictureInfo {
+    VdpPictureInfoH264        h264;
+    VdpPictureInfoMPEG1Or2    mpeg;
+    VdpPictureInfoVC1          vc1;
+    VdpPictureInfoMPEG4Part2 mpeg4;
+#ifdef VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE
+    VdpPictureInfoH264Predictive h264_predictive;
+#endif
+#ifdef VDP_DECODER_PROFILE_HEVC_MAIN
+    VdpPictureInfoHEVC        hevc;
+#endif
+};
+
+typedef struct VDPAUHWContext {
+    AVVDPAUContext context;
+    VdpDevice device;
+    VdpGetProcAddress *get_proc_address;
+    char reset;
+    unsigned char flags;
+} VDPAUHWContext;
+
+typedef struct VDPAUContext {
+    /**
+     * VDPAU device handle
+     */
+    VdpDevice device;
 
+    /**
+     * VDPAU decoder handle
+     */
+    VdpDecoder decoder;
 
-void ff_vdpau_add_data_chunk(uint8_t *data, const uint8_t *buf,
-                             int buf_size);
+    /**
+     * VDPAU device driver
+     */
+    VdpGetProcAddress *get_proc_address;
 
-void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
-                                    int buf_size, int slice_count);
+    /**
+     * VDPAU decoder render callback
+     */
+    VdpDecoderRender *render;
 
-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);
+    uint32_t width;
+    uint32_t height;
+} VDPAUContext;
 
-void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
-                                 int buf_size);
+struct vdpau_picture_context {
+    /**
+     * VDPAU picture information.
+     */
+    union VDPAUPictureInfo info;
 
-void ff_vdpau_mpeg4_decode_picture(MpegEncContext *s, const uint8_t *buf,
-                                   int buf_size);
+    /**
+     * Allocated size of the bitstream_buffers table.
+     */
+    int bitstream_buffers_allocated;
+
+    /**
+     * Useful bitstream buffers in the bitstream buffers table.
+     */
+    int bitstream_buffers_used;
+
+   /**
+     * Table of bitstream buffers.
+     */
+    VdpBitstreamBuffer *bitstream_buffers;
+};
+
+int ff_vdpau_common_init(AVCodecContext *avctx, VdpDecoderProfile profile,
+                         int level);
+int ff_vdpau_common_uninit(AVCodecContext *avctx);
+
+int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic,
+                                const uint8_t *buffer, uint32_t size);
+int ff_vdpau_common_end_frame(AVCodecContext *avctx, AVFrame *frame,
+                              struct vdpau_picture_context *pic);
+int ff_vdpau_mpeg_end_frame(AVCodecContext *avctx);
+int ff_vdpau_add_buffer(struct vdpau_picture_context *pic, const uint8_t *buf,
+                        uint32_t buf_size);
 
 #endif /* AVCODEC_VDPAU_INTERNAL_H */