videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Rename ff_vaapi_get_surface() to ff_vaapi_get_surface_id(). 

Originally committed as revision 20941 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Gwenole Beauchesne 2009-12-28 09:02:16 +00:00
parent 6399c17d54
commit 36ad2b3ee0
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vaapi.c
View File

@ -185,7 +185,7 @@ int ff_vaapi_common_end_frame(MpegEncContext *s)
if (commit_slices(vactx) < 0)
goto done;
if (vactx->n_slice_buf_ids > 0) {
if (render_picture(vactx, ff_vaapi_get_surface(s->current_picture_ptr)) < 0)
if (render_picture(vactx, ff_vaapi_get_surface_id(s->current_picture_ptr)) < 0)
goto done;
ff_draw_horiz_band(s, 0, s->avctx->height);
}

2
libavcodec/vaapi_internal.h
View File

@ -36,7 +36,7 @@
*/
/** Extract VASurfaceID from a Picture */
static inline VASurfaceID ff_vaapi_get_surface(Picture *pic)
static inline VASurfaceID ff_vaapi_get_surface_id(Picture *pic)
{
return (uintptr_t)pic->data[3];
}

4
libavcodec/vaapi_mpeg2.c
View File

@ -73,10 +73,10 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_
switch (s->pict_type) {
case FF_B_TYPE:
pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture);
pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture);
// fall-through
case FF_P_TYPE:
pic_param->forward_reference_picture = ff_vaapi_get_surface(&s->last_picture);
pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture);
break;
}

4
libavcodec/vaapi_mpeg4.c
View File

@ -92,9 +92,9 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_
pic_param->TRD = s->pp_time;
if (s->pict_type == FF_B_TYPE)
pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture);
pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture);
if (s->pict_type != FF_I_TYPE)
pic_param->forward_reference_picture = ff_vaapi_get_surface(&s->last_picture);
pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture);
/* Fill in VAIQMatrixBufferMPEG4 */
/* Only the first inverse quantisation method uses the weighthing matrices */

4
libavcodec/vaapi_vc1.c
View File

@ -242,10 +242,10 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
switch (s->pict_type) {
case FF_B_TYPE:
pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture);
pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture);
// fall-through
case FF_P_TYPE:
pic_param->forward_reference_picture = ff_vaapi_get_surface(&s->last_picture);
pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture);
break;
}