tta decoder, tested with 44khz mono and stereo (for the latter use ffplay or change...

[ffmpeg] / libavformat / 4xm.c

diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index 7c0f78e6b9b1a06995788b379f0e2252ded2ea87..c0df50f85e7a9439f058661233ab16e3162db819 100644 (file)
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
@@ -75,26 +75,6 @@ typedef struct FourxmDemuxContext {
     float fps;
 } FourxmDemuxContext;
 
-static float get_le_float(unsigned char *buffer)
-{
-    float f;
-    unsigned char *float_buffer = (unsigned char *)&f;
-
-#ifdef WORDS_BIGENDIAN
-    float_buffer[0] = buffer[3];
-    float_buffer[1] = buffer[2];
-    float_buffer[2] = buffer[1];
-    float_buffer[3] = buffer[0];
-#else
-    float_buffer[0] = buffer[0];
-    float_buffer[1] = buffer[1];
-    float_buffer[2] = buffer[2];
-    float_buffer[3] = buffer[3];
-#endif
-
-    return f;
-}
-
 static int fourxm_probe(AVProbeData *p)
 {
     if (p->buf_size < 12)
@@ -147,7 +127,7 @@ static int fourxm_read_header(AVFormatContext *s,
         size = LE_32(&header[i + 4]);
 
         if (fourcc_tag == std__TAG) {
-            fourxm->fps = get_le_float(&header[i + 12]);
+            fourxm->fps = av_int2flt(LE_32(&header[i + 12]));
         } else if (fourcc_tag == vtrk_TAG) {
             /* check that there is enough data */
             if (size != vtrk_SIZE) {
@@ -166,11 +146,11 @@ static int fourxm_read_header(AVFormatContext *s,
 
             fourxm->video_stream_index = st->index;
 
-            st->codec.codec_type = CODEC_TYPE_VIDEO;
-            st->codec.codec_id = CODEC_ID_4XM;
-            st->codec.codec_tag = 0;  /* no fourcc */
-            st->codec.width = fourxm->width;
-            st->codec.height = fourxm->height;
+            st->codec->codec_type = CODEC_TYPE_VIDEO;
+            st->codec->codec_id = CODEC_ID_4XM;
+            st->codec->codec_tag = 0;  /* no fourcc */
+            st->codec->width = fourxm->width;
+            st->codec->height = fourxm->height;
 
         } else if (fourcc_tag == strk_TAG) {
             /* check that there is enough data */
@@ -183,7 +163,7 @@ static int fourxm_read_header(AVFormatContext *s,
                 fourxm->track_count = current_track + 1;
                 if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack))
                     return -1;
-                fourxm->tracks = av_realloc(fourxm->tracks, 
+                fourxm->tracks = av_realloc(fourxm->tracks,
                     fourxm->track_count * sizeof(AudioTrack));
                 if (!fourxm->tracks) {
                     av_free(header);
@@ -205,20 +185,20 @@ static int fourxm_read_header(AVFormatContext *s,
 
             fourxm->tracks[current_track].stream_index = st->index;
 
-            st->codec.codec_type = CODEC_TYPE_AUDIO;
-            st->codec.codec_tag = 1;
-            st->codec.channels = fourxm->tracks[current_track].channels;
-            st->codec.sample_rate = fourxm->tracks[current_track].sample_rate;
-            st->codec.bits_per_sample = fourxm->tracks[current_track].bits;
-            st->codec.bit_rate = st->codec.channels * st->codec.sample_rate *
-                st->codec.bits_per_sample;
-            st->codec.block_align = st->codec.channels * st->codec.bits_per_sample;
+            st->codec->codec_type = CODEC_TYPE_AUDIO;
+            st->codec->codec_tag = 1;
+            st->codec->channels = fourxm->tracks[current_track].channels;
+            st->codec->sample_rate = fourxm->tracks[current_track].sample_rate;
+            st->codec->bits_per_sample = fourxm->tracks[current_track].bits;
+            st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
+                st->codec->bits_per_sample;
+            st->codec->block_align = st->codec->channels * st->codec->bits_per_sample;
             if (fourxm->tracks[current_track].adpcm)
-                st->codec.codec_id = CODEC_ID_ADPCM_4XM;
-            else if (st->codec.bits_per_sample == 8)
-                st->codec.codec_id = CODEC_ID_PCM_U8;
+                st->codec->codec_id = CODEC_ID_ADPCM_4XM;
+            else if (st->codec->bits_per_sample == 8)
+                st->codec->codec_id = CODEC_ID_PCM_U8;
             else
-                st->codec.codec_id = CODEC_ID_PCM_S16LE;
+                st->codec->codec_id = CODEC_ID_PCM_S16LE;
         }
     }
 
@@ -297,7 +277,7 @@ static int fourxm_read_packet(AVFormatContext *s,
                 ret= av_get_packet(&s->pb, pkt, size);
                 if(ret<0)
                     return AVERROR_IO;
-                pkt->stream_index = 
+                pkt->stream_index =
                     fourxm->tracks[fourxm->selected_track].stream_index;
                 pkt->pts = fourxm->audio_pts;
                 packet_read = 1;
@@ -305,13 +285,13 @@ static int fourxm_read_packet(AVFormatContext *s,
                 /* pts accounting */
                 audio_frame_count = size;
                 if (fourxm->tracks[fourxm->selected_track].adpcm)
-                    audio_frame_count -= 
+                    audio_frame_count -=
                         2 * (fourxm->tracks[fourxm->selected_track].channels);
                 audio_frame_count /=
                       fourxm->tracks[fourxm->selected_track].channels;
                 if (fourxm->tracks[fourxm->selected_track].adpcm)
                     audio_frame_count *= 2;
-                else 
+                else
                     audio_frame_count /=
                     (fourxm->tracks[fourxm->selected_track].bits / 8);
                 fourxm->audio_pts += audio_frame_count;