[FFmpeg-cvslog] cinedec: report white balance gain coefficients using metadata
Peter Ross
git at videolan.org
Thu Nov 20 02:04:20 CET 2014
ffmpeg | branch: release/2.4 | Peter Ross <pross at xvid.org> | Sun Nov 9 12:05:41 2014 +1100| [e386241d54a0cc39b4513a4cfc250630c1d560ba] | committer: Carl Eugen Hoyos
cinedec: report white balance gain coefficients using metadata
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 2093c1dc51ee1c08cb558759a1c59e6d1e3358a0)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e386241d54a0cc39b4513a4cfc250630c1d560ba
---
libavformat/cinedec.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/libavformat/cinedec.c b/libavformat/cinedec.c
index 9eed006..0583ce0 100644
--- a/libavformat/cinedec.c
+++ b/libavformat/cinedec.c
@@ -27,6 +27,7 @@
#include "libavutil/intreadwrite.h"
#include "libavcodec/bmp.h"
+#include "libavutil/intfloat.h"
#include "avformat.h"
#include "internal.h"
@@ -78,6 +79,16 @@ static int set_metadata_int(AVDictionary **dict, const char *key, int value, int
return 0;
}
+static int set_metadata_float(AVDictionary **dict, const char *key, float value, int allow_zero)
+{
+ if (value != 0 || allow_zero) {
+ char tmp[64];
+ snprintf(tmp, sizeof(tmp), "%f", value);
+ return av_dict_set(dict, key, tmp, 0);
+ }
+ return 0;
+}
+
static int cine_read_header(AVFormatContext *avctx)
{
AVIOContext *pb = avctx->pb;
@@ -177,7 +188,10 @@ static int cine_read_header(AVFormatContext *avctx)
set_metadata_int(&st->metadata, "contrast", avio_rl32(pb), 1);
set_metadata_int(&st->metadata, "gamma", avio_rl32(pb), 1);
- avio_skip(pb, 72); // Reserved1 .. WBView
+ avio_skip(pb, 12 + 16); // Reserved1 .. AutoExpRect
+ set_metadata_float(&st->metadata, "wbgain[0].r", av_int2float(avio_rl32(pb)), 1);
+ set_metadata_float(&st->metadata, "wbgain[0].b", av_int2float(avio_rl32(pb)), 1);
+ avio_skip(pb, 36); // WBGain[1].. WBView
st->codec->bits_per_coded_sample = avio_rl32(pb);
More information about the ffmpeg-cvslog
mailing list