From a871ef0cc936612bdb0e643196be72efcf0c8986 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 6 Mar 2014 18:19:52 +0100 Subject: hwaccel: Rename priv_data_size to frame_priv_data_size This describes more accurately what this field is for. --- libavcodec/avcodec.h | 4 ++-- libavcodec/dxva2_h264.c | 2 +- libavcodec/dxva2_mpeg2.c | 2 +- libavcodec/dxva2_vc1.c | 4 ++-- libavcodec/h264_slice.c | 4 ++-- libavcodec/mpegvideo.c | 4 ++-- libavcodec/vdpau_h264.c | 2 +- libavcodec/vdpau_mpeg12.c | 4 ++-- libavcodec/vdpau_mpeg4.c | 4 ++-- libavcodec/vdpau_vc1.c | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f720589..df061c1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2987,13 +2987,13 @@ typedef struct AVHWAccel { int (*end_frame)(AVCodecContext *avctx); /** - * Size of HW accelerator private data. + * Size of per-frame hardware accelerator private data. * * Private data is allocated with av_mallocz() before * AVCodecContext.get_buffer() and deallocated after * AVCodecContext.release_buffer(). */ - int priv_data_size; + int frame_priv_data_size; } AVHWAccel; /** diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index d80bd14..fa205c4 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -465,5 +465,5 @@ AVHWAccel ff_h264_dxva2_hwaccel = { .start_frame = dxva2_h264_start_frame, .decode_slice = dxva2_h264_decode_slice, .end_frame = dxva2_h264_end_frame, - .priv_data_size = sizeof(struct dxva2_picture_context), + .frame_priv_data_size = sizeof(struct dxva2_picture_context), }; diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c index c214e45..044e669 100644 --- a/libavcodec/dxva2_mpeg2.c +++ b/libavcodec/dxva2_mpeg2.c @@ -276,5 +276,5 @@ AVHWAccel ff_mpeg2_dxva2_hwaccel = { .start_frame = dxva2_mpeg2_start_frame, .decode_slice = dxva2_mpeg2_decode_slice, .end_frame = dxva2_mpeg2_end_frame, - .priv_data_size = sizeof(struct dxva2_picture_context), + .frame_priv_data_size = sizeof(struct dxva2_picture_context), }; diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index 94fbbe4..4f4dd17 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -279,7 +279,7 @@ AVHWAccel ff_wmv3_dxva2_hwaccel = { .start_frame = dxva2_vc1_start_frame, .decode_slice = dxva2_vc1_decode_slice, .end_frame = dxva2_vc1_end_frame, - .priv_data_size = sizeof(struct dxva2_picture_context), + .frame_priv_data_size = sizeof(struct dxva2_picture_context), }; #endif @@ -291,5 +291,5 @@ AVHWAccel ff_vc1_dxva2_hwaccel = { .start_frame = dxva2_vc1_start_frame, .decode_slice = dxva2_vc1_decode_slice, .end_frame = dxva2_vc1_end_frame, - .priv_data_size = sizeof(struct dxva2_picture_context), + .frame_priv_data_size = sizeof(struct dxva2_picture_context), }; diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 133b588..e727233 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -258,8 +258,8 @@ static int alloc_picture(H264Context *h, H264Picture *pic) if (h->avctx->hwaccel) { const AVHWAccel *hwaccel = h->avctx->hwaccel; av_assert0(!pic->hwaccel_picture_private); - if (hwaccel->priv_data_size) { - pic->hwaccel_priv_buf = av_buffer_allocz(hwaccel->priv_data_size); + if (hwaccel->frame_priv_data_size) { + pic->hwaccel_priv_buf = av_buffer_allocz(hwaccel->frame_priv_data_size); if (!pic->hwaccel_priv_buf) return AVERROR(ENOMEM); pic->hwaccel_picture_private = pic->hwaccel_priv_buf->data; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f7f95a7..4ec339e 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -460,8 +460,8 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic) if (s->avctx->hwaccel) { assert(!pic->hwaccel_picture_private); - if (s->avctx->hwaccel->priv_data_size) { - pic->hwaccel_priv_buf = av_buffer_allocz(s->avctx->hwaccel->priv_data_size); + if (s->avctx->hwaccel->frame_priv_data_size) { + pic->hwaccel_priv_buf = av_buffer_allocz(s->avctx->hwaccel->frame_priv_data_size); if (!pic->hwaccel_priv_buf) { av_log(s->avctx, AV_LOG_ERROR, "alloc_frame_buffer() failed (hwaccel private data allocation)\n"); return -1; diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index 7aa17ef..32e9c28 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -212,5 +212,5 @@ AVHWAccel ff_h264_vdpau_hwaccel = { .start_frame = vdpau_h264_start_frame, .end_frame = vdpau_h264_end_frame, .decode_slice = vdpau_h264_decode_slice, - .priv_data_size = sizeof(struct vdpau_picture_context), + .frame_priv_data_size = sizeof(struct vdpau_picture_context), }; diff --git a/libavcodec/vdpau_mpeg12.c b/libavcodec/vdpau_mpeg12.c index 6356293..2b53e66 100644 --- a/libavcodec/vdpau_mpeg12.c +++ b/libavcodec/vdpau_mpeg12.c @@ -103,7 +103,7 @@ AVHWAccel ff_mpeg1_vdpau_hwaccel = { .start_frame = vdpau_mpeg_start_frame, .end_frame = ff_vdpau_mpeg_end_frame, .decode_slice = vdpau_mpeg_decode_slice, - .priv_data_size = sizeof(struct vdpau_picture_context), + .frame_priv_data_size = sizeof(struct vdpau_picture_context), }; #endif @@ -116,6 +116,6 @@ AVHWAccel ff_mpeg2_vdpau_hwaccel = { .start_frame = vdpau_mpeg_start_frame, .end_frame = ff_vdpau_mpeg_end_frame, .decode_slice = vdpau_mpeg_decode_slice, - .priv_data_size = sizeof(struct vdpau_picture_context), + .frame_priv_data_size = sizeof(struct vdpau_picture_context), }; #endif diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c index 57df867..64e781d 100644 --- a/libavcodec/vdpau_mpeg4.c +++ b/libavcodec/vdpau_mpeg4.c @@ -97,7 +97,7 @@ AVHWAccel ff_h263_vdpau_hwaccel = { .start_frame = vdpau_mpeg4_start_frame, .end_frame = ff_vdpau_mpeg_end_frame, .decode_slice = vdpau_mpeg4_decode_slice, - .priv_data_size = sizeof(struct vdpau_picture_context), + .frame_priv_data_size = sizeof(struct vdpau_picture_context), }; #endif @@ -110,6 +110,6 @@ AVHWAccel ff_mpeg4_vdpau_hwaccel = { .start_frame = vdpau_mpeg4_start_frame, .end_frame = ff_vdpau_mpeg_end_frame, .decode_slice = vdpau_mpeg4_decode_slice, - .priv_data_size = sizeof(struct vdpau_picture_context), + .frame_priv_data_size = sizeof(struct vdpau_picture_context), }; #endif diff --git a/libavcodec/vdpau_vc1.c b/libavcodec/vdpau_vc1.c index b100daa..f7a7ecc 100644 --- a/libavcodec/vdpau_vc1.c +++ b/libavcodec/vdpau_vc1.c @@ -118,7 +118,7 @@ AVHWAccel ff_wmv3_vdpau_hwaccel = { .start_frame = vdpau_vc1_start_frame, .end_frame = ff_vdpau_mpeg_end_frame, .decode_slice = vdpau_vc1_decode_slice, - .priv_data_size = sizeof(struct vdpau_picture_context), + .frame_priv_data_size = sizeof(struct vdpau_picture_context), }; #endif @@ -130,5 +130,5 @@ AVHWAccel ff_vc1_vdpau_hwaccel = { .start_frame = vdpau_vc1_start_frame, .end_frame = ff_vdpau_mpeg_end_frame, .decode_slice = vdpau_vc1_decode_slice, - .priv_data_size = sizeof(struct vdpau_picture_context), + .frame_priv_data_size = sizeof(struct vdpau_picture_context), }; -- cgit v1.1