#include just the required stdint.h instead of libavutil/common.h.

[ffmpeg] / libavformat / tta.c

diff --git a/libavformat/tta.c b/libavformat/tta.c
index 3168a071b1e17cca98cafa0f08fcbc5eb188bc40..da6c04e70391724a85394c49360b8ae555423e88 100644 (file)
--- a/libavformat/tta.c
+++ b/libavformat/tta.c
@@ -16,10 +16,11 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/get_bits.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 typedef struct {
     int totalframes, currentframe;
@@ -40,25 +41,25 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap)
     int i, channels, bps, samplerate, datalen, framelen;
     uint64_t framepos;
 
-    if (get_le32(&s->pb) != ff_get_fourcc("TTA1"))
+    if (get_le32(s->pb) != AV_RL32("TTA1"))
         return -1; // not tta file
 
-    url_fskip(&s->pb, 2); // FIXME: flags
-    channels = get_le16(&s->pb);
-    bps = get_le16(&s->pb);
-    samplerate = get_le32(&s->pb);
+    url_fskip(s->pb, 2); // FIXME: flags
+    channels = get_le16(s->pb);
+    bps = get_le16(s->pb);
+    samplerate = get_le32(s->pb);
     if(samplerate <= 0 || samplerate > 1000000){
         av_log(s, AV_LOG_ERROR, "nonsense samplerate\n");
         return -1;
     }
 
-    datalen = get_le32(&s->pb);
+    datalen = get_le32(s->pb);
     if(datalen < 0){
         av_log(s, AV_LOG_ERROR, "nonsense datalen\n");
         return -1;
     }
 
-    url_fskip(&s->pb, 4); // header crc
+    url_fskip(s->pb, 4); // header crc
 
     framelen = samplerate*256/245;
     c->totalframes = datalen / framelen + ((datalen % framelen) ? 1 : 0);
@@ -71,36 +72,36 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     st = av_new_stream(s, 0);
     if (!st)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
 
     av_set_pts_info(st, 64, 1, samplerate);
     st->start_time = 0;
     st->duration = datalen;
 
-    framepos = url_ftell(&s->pb) + 4*c->totalframes + 4;
+    framepos = url_ftell(s->pb) + 4*c->totalframes + 4;
 
     for (i = 0; i < c->totalframes; i++) {
-        uint32_t size = get_le32(&s->pb);
+        uint32_t size = get_le32(s->pb);
         av_add_index_entry(st, framepos, i*framelen, size, 0, AVINDEX_KEYFRAME);
         framepos += size;
     }
-    url_fskip(&s->pb, 4); // seektable crc
+    url_fskip(s->pb, 4); // seektable crc
 
     st->codec->codec_type = CODEC_TYPE_AUDIO;
     st->codec->codec_id = CODEC_ID_TTA;
     st->codec->channels = channels;
     st->codec->sample_rate = samplerate;
-    st->codec->bits_per_sample = bps;
+    st->codec->bits_per_coded_sample = bps;
 
-    st->codec->extradata_size = url_ftell(&s->pb);
+    st->codec->extradata_size = url_ftell(s->pb);
     if(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)st->codec->extradata_size){
         //this check is redundant as get_buffer should fail
         av_log(s, AV_LOG_ERROR, "extradata_size too large\n");
         return -1;
     }
     st->codec->extradata = av_mallocz(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE);
-    url_fseek(&s->pb, 0, SEEK_SET);
-    get_buffer(&s->pb, st->codec->extradata, st->codec->extradata_size);
+    url_fseek(s->pb, 0, SEEK_SET);
+    get_buffer(s->pb, st->codec->extradata, st->codec->extradata_size);
 
     return 0;
 }
@@ -109,24 +110,41 @@ static int tta_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     TTAContext *c = s->priv_data;
     AVStream *st = s->streams[0];
-    int size;
+    int size, ret;
 
     // FIXME!
     if (c->currentframe > c->totalframes)
         return -1;
 
-    size = st->index_entries[c->currentframe++].size;
+    size = st->index_entries[c->currentframe].size;
+
+    ret = av_get_packet(s->pb, pkt, size);
+    pkt->dts = st->index_entries[c->currentframe++].timestamp;
+    return ret;
+}
 
-    return av_get_packet(&s->pb, pkt, size);
+static int tta_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
+{
+    TTAContext *c = s->priv_data;
+    AVStream *st = s->streams[stream_index];
+    int index = av_index_search_timestamp(st, timestamp, flags);
+    if (index < 0)
+        return -1;
+
+    c->currentframe = index;
+    url_fseek(s->pb, st->index_entries[index].pos, SEEK_SET);
+
+    return 0;
 }
 
 AVInputFormat tta_demuxer = {
     "tta",
-    "true-audio",
+    NULL_IF_CONFIG_SMALL("True Audio"),
     sizeof(TTAContext),
     tta_probe,
     tta_read_header,
     tta_read_packet,
     NULL,
+    tta_read_seek,
     .extensions = "tta",
 };