dmb1 fourcc, mjpeg_opendml.mov

[ffmpeg] / libavformat / wav.c

diff --git a/libavformat/wav.c b/libavformat/wav.c
index 7fb98234982950f50bddc29313349de111c6bc07..a6db698aa53dcbe12ed225efb8fc3c394b8a025e 100644 (file)
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -25,6 +25,9 @@
 typedef struct {
     offset_t data;
     offset_t data_end;
+    int64_t minpts;
+    int64_t maxpts;
+    int last_duration;
 } WAVContext;
 
 #ifdef CONFIG_MUXERS
@@ -32,7 +35,7 @@ static int wav_write_header(AVFormatContext *s)
 {
     WAVContext *wav = s->priv_data;
     ByteIOContext *pb = &s->pb;
-    offset_t fmt;
+    offset_t fmt, fact;
 
     put_tag(pb, "RIFF");
     put_le32(pb, 0); /* file length */
@@ -46,7 +49,16 @@ static int wav_write_header(AVFormatContext *s)
     }
     end_tag(pb, fmt);
 
+    if(s->streams[0]->codec->codec_tag != 0x01 /* hence for all other than PCM */
+       && !url_is_streamed(&s->pb)) {
+        fact = start_tag(pb, "fact");
+        put_le32(pb, 0);
+        end_tag(pb, fact);
+    }
+
     av_set_pts_info(s->streams[0], 64, 1, s->streams[0]->codec->sample_rate);
+    wav->maxpts = wav->last_duration = 0;
+    wav->minpts = INT64_MAX;
 
     /* data header */
     wav->data = start_tag(pb, "data");
@@ -59,7 +71,14 @@ static int wav_write_header(AVFormatContext *s)
 static int wav_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
     ByteIOContext *pb = &s->pb;
+    WAVContext *wav = s->priv_data;
     put_buffer(pb, pkt->data, pkt->size);
+    if(pkt->pts != AV_NOPTS_VALUE) {
+        wav->minpts = FFMIN(wav->minpts, pkt->pts);
+        wav->maxpts = FFMAX(wav->maxpts, pkt->pts);
+        wav->last_duration = pkt->duration;
+    } else
+        av_log(s, AV_LOG_ERROR, "wav_write_packet: NOPTS\n");
     return 0;
 }
 
@@ -79,6 +98,18 @@ static int wav_write_trailer(AVFormatContext *s)
         url_fseek(pb, file_size, SEEK_SET);
 
         put_flush_packet(pb);
+
+        if(s->streams[0]->codec->codec_tag != 0x01) {
+            /* Update num_samps in fact chunk */
+            int number_of_samples;
+            number_of_samples = av_rescale(wav->maxpts - wav->minpts + wav->last_duration,
+                                           s->streams[0]->codec->sample_rate * (int64_t)s->streams[0]->time_base.num,
+                                           s->streams[0]->time_base.den);
+            url_fseek(pb, wav->data-12, SEEK_SET);
+            put_le32(pb, number_of_samples);
+            url_fseek(pb, file_size, SEEK_SET);
+            put_flush_packet(pb);
+        }
     }
     return 0;
 }
@@ -148,7 +179,7 @@ static int wav_read_header(AVFormatContext *s,
         return AVERROR_NOMEM;
 
     get_wav_header(pb, st->codec, size);
-    st->need_parsing = 1;
+    st->need_parsing = AVSTREAM_PARSE_FULL;
 
     av_set_pts_info(st, 64, 1, st->codec->sample_rate);
 
@@ -188,13 +219,11 @@ static int wav_read_packet(AVFormatContext *s,
         size = (size / st->codec->block_align) * st->codec->block_align;
     }
     size= FFMIN(size, left);
-    if (av_new_packet(pkt, size))
+    ret= av_get_packet(&s->pb, pkt, size);
+    if (ret <= 0)
         return AVERROR_IO;
     pkt->stream_index = 0;
 
-    ret = get_buffer(&s->pb, pkt->data, pkt->size);
-    if (ret < 0)
-        av_free_packet(pkt);
     /* note: we need to modify the packet size here to handle the last
        packet */
     pkt->size = ret;
@@ -235,6 +264,8 @@ AVInputFormat wav_demuxer = {
     wav_read_packet,
     wav_read_close,
     wav_read_seek,
+    .flags= AVFMT_GENERIC_INDEX,
+    .codec_tag= (const AVCodecTag*[]){codec_wav_tags, 0},
 };
 #endif
 #ifdef CONFIG_WAV_MUXER
@@ -249,5 +280,6 @@ AVOutputFormat wav_muxer = {
     wav_write_header,
     wav_write_packet,
     wav_write_trailer,
+    .codec_tag= (const AVCodecTag*[]){codec_wav_tags, 0},
 };
 #endif