Rename ff_vaapi_alloc_picture() to ff_vaapi_alloc_pic_param().
Originally committed as revision 20942 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
36ad2b3ee0
commit
8b0867121e
@ -129,7 +129,7 @@ static void *alloc_buffer(struct vaapi_context *vactx, int type, unsigned int si
|
|||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
void *ff_vaapi_alloc_picture(struct vaapi_context *vactx, unsigned int size)
|
void *ff_vaapi_alloc_pic_param(struct vaapi_context *vactx, unsigned int size)
|
||||||
{
|
{
|
||||||
return alloc_buffer(vactx, VAPictureParameterBufferType, size, &vactx->pic_param_buf_id);
|
return alloc_buffer(vactx, VAPictureParameterBufferType, size, &vactx->pic_param_buf_id);
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ static inline VASurfaceID ff_vaapi_get_surface_id(Picture *pic)
|
|||||||
int ff_vaapi_common_end_frame(MpegEncContext *s);
|
int ff_vaapi_common_end_frame(MpegEncContext *s);
|
||||||
|
|
||||||
/** Allocate a new picture parameter buffer */
|
/** Allocate a new picture parameter buffer */
|
||||||
void *ff_vaapi_alloc_picture(struct vaapi_context *vactx, unsigned int size);
|
void *ff_vaapi_alloc_pic_param(struct vaapi_context *vactx, unsigned int size);
|
||||||
|
|
||||||
/** Allocate a new IQ matrix buffer */
|
/** Allocate a new IQ matrix buffer */
|
||||||
void *ff_vaapi_alloc_iq_matrix(struct vaapi_context *vactx, unsigned int size);
|
void *ff_vaapi_alloc_iq_matrix(struct vaapi_context *vactx, unsigned int size);
|
||||||
|
@ -49,7 +49,7 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_
|
|||||||
vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG2);
|
vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG2);
|
||||||
|
|
||||||
/* Fill in VAPictureParameterBufferMPEG2 */
|
/* Fill in VAPictureParameterBufferMPEG2 */
|
||||||
pic_param = ff_vaapi_alloc_picture(vactx, sizeof(VAPictureParameterBufferMPEG2));
|
pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferMPEG2));
|
||||||
if (!pic_param)
|
if (!pic_param)
|
||||||
return -1;
|
return -1;
|
||||||
pic_param->horizontal_size = s->width;
|
pic_param->horizontal_size = s->width;
|
||||||
|
@ -51,7 +51,7 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_
|
|||||||
vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG4);
|
vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG4);
|
||||||
|
|
||||||
/* Fill in VAPictureParameterBufferMPEG4 */
|
/* Fill in VAPictureParameterBufferMPEG4 */
|
||||||
pic_param = ff_vaapi_alloc_picture(vactx, sizeof(VAPictureParameterBufferMPEG4));
|
pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferMPEG4));
|
||||||
if (!pic_param)
|
if (!pic_param)
|
||||||
return -1;
|
return -1;
|
||||||
pic_param->vop_width = s->width;
|
pic_param->vop_width = s->width;
|
||||||
|
@ -142,7 +142,7 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
|
|||||||
vactx->slice_param_size = sizeof(VASliceParameterBufferVC1);
|
vactx->slice_param_size = sizeof(VASliceParameterBufferVC1);
|
||||||
|
|
||||||
/* Fill in VAPictureParameterBufferVC1 */
|
/* Fill in VAPictureParameterBufferVC1 */
|
||||||
pic_param = ff_vaapi_alloc_picture(vactx, sizeof(VAPictureParameterBufferVC1));
|
pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferVC1));
|
||||||
if (!pic_param)
|
if (!pic_param)
|
||||||
return -1;
|
return -1;
|
||||||
pic_param->forward_reference_picture = 0xffffffff;
|
pic_param->forward_reference_picture = 0xffffffff;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user