[vlc-commits] avcodec: rate limit messages about direct rendering

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Aug 12 11:06:53 2013 +0200| [aecd8612b495e9509ccc13b5ea06923fbd7e4052] | committer: Rafaël Carré

avcodec: rate limit messages about direct rendering

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

 modules/codec/avcodec/video.c |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index cd41fe1..958f9ea 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -943,6 +943,7 @@ static picture_t *lavc_dr_GetFrame(struct AVCodecContext *ctx,
                                    AVFrame *frame, int flags)
 {
     decoder_t *dec = (decoder_t *)ctx->opaque;
+    decoder_sys_t *sys = dec->p_sys;
 
     if (GetVlcChroma(&dec->fmt_out.video, ctx->pix_fmt) != VLC_SUCCESS)
         return NULL;
@@ -963,15 +964,17 @@ static picture_t *lavc_dr_GetFrame(struct AVCodecContext *ctx,
     /* Check that the picture is suitable for libavcodec */
     if (pic->p[0].i_pitch < width * pic->p[0].i_pixel_pitch)
     {
-        msg_Dbg(dec, "plane 0: pitch too small (%d/%d*%d)",
-                pic->p[0].i_pitch, width, pic->p[0].i_pixel_pitch);
+        if (sys->i_direct_rendering_used != 0)
+            msg_Dbg(dec, "plane 0: pitch too small (%d/%d*%d)",
+                    pic->p[0].i_pitch, width, pic->p[0].i_pixel_pitch);
         goto no_dr;
     }
 
     if (pic->p[0].i_lines < height)
     {
-        msg_Dbg(dec, "plane 0: lines too few (%d/%d)",
-                pic->p[0].i_lines, height);
+        if (sys->i_direct_rendering_used != 0)
+            msg_Dbg(dec, "plane 0: lines too few (%d/%d)",
+                    pic->p[0].i_lines, height);
         goto no_dr;
     }
 
@@ -979,13 +982,15 @@ static picture_t *lavc_dr_GetFrame(struct AVCodecContext *ctx,
     {
         if (pic->p[i].i_pitch % aligns[i])
         {
-            msg_Dbg(dec, "plane %d: pitch not aligned (%d%%%d)",
-                    i, pic->p[i].i_pitch, aligns[i]);
+            if (sys->i_direct_rendering_used != 0)
+                msg_Dbg(dec, "plane %d: pitch not aligned (%d%%%d)",
+                        i, pic->p[i].i_pitch, aligns[i]);
             goto no_dr;
         }
         if (((uintptr_t)pic->p[i].p_pixels) % aligns[i])
         {
-            msg_Warn(dec, "plane %d not aligned", i);
+            if (sys->i_direct_rendering_used != 0)
+                msg_Warn(dec, "plane %d not aligned", i);
             goto no_dr;
         }
     }