Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avcodec/tiff_common: Improve formating of long arrays

Browse source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-29 22:08:08 +02:00
parent 4d5d905eed
commit 1c71f185ad
3 changed files with 208 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libavcodec/tiff_common.c
View file

@ -75,6 +75,15 @@ unsigned ff_tget(GetByteContext *gb, int type, int le)
}
}
static char *auto_sep(int count, char *sep, int i, int columns)
{
if (sep)
return i ? sep : "";
if (i && i%columns) {
return ", ";
} else
return columns < count ? "\n" : "";
}
int ff_tadd_rational_metadata(int count, const char *name, const char *sep,
GetByteContext *gb, int le, AVDictionary **metadata)
@ -88,14 +97,13 @@ int ff_tadd_rational_metadata(int count, const char *name, const char *sep,
return AVERROR_INVALIDDATA;
if (bytestream2_get_bytes_left(gb) < count * sizeof(int64_t))
return AVERROR_INVALIDDATA;
if (!sep) sep = ", ";
av_bprint_init(&bp, 10 * count, AV_BPRINT_SIZE_UNLIMITED);
for (i = 0; i < count; i++) {
nom = ff_tget_long(gb, le);
denom = ff_tget_long(gb, le);
av_bprintf(&bp, "%s%i:%i", (i ? sep : ""), nom, denom);
av_bprintf(&bp, "%s%7i:%-7i", auto_sep(count, sep, i, 4), nom, denom);
}
if ((i = av_bprint_finalize(&bp, &ap))) {
@ -122,12 +130,11 @@ int ff_tadd_long_metadata(int count, const char *name, const char *sep,
return AVERROR_INVALIDDATA;
if (bytestream2_get_bytes_left(gb) < count * sizeof(int32_t))
return AVERROR_INVALIDDATA;
if (!sep) sep = ", ";
av_bprint_init(&bp, 10 * count, AV_BPRINT_SIZE_UNLIMITED);
for (i = 0; i < count; i++) {
av_bprintf(&bp, "%s%i", (i ? sep : ""), ff_tget_long(gb, le));
av_bprintf(&bp, "%s%7i", auto_sep(count, sep, i, 8), ff_tget_long(gb, le));
}
if ((i = av_bprint_finalize(&bp, &ap))) {
@ -154,12 +161,11 @@ int ff_tadd_doubles_metadata(int count, const char *name, const char *sep,
return AVERROR_INVALIDDATA;
if (bytestream2_get_bytes_left(gb) < count * sizeof(int64_t))
return AVERROR_INVALIDDATA;
if (!sep) sep = ", ";
av_bprint_init(&bp, 10 * count, 100 * count);
for (i = 0; i < count; i++) {
av_bprintf(&bp, "%s%f", (i ? sep : ""), ff_tget_double(gb, le));
av_bprintf(&bp, "%s%f", auto_sep(count, sep, i, 4), ff_tget_double(gb, le));
}
if ((i = av_bprint_finalize(&bp, &ap))) {
@ -186,12 +192,11 @@ int ff_tadd_shorts_metadata(int count, const char *name, const char *sep,
return AVERROR_INVALIDDATA;
if (bytestream2_get_bytes_left(gb) < count * sizeof(int16_t))
return AVERROR_INVALIDDATA;
if (!sep) sep = ", ";
av_bprint_init(&bp, 10 * count, AV_BPRINT_SIZE_UNLIMITED);
for (i = 0; i < count; i++) {
av_bprintf(&bp, "%s%i", (i ? sep : ""), ff_tget_short(gb, le));
av_bprintf(&bp, "%s%5i", auto_sep(count, sep, i, 8), ff_tget_short(gb, le));
}
if ((i = av_bprint_finalize(&bp, &ap))) {
@ -218,12 +223,11 @@ int ff_tadd_bytes_metadata(int count, const char *name, const char *sep,
return AVERROR_INVALIDDATA;
if (bytestream2_get_bytes_left(gb) < count * sizeof(int8_t))
return AVERROR_INVALIDDATA;
if (!sep) sep = ", ";
av_bprint_init(&bp, 10 * count, AV_BPRINT_SIZE_UNLIMITED);
for (i = 0; i < count; i++) {
av_bprintf(&bp, "%s%i", (i ? sep : ""), bytestream2_get_byte(gb));
av_bprintf(&bp, "%s%3i", auto_sep(count, sep, i, 16), bytestream2_get_byte(gb));
}
if ((i = av_bprint_finalize(&bp, &ap))) {

228
tests/ref/fate/exif-image-jpg
View file

File diff suppressed because one or more lines are too long

2
tests/ref/fate/exif-image-tiff
View file

@ -20,6 +20,6 @@ interlaced_frame=0
top_field_first=0
repeat_pict=0
TAG:document_name=image_small.tiff
TAG:page_number=0 / 1
TAG:page_number= 0 / 1
TAG:software=ImageMagick 6.5.8-0 2010-02-09 Q16 http://www.imagemagick.org
[/FRAME]