[FFmpeg-cvslog] vf_psnr: fix rgb channel order mixup in final log message.

Ronald S. Bultje git at videolan.org
Sat Jul 11 19:14:43 CEST 2015


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sat Jul 11 11:21:17 2015 -0400| [3bb58c377b4544b6025a2314209bc5efd6bda061] | committer: Michael Niedermayer

vf_psnr: fix rgb channel order mixup in final log message.

Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavfilter/vf_psnr.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c
index cc4546a..74afdaa 100644
--- a/libavfilter/vf_psnr.c
+++ b/libavfilter/vf_psnr.c
@@ -327,9 +327,11 @@ static av_cold void uninit(AVFilterContext *ctx)
         char buf[256];
 
         buf[0] = 0;
-        for (j = 0; j < s->nb_components; j++)
+        for (j = 0; j < s->nb_components; j++) {
+            int c = s->is_rgb ? s->rgba_map[j] : j;
             av_strlcatf(buf, sizeof(buf), " %c:%0.2f", s->comps[j],
-                        get_psnr(s->mse_comp[j], s->nb_frames, s->max[j]));
+                        get_psnr(s->mse_comp[c], s->nb_frames, s->max[c]));
+        }
         av_log(ctx, AV_LOG_INFO, "PSNR%s average:%0.2f min:%0.2f max:%0.2f\n",
                buf,
                get_psnr(s->mse, s->nb_frames, s->average_max),



More information about the ffmpeg-cvslog mailing list