diff options
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vdpau.c | 9 | ||||
| -rw-r--r-- | libavcodec/vdpau.h | 11 | ||||
| -rw-r--r-- | libavcodec/vdpau_h264.c | 7 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
4 files changed, 26 insertions, 3 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 63ea75527d..a26cd92e37 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -43,6 +43,8 @@ AVVDPAUContext *av_alloc_vdpaucontext(void) return av_mallocz(sizeof(AVVDPAUContext)); } +MAKE_ACCESSORS(AVVDPAUContext, vdpau_hwaccel, AVVDPAU_Render2, render2) + int ff_vdpau_common_start_frame(Picture *pic, av_unused const uint8_t *buffer, av_unused uint32_t size) @@ -60,19 +62,24 @@ int ff_vdpau_common_start_frame(Picture *pic, CONFIG_VC1_VDPAU_HWACCEL || CONFIG_WMV3_VDPAU_HWACCEL int ff_vdpau_mpeg_end_frame(AVCodecContext *avctx) { + int res = 0; AVVDPAUContext *hwctx = avctx->hwaccel_context; MpegEncContext *s = avctx->priv_data; Picture *pic = s->current_picture_ptr; struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private; VdpVideoSurface surf = ff_vdpau_get_surface_id(pic); + if (!hwctx->render) { + res = hwctx->render2(avctx, &pic->f, (void *)&pic_ctx->info, + pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); + } else hwctx->render(hwctx->decoder, surf, (void *)&pic_ctx->info, pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); ff_mpeg_draw_horiz_band(s, 0, s->avctx->height); av_freep(&pic_ctx->bitstream_buffers); - return 0; + return res; } #endif diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 210d517d83..b1c836c4b6 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -70,6 +70,13 @@ union AVVDPAUPictureInfo { }; #endif +struct AVCodecContext; +struct AVFrame; + +typedef int (*AVVDPAU_Render2)(struct AVCodecContext *, struct AVFrame *, + const VdpPictureInfo *, uint32_t, + const VdpBitstreamBuffer *); + /** * This structure is used to share data between the libavcodec library and * the client video application. @@ -129,6 +136,7 @@ typedef struct AVVDPAUContext { attribute_deprecated VdpBitstreamBuffer *bitstream_buffers; #endif + AVVDPAU_Render2 render2; } AVVDPAUContext; /** @@ -138,6 +146,9 @@ typedef struct AVVDPAUContext { */ AVVDPAUContext *av_alloc_vdpaucontext(void); +AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *); +void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2); + #if FF_API_CAP_VDPAU /** @brief The videoSurface is used for rendering. */ #define FF_VDPAU_STATE_USED_FOR_RENDER 1 diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index 06a9582913..3f6415d4f8 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -188,19 +188,24 @@ static int vdpau_h264_decode_slice(AVCodecContext *avctx, static int vdpau_h264_end_frame(AVCodecContext *avctx) { + int res = 0; AVVDPAUContext *hwctx = avctx->hwaccel_context; H264Context *h = avctx->priv_data; Picture *pic = h->cur_pic_ptr; struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private; VdpVideoSurface surf = ff_vdpau_get_surface_id(pic); + if (!hwctx->render) { + res = hwctx->render2(avctx, &pic->f, (void *)&pic_ctx->info, + pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); + } else hwctx->render(hwctx->decoder, surf, (void *)&pic_ctx->info, pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); ff_h264_draw_horiz_band(h, 0, h->avctx->height); av_freep(&pic_ctx->bitstream_buffers); - return 0; + return res; } AVHWAccel ff_h264_vdpau_hwaccel = { diff --git a/libavcodec/version.h b/libavcodec/version.h index 2be90c450c..e31fea206e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 26 +#define LIBAVCODEC_VERSION_MINOR 27 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |