Re: [FFmpeg-devel] [PATCH] vF_psnr: move set_meta() calls out of loop.

2015-07-11 Thread Michael Niedermayer 
On Sat, Jul 11, 2015 at 05:01:03AM +, Paul B Mahol wrote:
 Dana 11. 7. 2015. 04:47 osoba Ronald S. Bultje rsbul...@gmail.com
 napisala je:
 
  ---
   libavfilter/vf_psnr.c | 4 ++--
   1 file changed, 2 insertions(+), 2 deletions(-)
 
  diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c
  index b2c6531..0c2c950 100644
  --- a/libavfilter/vf_psnr.c
  +++ b/libavfilter/vf_psnr.c
  @@ -173,10 +173,10 @@ static AVFrame *do_psnr(AVFilterContext *ctx,
 AVFrame *main,
   for (j = 0; j  s-nb_components; j++) {
   c = s-is_rgb ? s-rgba_map[j] : j;
   set_meta(metadata, lavfi.psnr.mse., s-comps[j], comp_mse[c]);
  -set_meta(metadata, lavfi.psnr.mse_avg, 0, mse);
   set_meta(metadata, lavfi.psnr.psnr., s-comps[j],
 get_psnr(comp_mse[c], 1, s-max[c]));
  -set_meta(metadata, lavfi.psnr.psnr_avg, 0, get_psnr(mse, 1,
 s-average_max));
   }
  +set_meta(metadata, lavfi.psnr.mse_avg, 0, mse);
  +set_meta(metadata, lavfi.psnr.psnr_avg, 0, get_psnr(mse, 1,
 s-average_max));
 
   if (s-stats_file) {
   fprintf(s-stats_file, n:%PRId64 mse_avg:%0.2f ,
 s-nb_frames, mse);
  --
  2.1.2
 
 
 Oops, LGTM.

applied

thanks

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

In fact, the RIAA has been known to suggest that students drop out
of college or go to community college in order to be able to afford
settlements. -- The RIAA


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] vF_psnr: move set_meta() calls out of loop.

2015-07-10 Thread Ronald S. Bultje 
---
 libavfilter/vf_psnr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c
index b2c6531..0c2c950 100644
--- a/libavfilter/vf_psnr.c
+++ b/libavfilter/vf_psnr.c
@@ -173,10 +173,10 @@ static AVFrame *do_psnr(AVFilterContext *ctx, AVFrame 
*main,
 for (j = 0; j  s-nb_components; j++) {
 c = s-is_rgb ? s-rgba_map[j] : j;
 set_meta(metadata, lavfi.psnr.mse., s-comps[j], comp_mse[c]);
-set_meta(metadata, lavfi.psnr.mse_avg, 0, mse);
 set_meta(metadata, lavfi.psnr.psnr., s-comps[j], 
get_psnr(comp_mse[c], 1, s-max[c]));
-set_meta(metadata, lavfi.psnr.psnr_avg, 0, get_psnr(mse, 1, 
s-average_max));
 }
+set_meta(metadata, lavfi.psnr.mse_avg, 0, mse);
+set_meta(metadata, lavfi.psnr.psnr_avg, 0, get_psnr(mse, 1, 
s-average_max));
 
 if (s-stats_file) {
 fprintf(s-stats_file, n:%PRId64 mse_avg:%0.2f , s-nb_frames, 
mse);
-- 
2.1.2

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] vF_psnr: move set_meta() calls out of loop.

2015-07-10 Thread Paul B Mahol 
Dana 11. 7. 2015. 04:47 osoba Ronald S. Bultje rsbul...@gmail.com
napisala je:

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

 diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c
 index b2c6531..0c2c950 100644
 --- a/libavfilter/vf_psnr.c
 +++ b/libavfilter/vf_psnr.c
 @@ -173,10 +173,10 @@ static AVFrame *do_psnr(AVFilterContext *ctx,
AVFrame *main,
  for (j = 0; j  s-nb_components; j++) {
  c = s-is_rgb ? s-rgba_map[j] : j;
  set_meta(metadata, lavfi.psnr.mse., s-comps[j], comp_mse[c]);
 -set_meta(metadata, lavfi.psnr.mse_avg, 0, mse);
  set_meta(metadata, lavfi.psnr.psnr., s-comps[j],
get_psnr(comp_mse[c], 1, s-max[c]));
 -set_meta(metadata, lavfi.psnr.psnr_avg, 0, get_psnr(mse, 1,
s-average_max));
  }
 +set_meta(metadata, lavfi.psnr.mse_avg, 0, mse);
 +set_meta(metadata, lavfi.psnr.psnr_avg, 0, get_psnr(mse, 1,
s-average_max));

  if (s-stats_file) {
  fprintf(s-stats_file, n:%PRId64 mse_avg:%0.2f ,
s-nb_frames, mse);
 --
 2.1.2


Oops, LGTM.

 ___
 ffmpeg-devel mailing list
 ffmpeg-devel@ffmpeg.org
 http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel