[FFmpeg-cvslog] lavf/brstm: expose the loop point when present

[Rodger Combs]

ffmpeg | branch: master | Rodger Combs <rodger.combs at gmail.com> | Tue Jun 23 12:35:33 2015 -0500| [0643b4bf74a44c9e24cd75a2b99f9d1fd128e4f6] | committer: Michael Niedermayer

lavf/brstm: expose the loop point when present

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0643b4bf74a44c9e24cd75a2b99f9d1fd128e4f6
---

 libavformat/brstm.c |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/libavformat/brstm.c b/libavformat/brstm.c
index b6108e3..f5a4a82 100644
--- a/libavformat/brstm.c
+++ b/libavformat/brstm.c
@@ -93,6 +93,7 @@ static int read_header(AVFormatContext *s)
     uint32_t size, asize, start = 0;
     AVStream *st;
     int ret = AVERROR_EOF;
+    int loop = 0;
     int bfstm = !strcmp("bfstm", s->iformat->name);
 
     st = avformat_new_stream(s, NULL);
@@ -195,7 +196,7 @@ static int read_header(AVFormatContext *s)
         return AVERROR_PATCHWELCOME;
     }
 
-    avio_skip(s->pb, 1); // loop flag
+    loop = avio_r8(s->pb); // loop flag
     st->codec->codec_id = codec;
     st->codec->channels = avio_r8(s->pb);
     if (!st->codec->channels)
@@ -209,7 +210,17 @@ static int read_header(AVFormatContext *s)
 
     if (!bfstm)
         avio_skip(s->pb, 2); // padding
-    avio_skip(s->pb, 4); // loop start sample
+
+    if (loop) {
+        if (av_dict_set_int(&s->metadata, "loop_start",
+                            av_rescale(read32(s), AV_TIME_BASE,
+                                       st->codec->sample_rate),
+                            0) < 0)
+            return AVERROR(ENOMEM);
+    } else {
+        avio_skip(s->pb, 4);
+    }
+
     st->start_time = 0;
     st->duration = read32(s);
     avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);