virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'

Browse Source 
* commit '8542f9c4f17125d483c40c0c5723842f1c982f81':
  replaygain: correctly parse peak values

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-04 22:52:12 +02:00
commit c1d053621c
4 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/APIchanges
View File

@ -15,6 +15,10 @@ libavutil: 2012-10-22
API changes, most recent first: API changes, most recent first:
2014-04-xx - xxxxxxx - lavu 53.10.0 - replaygain.h
Full scale for peak values is now 100000 (instead of UINT32_MAX) and values
may overflow.
2014-04-xx - xxxxxxx - lavu 53.09.0 - log.h 2014-04-xx - xxxxxxx - lavu 53.09.0 - log.h
Add AV_LOG(c) macro to have 256 color debug messages. Add AV_LOG(c) macro to have 256 color debug messages.

54
libavformat/replaygain.c
View File

@ -35,7 +35,7 @@
#include "avformat.h" #include "avformat.h"
#include "replaygain.h" #include "replaygain.h"
static int32_t parse_gain(const char *gain) static int32_t parse_value(const char *value, int32_t min)
{ {
char *fraction; char *fraction;
int scale = 10000; int scale = 10000;
@ -43,15 +43,15 @@ static int32_t parse_gain(const char *gain)
int sign = 1; int sign = 1;
int db; int db;
if (!gain) if (!value)
return INT32_MIN; return min;
gain += strspn(gain, " \t"); value += strspn(value, " \t");
if (*gain == '-') if (*value == '-')
sign = -1; sign = -1;
db = strtol(gain, &fraction, 0); db = strtol(value, &fraction, 0);
if (*fraction++ == '.') { if (*fraction++ == '.') {
while (av_isdigit(*fraction) && scale) { while (av_isdigit(*fraction) && scale) {
mb += scale * (*fraction - '0'); mb += scale * (*fraction - '0');
@ -61,43 +61,11 @@ static int32_t parse_gain(const char *gain)
} }
if (abs(db) > (INT32_MAX - mb) / 100000) if (abs(db) > (INT32_MAX - mb) / 100000)
return INT32_MIN; return min;
return db * 100000 + sign * mb; return db * 100000 + sign * mb;
} }
static uint32_t parse_peak(const uint8_t *peak)
{
int64_t val = 0;
int64_t scale = 1;
if (!peak)
return 0;
peak += strspn(peak, " \t");
if (peak[0] == '1' && peak[1] == '.')
return UINT32_MAX;
else if (!(peak[0] == '0' && peak[1] == '.'))
return 0;
peak += 2;
while (av_isdigit(*peak)) {
int digit = *peak - '0';
if (scale > INT64_MAX / 10)
break;
val = 10 * val + digit;
scale *= 10;
peak++;
}
return av_rescale(val, UINT32_MAX, scale);
}
static int replaygain_export(AVStream *st, static int replaygain_export(AVStream *st,
const uint8_t *track_gain, const uint8_t *track_peak, const uint8_t *track_gain, const uint8_t *track_peak,
const uint8_t *album_gain, const uint8_t *album_peak) const uint8_t *album_gain, const uint8_t *album_peak)
@ -107,10 +75,10 @@ static int replaygain_export(AVStream *st,
int32_t tg, ag; int32_t tg, ag;
uint32_t tp, ap; uint32_t tp, ap;
tg = parse_gain(track_gain); tg = parse_value(track_gain, INT32_MIN);
ag = parse_gain(album_gain); ag = parse_value(album_gain, INT32_MIN);
tp = parse_peak(track_peak); tp = parse_value(track_peak, 0);
ap = parse_peak(album_peak); ap = parse_value(album_peak, 0);
if (tg == INT32_MIN && ag == INT32_MIN) if (tg == INT32_MIN && ag == INT32_MIN)
return 0; return 0;

4
libavutil/replaygain.h
View File

@ -34,8 +34,8 @@ typedef struct AVReplayGain {
*/ */
int32_t track_gain; int32_t track_gain;
/** /**
* Peak track amplitude, with UINT32_MAX representing full scale. 0 when * Peak track amplitude, with 100000 representing full scale (but values
* unknown. * may overflow). 0 when unknown.
*/ */
uint32_t track_peak; uint32_t track_peak;
/** /**

2
libavutil/version.h
View File

@ -56,7 +56,7 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MAJOR 52
#define LIBAVUTIL_VERSION_MINOR 73 #define LIBAVUTIL_VERSION_MINOR 74
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \