[FFmpeg-cvslog] swresample: slightly nicer debug output for auto matrix

wm4 git at videolan.org
Thu Oct 15 20:16:34 CEST 2015


ffmpeg | branch: master | wm4 <nfxjfg at googlemail.com> | Thu Oct 15 19:07:27 2015 +0200| [cdf4a13f86157155bf9518a51369f0d5c03ae707] | committer: wm4

swresample: slightly nicer debug output for auto matrix

This is the matrix that will be used for up/downmixing.

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

 libswresample/rematrix.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index 54ebb96..932088f 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -340,11 +340,16 @@ av_cold static int auto_matrix(SwrContext *s)
             }
     }
 
+    av_log(s, AV_LOG_DEBUG, "Matrix coefficients:\n");
     for(i=0; i<av_get_channel_layout_nb_channels(out_ch_layout); i++){
+        const char *c =
+            av_get_channel_name(av_channel_layout_extract_channel(out_ch_layout, i));
+        av_log(s, AV_LOG_DEBUG, "%s: ", c ? c : "?");
         for(j=0; j<av_get_channel_layout_nb_channels(in_ch_layout); j++){
-            av_log(NULL, AV_LOG_DEBUG, "%f ", s->matrix[i][j]);
+            c = av_get_channel_name(av_channel_layout_extract_channel(in_ch_layout, j));
+            av_log(s, AV_LOG_DEBUG, "%s:%f ", c ? c : "?", s->matrix[i][j]);
         }
-        av_log(NULL, AV_LOG_DEBUG, "\n");
+        av_log(s, AV_LOG_DEBUG, "\n");
     }
     return 0;
 }



More information about the ffmpeg-cvslog mailing list