[FFmpeg-cvslog] Merge commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6'

Clément Bœsch git at videolan.org
Tue Jun 21 15:36:29 CEST 2016


ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Tue Jun 21 15:36:43 2016 +0200| [d12cce3fb25e6bb3b7a2b3874fd576a786ccc6b6] | committer: Clément Bœsch

Merge commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6'

* commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6':
  vaapi: Drop pointless debug output

Merged-by: Clément Bœsch <clement at stupeflix.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d12cce3fb25e6bb3b7a2b3874fd576a786ccc6b6
---

 libavcodec/vaapi.c       |    2 --
 libavcodec/vaapi_h264.c  |    6 ------
 libavcodec/vaapi_mpeg2.c |    4 ----
 libavcodec/vaapi_mpeg4.c |    4 ----
 libavcodec/vaapi_vc1.c   |    4 ----
 5 files changed, 20 deletions(-)

diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index a1ea790..36db640 100644
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@ -210,8 +210,6 @@ void ff_vaapi_common_end_frame(AVCodecContext *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->iq_matrix_buf_id, 1);
     destroy_buffers(vactx->display, &vactx->bitplane_buf_id, 1);
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index 91ee2d6..92efb26 100644
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -233,8 +233,6 @@ static int vaapi_h264_start_frame(AVCodecContext          *avctx,
     VAPictureParameterBufferH264 *pic_param;
     VAIQMatrixBufferH264 *iq_matrix;
 
-    ff_dlog(avctx, "vaapi_h264_start_frame()\n");
-
     vactx->slice_param_size = sizeof(VASliceParameterBufferH264);
 
     /* Fill in VAPictureParameterBufferH264. */
@@ -299,7 +297,6 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
     H264SliceContext *sl = &h->slice_ctx[0];
     int ret;
 
-    ff_dlog(avctx, "vaapi_h264_end_frame()\n");
     ret = ff_vaapi_commit_slices(vactx);
     if (ret < 0)
         goto finish;
@@ -325,9 +322,6 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx,
     H264SliceContext *sl  = &h->slice_ctx[0];
     VASliceParameterBufferH264 *slice_param;
 
-    ff_dlog(avctx, "vaapi_h264_decode_slice(): buffer %p, size %d\n",
-            buffer, size);
-
     /* Fill in VASliceParameterBufferH264. */
     slice_param = (VASliceParameterBufferH264 *)ff_vaapi_alloc_slice(vactx, buffer, size);
     if (!slice_param)
diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index 518fec0..9329e54 100644
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -46,8 +46,6 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_
     VAIQMatrixBufferMPEG2 *iq_matrix;
     int i;
 
-    ff_dlog(avctx, "vaapi_mpeg2_start_frame()\n");
-
     vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG2);
 
     /* Fill in VAPictureParameterBufferMPEG2 */
@@ -109,8 +107,6 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
     GetBitContext gb;
     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 */
     init_get_bits(&gb, buffer, 8 * size);
     if (get_bits_long(&gb, 32) >> 8 != 1) /* start code */
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
index b5b946d..725f00b 100644
--- a/libavcodec/vaapi_mpeg4.c
+++ b/libavcodec/vaapi_mpeg4.c
@@ -51,8 +51,6 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_
     VAIQMatrixBufferMPEG4 *iq_matrix;
     int i;
 
-    ff_dlog(avctx, "vaapi_mpeg4_start_frame()\n");
-
     vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG4);
 
     /* 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);
     VASliceParameterBufferMPEG4 *slice_param;
 
-    ff_dlog(avctx, "vaapi_mpeg4_decode_slice(): buffer %p, size %d\n", buffer, size);
-
     /* Fill in VASliceParameterBufferMPEG4 */
     slice_param = (VASliceParameterBufferMPEG4 *)ff_vaapi_alloc_slice(vactx, buffer, size);
     if (!slice_param)
diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c
index 5ded5db..4e82be1 100644
--- a/libavcodec/vaapi_vc1.c
+++ b/libavcodec/vaapi_vc1.c
@@ -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);
     VAPictureParameterBufferVC1 *pic_param;
 
