Use the correct ByteIOContext in extradata parsing.Fixes half of issue

[ffmpeg] / libavformat / oma.c

diff --git a/libavformat/oma.c b/libavformat/oma.c
index dcfa1d06b8cf0ef5103fa476ceb078effddb5713..cc512cae7648ca548ab68088038d835c6b90474a 100644 (file)
--- a/libavformat/oma.c
+++ b/libavformat/oma.c
@@ -22,7 +22,7 @@
  */
 
 /**
- * @file oma.c
+ * @file libavformat/oma.c
  * This is a demuxer for Sony OpenMG Music files
  *
  * Known file extensions: ".oma", "aa3"
@@ -52,18 +52,22 @@
 enum {
     OMA_CODECID_ATRAC3  = 0,
     OMA_CODECID_ATRAC3P = 1,
+    OMA_CODECID_MP3     = 3,
+    OMA_CODECID_LPCM    = 4,
+    OMA_CODECID_WMA     = 5,
 };
 
 static const AVCodecTag codec_oma_tags[] = {
     { CODEC_ID_ATRAC3,  OMA_CODECID_ATRAC3 },
     { CODEC_ID_ATRAC3P, OMA_CODECID_ATRAC3P },
+    { CODEC_ID_MP3,     OMA_CODECID_MP3 },
 };
 
 static int oma_read_header(AVFormatContext *s,
                            AVFormatParameters *ap)
 {
     static const uint16_t srate_tab[6] = {320,441,480,882,960,0};
-    int     ret, ea3_taglen, EA3_pos, framesize, jsflag, samplerate, channel_id;
+    int     ret, ea3_taglen, EA3_pos, framesize, jsflag, samplerate;
     uint32_t codec_params;
     int16_t eid;
     uint8_t buf[EA3_HEADER_SIZE];
@@ -85,7 +89,7 @@ static int oma_read_header(AVFormatContext *s,
     if (ret != EA3_HEADER_SIZE)
         return -1;
 
-    if (memcmp(buf, (uint8_t[]){'E', 'A', '3'},3) || buf[4] != 0 || buf[5] != EA3_HEADER_SIZE) {
+    if (memcmp(buf, ((const uint8_t[]){'E', 'A', '3'}),3) || buf[4] != 0 || buf[5] != EA3_HEADER_SIZE) {
         av_log(s, AV_LOG_ERROR, "Couldn't find the EA3 header !\n");
         return -1;
     }
@@ -97,21 +101,27 @@ static int oma_read_header(AVFormatContext *s,
     }
 
     codec_params = AV_RB24(&buf[33]);
-    channel_id = (codec_params >> 10) & 7;
-    samplerate = srate_tab[(codec_params >> 13) & 7]*100;
 
     st = av_new_stream(s, 0);
     if (!st)
         return AVERROR(ENOMEM);
 
+    st->start_time = 0;
+    st->codec->codec_type  = CODEC_TYPE_AUDIO;
+    st->codec->codec_tag   = buf[32];
+    st->codec->codec_id    = ff_codec_get_id(codec_oma_tags, st->codec->codec_tag);
+
     switch (buf[32]) {
         case OMA_CODECID_ATRAC3:
+            samplerate = srate_tab[(codec_params >> 13) & 7]*100;
             if (samplerate != 44100)
                 av_log(s, AV_LOG_ERROR, "Unsupported sample rate, send sample file to developers: %d\n", samplerate);
 
             framesize = (codec_params & 0x3FF) * 8;
             jsflag = (codec_params >> 17) & 1; /* get stereo coding mode, 1 for joint-stereo */
-            channel_id = 2;
+            st->codec->channels    = 2;
+            st->codec->sample_rate = samplerate;
+            st->codec->bit_rate    = st->codec->sample_rate * framesize * 8 / 1024;
 
             /* fake the atrac3 extradata (wav format, makes stream copy to wav work) */
             st->codec->extradata_size = 14;
@@ -126,28 +136,28 @@ static int oma_read_header(AVFormatContext *s,
             AV_WL16(&edata[8],  jsflag);        // coding mode
             AV_WL16(&edata[10], 1);             // always 1
             // AV_WL16(&edata[12], 0);          // always 0
+
+            av_set_pts_info(st, 64, 1, st->codec->sample_rate);
             break;
         case OMA_CODECID_ATRAC3P:
+            st->codec->channels = (codec_params >> 10) & 7;
             framesize = ((codec_params & 0x3FF) * 8) + 8;
+            st->codec->sample_rate = srate_tab[(codec_params >> 13) & 7]*100;
+            st->codec->bit_rate    = st->codec->sample_rate * framesize * 8 / 1024;
+            av_set_pts_info(st, 64, 1, st->codec->sample_rate);
             av_log(s, AV_LOG_ERROR, "Unsupported codec ATRAC3+!\n");
             break;
+        case OMA_CODECID_MP3:
+            st->need_parsing = AVSTREAM_PARSE_FULL;
+            framesize = 1024;
+            break;
         default:
             av_log(s, AV_LOG_ERROR, "Unsupported codec %d!\n",buf[32]);
             return -1;
             break;
     }
 
-    st->codec->codec_type  = CODEC_TYPE_AUDIO;
-    st->codec->codec_tag   = buf[32];
-    st->codec->codec_id    = codec_get_id(codec_oma_tags, st->codec->codec_tag);
-    st->codec->channels    = channel_id;
-    st->codec->sample_rate = samplerate;
-    st->codec->bit_rate    = samplerate * framesize * 8 / 1024;
     st->codec->block_align = framesize;
-
-    st->start_time = 0;
-    av_set_pts_info(st, 64, 1, st->codec->sample_rate);
-
     url_fseek(s->pb, EA3_pos + EA3_HEADER_SIZE, SEEK_SET);
 
     return 0;
@@ -167,7 +177,7 @@ static int oma_read_packet(AVFormatContext *s, AVPacket *pkt)
 
 static int oma_read_probe(AVProbeData *p)
 {
-    if (!memcmp(p->buf, (uint8_t[]){'e', 'a', '3', 3, 0},5))
+    if (!memcmp(p->buf, ((const uint8_t[]){'e', 'a', '3', 3, 0}),5))
         return AVPROBE_SCORE_MAX;
     else
         return 0;
@@ -185,6 +195,6 @@ AVInputFormat oma_demuxer = {
     pcm_read_seek,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "oma,aa3",
-    .codec_tag= (const AVCodecTag*[]){codec_oma_tags, 0},
+    .codec_tag= (const AVCodecTag* const []){codec_oma_tags, 0},
 };