diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 13:34:14 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 13:34:14 +0400 |
commit | baf10ad186edb9da522e44c332372d52a5c6b336 (patch) | |
tree | 8d53b708f59c4ea0235cf034b59d89863ebd69e0 /libavcodec/vaapi_h264.c | |
parent | 28adecf0fa1fa56db17b1f0e7711acb68baf00e7 (diff) | |
parent | c57a593670308447aa1998259a1912273cc67fe9 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hwaccel: consistent name prefixes for start_frame/end_frame/decode_slice
Conflicts:
libavcodec/vda_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_h264.c')
-rw-r--r-- | libavcodec/vaapi_h264.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index 78ae315596..349dc1bb01 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -219,16 +219,16 @@ static void fill_vaapi_plain_pred_weight_table(H264Context *h, } /** Initialize and start decoding a frame with VA API. */ -static int start_frame(AVCodecContext *avctx, - av_unused const uint8_t *buffer, - av_unused uint32_t size) +static int vaapi_h264_start_frame(AVCodecContext *avctx, + av_unused const uint8_t *buffer, + av_unused uint32_t size) { H264Context * const h = avctx->priv_data; struct vaapi_context * const vactx = avctx->hwaccel_context; VAPictureParameterBufferH264 *pic_param; VAIQMatrixBufferH264 *iq_matrix; - av_dlog(avctx, "start_frame()\n"); + av_dlog(avctx, "vaapi_h264_start_frame()\n"); vactx->slice_param_size = sizeof(VASliceParameterBufferH264); @@ -287,13 +287,13 @@ static int start_frame(AVCodecContext *avctx, } /** End a hardware decoding based frame. */ -static int end_frame(AVCodecContext *avctx) +static int vaapi_h264_end_frame(AVCodecContext *avctx) { struct vaapi_context * const vactx = avctx->hwaccel_context; H264Context * const h = avctx->priv_data; int ret; - av_dlog(avctx, "end_frame()\n"); + av_dlog(avctx, "vaapi_h264_end_frame()\n"); ret = ff_vaapi_commit_slices(vactx); if (ret < 0) goto finish; @@ -310,14 +310,15 @@ finish: } /** Decode the given H.264 slice with VA API. */ -static int decode_slice(AVCodecContext *avctx, - const uint8_t *buffer, - uint32_t size) +static int vaapi_h264_decode_slice(AVCodecContext *avctx, + const uint8_t *buffer, + uint32_t size) { H264Context * const h = avctx->priv_data; VASliceParameterBufferH264 *slice_param; - av_dlog(avctx, "decode_slice(): buffer %p, size %d\n", buffer, size); + av_dlog(avctx, "vaapi_h264_decode_slice(): buffer %p, size %d\n", + buffer, size); /* Fill in VASliceParameterBufferH264. */ slice_param = (VASliceParameterBufferH264 *)ff_vaapi_alloc_slice(avctx->hwaccel_context, buffer, size); @@ -354,7 +355,7 @@ AVHWAccel ff_h264_vaapi_hwaccel = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .pix_fmt = AV_PIX_FMT_VAAPI_VLD, - .start_frame = start_frame, - .end_frame = end_frame, - .decode_slice = decode_slice, + .start_frame = vaapi_h264_start_frame, + .end_frame = vaapi_h264_end_frame, + .decode_slice = vaapi_h264_decode_slice, }; |