Commit a871ef0c authored by Anton Khirnov's avatar Anton Khirnov Committed by Luca Barbato
Browse files

hwaccel: Rename priv_data_size to frame_priv_data_size

This describes more accurately what this field is for.
parent 08bb2567
......@@ -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;
/**
......
......@@ -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),
};
......@@ -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),
};
......@@ -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),
};
......@@ -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;
......
......@@ -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;
......
......@@ -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),
};
......@@ -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
......@@ -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
......@@ -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),
};
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment