Try to open decoders in av_find_stream_info() even if no packets for the

[ffmpeg] / libavformat / 4xm.c

diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index 8d2fbe36d80201de9363c675d820ca98bd48d13d..631f8216a55157d8ce19fa3bed46221355e0e98a 100644 (file)
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file 4xm.c
+ * @file libavformat/4xm.c
  * 4X Technologies file demuxer
  * by Mike Melanson (melanson@pcisys.net)
  * for more information on the .4xm file format, visit:
@@ -66,6 +66,7 @@ typedef struct AudioTrack {
     int channels;
     int stream_index;
     int adpcm;
+    int64_t audio_pts;
 } AudioTrack;
 
 typedef struct FourxmDemuxContext {
@@ -74,9 +75,7 @@ typedef struct FourxmDemuxContext {
     int video_stream_index;
     int track_count;
     AudioTrack *tracks;
-    int selected_track;
 
-    int64_t audio_pts;
     int64_t video_pts;
     float fps;
 } FourxmDemuxContext;
@@ -100,12 +99,10 @@ static int fourxm_read_header(AVFormatContext *s,
     FourxmDemuxContext *fourxm = s->priv_data;
     unsigned char *header;
     int i, ret;
-    int current_track = -1;
     AVStream *st;
 
     fourxm->track_count = 0;
     fourxm->tracks = NULL;
-    fourxm->selected_track = 0;
     fourxm->fps = 1.0;
 
     /* skip the first 3 32-bit numbers */
@@ -162,18 +159,20 @@ static int fourxm_read_header(AVFormatContext *s,
 
             i += 8 + size;
         } else if (fourcc_tag == strk_TAG) {
+            int current_track;
             /* check that there is enough data */
             if (size != strk_SIZE) {
                 ret= AVERROR_INVALIDDATA;
                 goto fail;
             }
             current_track = AV_RL32(&header[i + 8]);
+            if((unsigned)current_track >= UINT_MAX / sizeof(AudioTrack) - 1){
+                av_log(s, AV_LOG_ERROR, "current_track too large\n");
+                ret= -1;
+                goto fail;
+            }
             if (current_track + 1 > fourxm->track_count) {
                 fourxm->track_count = current_track + 1;
-                if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack)){
-                    ret= -1;
-                    goto fail;
-                }
                 fourxm->tracks = av_realloc(fourxm->tracks,
                     fourxm->track_count * sizeof(AudioTrack));
                 if (!fourxm->tracks) {
@@ -185,6 +184,7 @@ static int fourxm_read_header(AVFormatContext *s,
             fourxm->tracks[current_track].channels    = AV_RL32(&header[i + 36]);
             fourxm->tracks[current_track].sample_rate = AV_RL32(&header[i + 40]);
             fourxm->tracks[current_track].bits        = AV_RL32(&header[i + 44]);
+            fourxm->tracks[current_track].audio_pts   = 0;
             i += 8 + size;
 
             /* allocate a new AVStream */
@@ -206,11 +206,11 @@ static int fourxm_read_header(AVFormatContext *s,
             st->codec->bit_rate              = st->codec->channels * st->codec->sample_rate *
                 st->codec->bits_per_coded_sample;
             st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
-            if (fourxm->tracks[current_track].adpcm)
+            if (fourxm->tracks[current_track].adpcm){
                 st->codec->codec_id = CODEC_ID_ADPCM_4XM;
-            else if (st->codec->bits_per_coded_sample == 8)
+            }else if (st->codec->bits_per_coded_sample == 8){
                 st->codec->codec_id = CODEC_ID_PCM_U8;
-            else
+            }else
                 st->codec->codec_id = CODEC_ID_PCM_S16LE;
         }
     }
@@ -225,7 +225,6 @@ static int fourxm_read_header(AVFormatContext *s,
     av_free(header);
     /* initialize context members */
     fourxm->video_pts = -1;  /* first frame will push to 0 */
-    fourxm->audio_pts = 0;
 
     return 0;
 fail:
@@ -242,7 +241,7 @@ static int fourxm_read_packet(AVFormatContext *s,
     unsigned int fourcc_tag;
     unsigned int size, out_size;
     int ret = 0;
-    int track_number;
+    unsigned int track_number;
     int packet_read = 0;
     unsigned char header[8];
     int audio_frame_count;
@@ -271,8 +270,6 @@ static int fourxm_read_packet(AVFormatContext *s,
         case ifr2_TAG:
         case pfr2_TAG:
         case cfr2_TAG:
-        {
-
             /* allocate 8 more bytes than 'size' to account for fourcc
              * and size */
             if (size + 8 < size || av_new_packet(pkt, size + 8))
@@ -283,40 +280,39 @@ static int fourxm_read_packet(AVFormatContext *s,
             memcpy(pkt->data, header, 8);
             ret = get_buffer(s->pb, &pkt->data[8], size);
 
-            if (ret < 0)
+            if (ret < 0){
                 av_free_packet(pkt);
-            else
+            }else
                 packet_read = 1;
             break;
-        }
 
         case snd__TAG:
             track_number = get_le32(pb);
             out_size= get_le32(pb);
             size-=8;
 
-            if (track_number == fourxm->selected_track) {
+            if (track_number < fourxm->track_count) {
                 ret= av_get_packet(s->pb, pkt, size);
                 if(ret<0)
                     return AVERROR(EIO);
                 pkt->stream_index =
-                    fourxm->tracks[fourxm->selected_track].stream_index;
-                pkt->pts = fourxm->audio_pts;
+                    fourxm->tracks[track_number].stream_index;
+                pkt->pts = fourxm->tracks[track_number].audio_pts;
                 packet_read = 1;
 
                 /* pts accounting */
                 audio_frame_count = size;
-                if (fourxm->tracks[fourxm->selected_track].adpcm)
+                if (fourxm->tracks[track_number].adpcm)
                     audio_frame_count -=
-                        2 * (fourxm->tracks[fourxm->selected_track].channels);
+                        2 * (fourxm->tracks[track_number].channels);
                 audio_frame_count /=
-                      fourxm->tracks[fourxm->selected_track].channels;
-                if (fourxm->tracks[fourxm->selected_track].adpcm)
+                      fourxm->tracks[track_number].channels;
+                if (fourxm->tracks[track_number].adpcm){
                     audio_frame_count *= 2;
-                else
+                }else
                     audio_frame_count /=
-                    (fourxm->tracks[fourxm->selected_track].bits / 8);
-                fourxm->audio_pts += audio_frame_count;
+                    (fourxm->tracks[track_number].bits / 8);
+                fourxm->tracks[track_number].audio_pts += audio_frame_count;
 
             } else {
                 url_fseek(pb, size, SEEK_CUR);
@@ -335,7 +331,7 @@ static int fourxm_read_close(AVFormatContext *s)
 {
     FourxmDemuxContext *fourxm = s->priv_data;
 
-    av_free(fourxm->tracks);
+    av_freep(&fourxm->tracks);
 
     return 0;
 }