mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6'
* commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6': vaapi: Drop pointless debug output Merged-by: Clément Bœsch <clement@stupeflix.com>
This commit is contained in:
commit
d12cce3fb2
|
@ -210,8 +210,6 @@ void ff_vaapi_common_end_frame(AVCodecContext *avctx)
|
||||||
{
|
{
|
||||||
FFVAContext * const vactx = ff_vaapi_get_context(avctx);
|
FFVAContext * const vactx = ff_vaapi_get_context(avctx);
|
||||||
|
|
||||||
ff_dlog(avctx, "ff_vaapi_common_end_frame()\n");
|
|
||||||
|
|
||||||
destroy_buffers(vactx->display, &vactx->pic_param_buf_id, 1);
|
destroy_buffers(vactx->display, &vactx->pic_param_buf_id, 1);
|
||||||
destroy_buffers(vactx->display, &vactx->iq_matrix_buf_id, 1);
|
destroy_buffers(vactx->display, &vactx->iq_matrix_buf_id, 1);
|
||||||
destroy_buffers(vactx->display, &vactx->bitplane_buf_id, 1);
|
destroy_buffers(vactx->display, &vactx->bitplane_buf_id, 1);
|
||||||
|
|
|
@ -233,8 +233,6 @@ static int vaapi_h264_start_frame(AVCodecContext *avctx,
|
||||||
VAPictureParameterBufferH264 *pic_param;
|
VAPictureParameterBufferH264 *pic_param;
|
||||||
VAIQMatrixBufferH264 *iq_matrix;
|
VAIQMatrixBufferH264 *iq_matrix;
|
||||||
|
|
||||||
ff_dlog(avctx, "vaapi_h264_start_frame()\n");
|
|
||||||
|
|
||||||
vactx->slice_param_size = sizeof(VASliceParameterBufferH264);
|
vactx->slice_param_size = sizeof(VASliceParameterBufferH264);
|
||||||
|
|
||||||
/* Fill in VAPictureParameterBufferH264. */
|
/* Fill in VAPictureParameterBufferH264. */
|
||||||
|
@ -299,7 +297,6 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
|
||||||
H264SliceContext *sl = &h->slice_ctx[0];
|
H264SliceContext *sl = &h->slice_ctx[0];
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ff_dlog(avctx, "vaapi_h264_end_frame()\n");
|
|
||||||
ret = ff_vaapi_commit_slices(vactx);
|
ret = ff_vaapi_commit_slices(vactx);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto finish;
|
goto finish;
|
||||||
|
@ -325,9 +322,6 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx,
|
||||||
H264SliceContext *sl = &h->slice_ctx[0];
|
H264SliceContext *sl = &h->slice_ctx[0];
|
||||||
VASliceParameterBufferH264 *slice_param;
|
VASliceParameterBufferH264 *slice_param;
|
||||||
|
|
||||||
ff_dlog(avctx, "vaapi_h264_decode_slice(): buffer %p, size %d\n",
|
|
||||||
buffer, size);
|
|
||||||
|
|
||||||
/* Fill in VASliceParameterBufferH264. */
|
/* Fill in VASliceParameterBufferH264. */
|
||||||
slice_param = (VASliceParameterBufferH264 *)ff_vaapi_alloc_slice(vactx, buffer, size);
|
slice_param = (VASliceParameterBufferH264 *)ff_vaapi_alloc_slice(vactx, buffer, size);
|
||||||
if (!slice_param)
|
if (!slice_param)
|
||||||
|
|
|
@ -46,8 +46,6 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_
|
||||||
VAIQMatrixBufferMPEG2 *iq_matrix;
|
VAIQMatrixBufferMPEG2 *iq_matrix;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
ff_dlog(avctx, "vaapi_mpeg2_start_frame()\n");
|
|
||||||
|
|
||||||
vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG2);
|
vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG2);
|
||||||
|
|
||||||
/* Fill in VAPictureParameterBufferMPEG2 */
|
/* Fill in VAPictureParameterBufferMPEG2 */
|
||||||
|
@ -109,8 +107,6 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
|
||||||
GetBitContext gb;
|
GetBitContext gb;
|
||||||
uint32_t quantiser_scale_code, intra_slice_flag, macroblock_offset;
|
uint32_t quantiser_scale_code, intra_slice_flag, macroblock_offset;
|
||||||
|
|
||||||
ff_dlog(avctx, "vaapi_mpeg2_decode_slice(): buffer %p, size %d\n", buffer, size);
|
|
||||||
|
|
||||||
/* Determine macroblock_offset */
|
/* Determine macroblock_offset */
|
||||||
init_get_bits(&gb, buffer, 8 * size);
|
init_get_bits(&gb, buffer, 8 * size);
|
||||||
if (get_bits_long(&gb, 32) >> 8 != 1) /* start code */
|
if (get_bits_long(&gb, 32) >> 8 != 1) /* start code */
|
||||||
|
|
|
@ -51,8 +51,6 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_
|
||||||
VAIQMatrixBufferMPEG4 *iq_matrix;
|
VAIQMatrixBufferMPEG4 *iq_matrix;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
ff_dlog(avctx, "vaapi_mpeg4_start_frame()\n");
|
|
||||||
|
|
||||||
vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG4);
|
vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG4);
|
||||||
|
|
||||||
/* Fill in VAPictureParameterBufferMPEG4 */
|
/* Fill in VAPictureParameterBufferMPEG4 */
|
||||||
|
@ -125,8 +123,6 @@ static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
|
||||||
FFVAContext * const vactx = ff_vaapi_get_context(avctx);
|
FFVAContext * const vactx = ff_vaapi_get_context(avctx);
|
||||||
VASliceParameterBufferMPEG4 *slice_param;
|
VASliceParameterBufferMPEG4 *slice_param;
|
||||||
|
|
||||||
ff_dlog(avctx, "vaapi_mpeg4_decode_slice(): buffer %p, size %d\n", buffer, size);
|
|
||||||
|
|
||||||
/* Fill in VASliceParameterBufferMPEG4 */
|
/* Fill in VASliceParameterBufferMPEG4 */
|
||||||
slice_param = (VASliceParameterBufferMPEG4 *)ff_vaapi_alloc_slice(vactx, buffer, size);
|
slice_param = (VASliceParameterBufferMPEG4 *)ff_vaapi_alloc_slice(vactx, buffer, size);
|
||||||
if (!slice_param)
|
if (!slice_param)
|
||||||
|
|
|
@ -151,8 +151,6 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
|
||||||
FFVAContext * const vactx = ff_vaapi_get_context(avctx);
|
FFVAContext * const vactx = ff_vaapi_get_context(avctx);
|
||||||
VAPictureParameterBufferVC1 *pic_param;
|
VAPictureParameterBufferVC1 *pic_param;
|
||||||
|
|
||||||
ff_dlog(avctx, "vaapi_vc1_start_frame()\n");
|
|
||||||
|
|
||||||
vactx->slice_param_size = sizeof(VASliceParameterBufferVC1);
|
vactx->slice_param_size = sizeof(VASliceParameterBufferVC1);
|
||||||
|
|
||||||
/* Fill in VAPictureParameterBufferVC1 */
|
/* Fill in VAPictureParameterBufferVC1 */
|
||||||
|
@ -318,8 +316,6 @@ static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer,
|
||||||
FFVAContext * const vactx = ff_vaapi_get_context(avctx);
|
FFVAContext * const vactx = ff_vaapi_get_context(avctx);
|
||||||
VASliceParameterBufferVC1 *slice_param;
|
VASliceParameterBufferVC1 *slice_param;
|
||||||
|
|
||||||
ff_dlog(avctx, "vaapi_vc1_decode_slice(): buffer %p, size %d\n", buffer, size);
|
|
||||||
|
|
||||||
/* Current bit buffer is beyond any marker for VC-1, so skip it */
|
/* Current bit buffer is beyond any marker for VC-1, so skip it */
|
||||||
if (avctx->codec_id == AV_CODEC_ID_VC1 && IS_MARKER(AV_RB32(buffer))) {
|
if (avctx->codec_id == AV_CODEC_ID_VC1 && IS_MARKER(AV_RB32(buffer))) {
|
||||||
buffer += 4;
|
buffer += 4;
|
||||||
|
|
Loading…
Reference in New Issue