RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-03 13:24:05 +00:00
Code Issues Projects Releases Wiki Activity

lavfi: fix broken logic in metadata handling

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-07-08 20:13:14 +00:00
parent 970c8df735
commit a03e79ed5a
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/vf_bbox.c
View File

@ -62,7 +62,7 @@ static int query_formats(AVFilterContext *ctx)
#define SET_META(key, value) \ #define SET_META(key, value) \
snprintf(buf, sizeof(buf), "%d", value); \ snprintf(buf, sizeof(buf), "%d", value); \
av_dict_set(metadata, #key, buf, 0); \ av_dict_set(metadata, key, buf, 0);
static int filter_frame(AVFilterLink *inlink, AVFrame *frame) static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
{ {

2
libavfilter/vf_cropdetect.c
View File

@ -114,7 +114,7 @@ static int config_input(AVFilterLink *inlink)
#define SET_META(key, value) \ #define SET_META(key, value) \
snprintf(buf, sizeof(buf), "%d", value); \ snprintf(buf, sizeof(buf), "%d", value); \
av_dict_set(metadata, #key, buf, 0) \ av_dict_set(metadata, key, buf, 0)
static int filter_frame(AVFilterLink *inlink, AVFrame *frame) static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
{ {

24
libavfilter/vf_psnr.c
View File

@ -98,16 +98,24 @@ void compute_images_mse(const uint8_t *main_data[4], const int main_linesizes[4]
} }
} }
#define SET_META(key, comp, value) \ static void set_meta(AVDictionary **metadata, const char *key, char comp, float d)
snprintf(buf, sizeof(buf), "%0.2f", value); \ {
av_dict_set(metadata, #key #comp, buf, 0); \ char value[128];
snprintf(value, sizeof(value), "%0.2f", d);
if (comp) {
char key2[128];
snprintf(key2, sizeof(key2), "%s%c", key, comp);
av_dict_set(metadata, key2, value, 0);
} else {
av_dict_set(metadata, key, value, 0);
}
}
static AVFrame *do_psnr(AVFilterContext *ctx, AVFrame *main, static AVFrame *do_psnr(AVFilterContext *ctx, AVFrame *main,
const AVFrame *ref) const AVFrame *ref)
{ {
PSNRContext *s = ctx->priv; PSNRContext *s = ctx->priv;
double comp_mse[4], mse = 0; double comp_mse[4], mse = 0;
char buf[32];
int j, c; int j, c;
AVDictionary **metadata = avpriv_frame_get_metadatap(main); AVDictionary **metadata = avpriv_frame_get_metadatap(main);
@ -127,10 +135,10 @@ 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;
SET_META("lavfi.psnr.mse.", s->comps[j], comp_mse[c]); set_meta(metadata, "lavfi.psnr.mse.", s->comps[j], comp_mse[c]);
SET_META("lavfi.psnr.mse_avg", "", mse); set_meta(metadata, "lavfi.psnr.mse_avg", 0, mse);
SET_META("lavfi.psnr.s.", s->comps[j], get_psnr(comp_mse[c], 1, s->max[c])); set_meta(metadata, "lavfi.psnr.s.", s->comps[j], get_psnr(comp_mse[c], 1, s->max[c]));
SET_META("lavfi.psnr.s_avg", "", get_psnr(mse, 1, s->average_max)); set_meta(metadata, "lavfi.psnr.s_avg", 0, get_psnr(mse, 1, s->average_max));
} }
if (s->stats_file) { if (s->stats_file) {