-    ff_dlog(avctx, "vaapi_vc1_start_frame()\n");
-
     vactx->slice_param_size = sizeof(VASliceParameterBufferVC1);
 
     /* 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);
     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 */
     if (avctx->codec_id == AV_CODEC_ID_VC1 && IS_MARKER(AV_RB32(buffer))) {
         buffer += 4;


======================================================================

diff --cc libavcodec/vaapi.c
index a1ea790,094692e..36db640
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@@ -208,10 -179,8 +208,8 @@@ VASliceParameterBufferBase *ff_vaapi_al
  
  void ff_vaapi_common_end_frame(AVCodecContext *avctx)
  {
 -    struct vaapi_context * const vactx = avctx->hwaccel_context;
 +    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->iq_matrix_buf_id, 1);
      destroy_buffers(vactx->display, &vactx->bitplane_buf_id, 1);
diff --cc libavcodec/vaapi_h264.c
index 91ee2d6,0925985..92efb26
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@@ -325,11 -320,8 +322,8 @@@ static int vaapi_h264_decode_slice(AVCo
      H264SliceContext *sl  = &h->slice_ctx[0];
      VASliceParameterBufferH264 *slice_param;
  
-     ff_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);
 +    slice_param = (VASliceParameterBufferH264 *)ff_vaapi_alloc_slice(vactx, buffer, size);
      if (!slice_param)
          return -1;
      slice_param->slice_data_bit_offset          = get_bits_count(&sl->gb);
diff --cc libavcodec/vaapi_mpeg4.c
index b5b946d,6743e2a..725f00b
--- a/libavcodec/vaapi_mpeg4.c
+++ b/libavcodec/vaapi_mpeg4.c
@@@ -122,13 -120,18 +120,11 @@@ static int vaapi_mpeg4_start_frame(AVCo
  static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
  {
      MpegEncContext * const s = avctx->priv_data;
 +    FFVAContext * const vactx = ff_vaapi_get_context(avctx);
      VASliceParameterBufferMPEG4 *slice_param;
  
-     ff_dlog(avctx, "vaapi_mpeg4_decode_slice(): buffer %p, size %d\n", buffer, size);
- 
 -    /* video_plane_with_short_video_header() contains all GOBs
 -     * in-order, and this is what VA API (Intel backend) expects: only
 -     * a single slice param. So fake macroblock_number for Libav so
 -     * that we don't call vaapi_mpeg4_decode_slice() again
 -     */
 -    if (avctx->codec->id == AV_CODEC_ID_H263)
 -        size = s->gb.buffer_end - buffer;
 -
      /* Fill in VASliceParameterBufferMPEG4 */
 -    slice_param = (VASliceParameterBufferMPEG4 *)ff_vaapi_alloc_slice(avctx->hwaccel_context, buffer, size);
 +    slice_param = (VASliceParameterBufferMPEG4 *)ff_vaapi_alloc_slice(vactx, buffer, size);
      if (!slice_param)
          return -1;
      slice_param->macroblock_offset      = get_bits_count(&s->gb) % 8;
diff --cc libavcodec/vaapi_vc1.c
index 5ded5db,4022549..4e82be1
--- a/libavcodec/vaapi_vc1.c
+++ b/libavcodec/vaapi_vc1.c
@@@ -148,11 -148,9 +148,9 @@@ static int vaapi_vc1_start_frame(AVCode
  {
      VC1Context * const v = avctx->priv_data;
      MpegEncContext * const s = &v->s;
 -    struct vaapi_context * const vactx = avctx->hwaccel_context;
 +    FFVAContext * const vactx = ff_vaapi_get_context(avctx);
      VAPictureParameterBufferVC1 *pic_param;
  
-     ff_dlog(avctx, "vaapi_vc1_start_frame()\n");
- 
      vactx->slice_param_size = sizeof(VASliceParameterBufferVC1);
  
      /* Fill in VAPictureParameterBufferVC1 */
@@@ -315,11 -313,8 +313,9 @@@ static int vaapi_vc1_decode_slice(AVCod
  {
      VC1Context * const v = avctx->priv_data;
      MpegEncContext * const s = &v->s;
 +    FFVAContext * const vactx = ff_vaapi_get_context(avctx);
      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 */
      if (avctx->codec_id == AV_CODEC_ID_VC1 && IS_MARKER(AV_RB32(buffer))) {
          buffer += 4;



More information about the ffmpeg-cvslog mailing list