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

[ffmpeg] / libavformat / sierravmd.c

diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c
index bc69c0ecd1237b95e0980517c953dc33400fc0e2..fdf5b5ea2a8c770fe4affb3732eddeb0c0c80159 100644 (file)
--- a/libavformat/sierravmd.c
+++ b/libavformat/sierravmd.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
  */
 
 /**
@@ -137,7 +137,7 @@ static int vmd_read_header(AVFormatContext *s,
     st->codec->width = LE_16(&vmd->vmd_header[12]);
     st->codec->height = LE_16(&vmd->vmd_header[14]);
     st->codec->extradata_size = VMD_HEADER_SIZE;
-    st->codec->extradata = av_malloc(VMD_HEADER_SIZE);
+    st->codec->extradata = av_mallocz(VMD_HEADER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
     memcpy(st->codec->extradata, vmd->vmd_header, VMD_HEADER_SIZE);
 
     /* if sample rate is 0, assume no audio */
@@ -153,7 +153,7 @@ static int vmd_read_header(AVFormatContext *s,
         st->codec->codec_tag = 0;  /* no codec tag */
         st->codec->channels = (vmd->vmd_header[811] & 0x80) ? 2 : 1;
         st->codec->sample_rate = vmd->sample_rate;
-        st->codec->block_align = vmd->audio_block_align = 
+        st->codec->block_align = vmd->audio_block_align =
             LE_16(&vmd->vmd_header[806]);
         if (st->codec->block_align & 0x8000) {
             st->codec->bits_per_sample = 16;
@@ -161,11 +161,11 @@ static int vmd_read_header(AVFormatContext *s,
         } else
             st->codec->bits_per_sample = 16;
 //            st->codec->bits_per_sample = 8;
-        st->codec->bit_rate = st->codec->sample_rate * 
+        st->codec->bit_rate = st->codec->sample_rate *
             st->codec->bits_per_sample * st->codec->channels;
 
         /* for calculating pts */
-        vmd->audio_frame_divisor = st->codec->bits_per_sample / 8 / 
+        vmd->audio_frame_divisor = st->codec->bits_per_sample / 8 /
             st->codec->channels;
 
         video_pts_inc = 90000;
@@ -176,8 +176,8 @@ static int vmd_read_header(AVFormatContext *s,
         video_pts_inc = 90000 / 10;
     }
 
-    /* skip over the offset table and load the table of contents; don't 
-     * care about the offset table since demuxer will calculate those 
+    /* skip over the offset table and load the table of contents; don't
+     * care about the offset table since demuxer will calculate those
      * independently */
     toc_offset = LE_32(&vmd->vmd_header[812]);
     vmd->frame_count = LE_16(&vmd->vmd_header[6]);
@@ -186,7 +186,7 @@ static int vmd_read_header(AVFormatContext *s,
     /* each on-disk VMD frame has an audio part and a video part; demuxer
      * accounts them separately */
     if(vmd->sample_rate)
-       vmd->frame_count *= 2;
+        vmd->frame_count *= 2;
     raw_frame_table = NULL;
     vmd->frame_table = NULL;
     raw_frame_table_size = vmd->frame_count * BYTES_PER_FRAME_RECORD;
@@ -197,7 +197,7 @@ static int vmd_read_header(AVFormatContext *s,
         av_free(vmd->frame_table);
         return AVERROR_NOMEM;
     }
-    if (get_buffer(pb, raw_frame_table, raw_frame_table_size) != 
+    if (get_buffer(pb, raw_frame_table, raw_frame_table_size) !=
         raw_frame_table_size) {
         av_free(raw_frame_table);
         av_free(vmd->frame_table);
@@ -213,7 +213,7 @@ static int vmd_read_header(AVFormatContext *s,
         /* if the frame size is 0, do not count the frame and bring the
          * total frame count down */
         // note, we limit the size to 1Gb to ensure that we dont end up overflowing the size integer used to allocate the memory
-        vmd->frame_table[i].frame_size = LE_32(&current_frame_record[2]) & 0x3FFFFFFF; 
+        vmd->frame_table[i].frame_size = LE_32(&current_frame_record[2]) & 0x3FFFFFFF;
 
         /* this logic is present so that 0-length audio chunks are not
          * accounted */
@@ -271,7 +271,7 @@ static int vmd_read_packet(AVFormatContext *s,
         return AVERROR_NOMEM;
     pkt->pos= url_ftell(pb);
     memcpy(pkt->data, frame->frame_record, BYTES_PER_FRAME_RECORD);
-    ret = get_buffer(pb, pkt->data + BYTES_PER_FRAME_RECORD, 
+    ret = get_buffer(pb, pkt->data + BYTES_PER_FRAME_RECORD,
         frame->frame_size);
 
     if (ret != frame->frame_size) {