crypto: consistently use size_t as type for length parameters

[ffmpeg] / libavformat / replaygain.c

diff --git a/libavformat/replaygain.c b/libavformat/replaygain.c
index 6983601491dc4c67e50f130212d8da8a98261529..3188b1503b28ef3cc1471bd7e94c4cb8890f6841 100644 (file)
--- a/libavformat/replaygain.c
+++ b/libavformat/replaygain.c
@@ -33,9 +33,10 @@
 #include "libavutil/replaygain.h"
 
 #include "avformat.h"
+#include "internal.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;
     int  scale = 10000;
@@ -43,15 +44,15 @@ static int32_t parse_gain(const char *gain)
     int sign   = 1;
     int db;
 
-    if (!gain)
-        return INT32_MIN;
+    if (!value)
+        return min;
 
-    gain += strspn(gain, " \t");
+    value += strspn(value, " \t");
 
-    if (*gain == '-')
+    if (*value == '-')
         sign = -1;
 
-    db = strtol(gain, &fraction, 0);
+    db = strtol(value, &fraction, 0);
     if (*fraction++ == '.') {
         while (av_isdigit(*fraction) && scale) {
             mb += scale * (*fraction - '0');
@@ -61,78 +62,24 @@ static int32_t parse_gain(const char *gain)
     }
 
     if (abs(db) > (INT32_MAX - mb) / 100000)
-        return INT32_MIN;
+        return min;
 
     return db * 100000 + sign * mb;
 }
 
-static uint32_t parse_peak(const uint8_t *peak)
+int ff_replaygain_export_raw(AVStream *st, int32_t tg, uint32_t tp,
+                             int32_t ag, uint32_t ap)
 {
-    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,
-                             const uint8_t *track_gain, const uint8_t *track_peak,
-                             const uint8_t *album_gain, const uint8_t *album_peak)
-{
-    AVPacketSideData *sd, *tmp;
     AVReplayGain *replaygain;
-    uint8_t *data;
-    int32_t tg, ag;
-    uint32_t tp, ap;
-
-    tg = parse_gain(track_gain);
-    ag = parse_gain(album_gain);
-    tp = parse_peak(track_peak);
-    ap = parse_peak(album_peak);
 
     if (tg == INT32_MIN && ag == INT32_MIN)
         return 0;
 
-    replaygain = av_mallocz(sizeof(*replaygain));
+    replaygain = (AVReplayGain*)av_stream_new_side_data(st, AV_PKT_DATA_REPLAYGAIN,
+                                                        sizeof(*replaygain));
     if (!replaygain)
         return AVERROR(ENOMEM);
 
-    tmp = av_realloc_array(st->side_data, st->nb_side_data + 1, sizeof(*tmp));
-    if (!tmp) {
-        av_freep(&replaygain);
-        return AVERROR(ENOMEM);
-    }
-    st->side_data = tmp;
-    st->nb_side_data++;
-
-    sd = &st->side_data[st->nb_side_data - 1];
-    sd->type = AV_PKT_DATA_REPLAYGAIN;
-    sd->data = (uint8_t*)replaygain;
-    sd->size = sizeof(*replaygain);
-
     replaygain->track_gain = tg;
     replaygain->track_peak = tp;
     replaygain->album_gain = ag;
@@ -150,9 +97,9 @@ int ff_replaygain_export(AVStream *st, AVDictionary *metadata)
     ag = av_dict_get(metadata, "REPLAYGAIN_ALBUM_GAIN", NULL, 0);
     ap = av_dict_get(metadata, "REPLAYGAIN_ALBUM_PEAK", NULL, 0);
 
-    return replaygain_export(st,
-                             tg ? tg->value : NULL,
-                             tp ? tp->value : NULL,
-                             ag ? ag->value : NULL,
-                             ap ? ap->value : NULL);
+    return ff_replaygain_export_raw(st,
+                             parse_value(tg ? tg->value : NULL, INT32_MIN),
+                             parse_value(tp ? tp->value : NULL, 0),
+                             parse_value(ag ? ag->value : NULL, INT32_MIN),
+                             parse_value(ap ? ap->value : NULL, 0));
 }