virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavfi/psnr: rename 's' parameter to match documentation

Browse Source 
Also removes some irrelevant lines in documentation.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2013-07-09 09:38:47 +00:00
parent d0a7933991
commit 3c5071db88
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
doc/filters.texi
View File

@@ -5864,9 +5864,6 @@ PSNR = 10*log10(MAX^2/MSE)
Where MAX is the average of the maximum values of each component of the Where MAX is the average of the maximum values of each component of the
image. image.
The filter accepts parameters as a list of @var{key}=@var{value} pairs,
separated by ":".
The description of the accepted parameters follows. The description of the accepted parameters follows.
@table @option @table @option
@@ -5879,15 +5876,13 @@ The file printed if @var{stats_file} is selected, contains a sequence of
key/value pairs of the form @var{key}:@var{value} for each compared key/value pairs of the form @var{key}:@var{value} for each compared
couple of frames. couple of frames.
The shown line contains .
A description of each shown parameter follows: A description of each shown parameter follows:
@table @option @table @option
@item n @item n
sequential number of the input frame, starting from 1 sequential number of the input frame, starting from 1
@item mse_average @item mse_avg
Mean Square Error pixel-by-pixel average difference of the compared Mean Square Error pixel-by-pixel average difference of the compared
frames, averaged over all the image components. frames, averaged over all the image components.
@@ -5895,7 +5890,7 @@ frames, averaged over all the image components.
Mean Square Error pixel-by-pixel average difference of the compared Mean Square Error pixel-by-pixel average difference of the compared
frames for the component specified by the suffix. frames for the component specified by the suffix.
@item psnr_y, psnr_u, psnr_v, psnr_r, psnr_g, psnr_g, psnr_a @item psnr_y, psnr_u, psnr_v, psnr_r, psnr_g, psnr_b, psnr_a
Peak Signal to Noise ratio of the compared frames for the component Peak Signal to Noise ratio of the compared frames for the component
specified by the suffix. specified by the suffix.
@end table @end table

6
libavfilter/vf_psnr.c
View File

@@ -137,8 +137,8 @@ static AVFrame *do_psnr(AVFilterContext *ctx, AVFrame *main,
c = s->is_rgb ? s->rgba_map[j] : 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.", s->comps[j], comp_mse[c]);
set_meta(metadata, "lavfi.psnr.mse_avg", 0, mse); set_meta(metadata, "lavfi.psnr.mse_avg", 0, mse);
set_meta(metadata, "lavfi.psnr.s.", s->comps[j], get_psnr(comp_mse[c], 1, s->max[c])); set_meta(metadata, "lavfi.psnr.psnr.", s->comps[j], get_psnr(comp_mse[c], 1, s->max[c]));
set_meta(metadata, "lavfi.psnr.s_avg", 0, get_psnr(mse, 1, s->average_max)); set_meta(metadata, "lavfi.psnr.psnr_avg", 0, get_psnr(mse, 1, s->average_max));
} }
if (s->stats_file) { if (s->stats_file) {
@@ -149,7 +149,7 @@ static AVFrame *do_psnr(AVFilterContext *ctx, AVFrame *main,
} }
for (j = 0; j < s->desc->nb_components; j++) { for (j = 0; j < s->desc->nb_components; j++) {
c = s->is_rgb ? s->rgba_map[j] : j; c = s->is_rgb ? s->rgba_map[j] : j;
fprintf(s->stats_file, "s%c:%0.2f ", s->comps[j], fprintf(s->stats_file, "psnr_%c:%0.2f ", s->comps[j],
get_psnr(comp_mse[c], 1, s->max[c])); get_psnr(comp_mse[c], 1, s->max[c]));
} }
fprintf(s->stats_file, "\n"); fprintf(s->stats_file, "\n");