avformat/http: return EINVAL if ff_http_do_new_request is called with non-http URLContext
[ffmpeg.git] / libavformat / bethsoftvid.c
index 10be7d2..f516806 100644 (file)
@@ -2,20 +2,20 @@
  * Bethsoft VID format Demuxer
  * Copyright (c) 2007 Nicholas Tung
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -27,6 +27,7 @@
  * @see http://www.svatopluk.com/andux/docs/dfvid.html
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "internal.h"
 
 #define BVID_PALETTE_SIZE 3 * 256
 
+#define DEFAULT_SAMPLE_RATE 11111
+
 typedef struct BVID_DemuxContext
 {
     int nframes;
+    int sample_rate;        /**< audio sample rate */
+    int width;              /**< video width       */
+    int height;             /**< video height      */
     /** delay value between frames, added to individual frame delay.
      * custom units, which will be added to other custom units (~=16ms according
      * to free, unofficial documentation) */
     int bethsoft_global_delay;
-
+    int video_index;        /**< video stream index */
+    int audio_index;        /**< audio stream index */
     uint8_t *palette;
 
     int is_finished;
@@ -50,10 +57,13 @@ typedef struct BVID_DemuxContext
 
 static int vid_probe(AVProbeData *p)
 {
-    // little endian VID tag, file starts with "VID\0"
+    // little-endian VID tag, file starts with "VID\0"
     if (AV_RL32(p->buf) != MKTAG('V', 'I', 'D', 0))
         return 0;
 
+    if (p->buf[4] != 2)
+        return AVPROBE_SCORE_MAX / 4;
+
     return AVPROBE_SCORE_MAX;
 }
 
@@ -61,7 +71,6 @@ static int vid_read_header(AVFormatContext *s)
 {
     BVID_DemuxContext *vid = s->priv_data;
     AVIOContext *pb = s->pb;
-    AVStream *stream;
 
     /* load main header. Contents:
     *    bytes: 'V' 'I' 'D'
@@ -69,45 +78,51 @@ static int vid_read_header(AVFormatContext *s)
     */
     avio_skip(pb, 5);
     vid->nframes = avio_rl16(pb);
-
-    stream = avformat_new_stream(s, NULL);
-    if (!stream)
-        return AVERROR(ENOMEM);
-    stream->start_time = 0;
-    avpriv_set_pts_info(stream, 32, 1, 60);     // 16 ms increments, i.e. 60 fps
-    stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    stream->codec->codec_id = CODEC_ID_BETHSOFTVID;
-    stream->codec->width = avio_rl16(pb);
-    stream->codec->height = avio_rl16(pb);
-    stream->codec->pix_fmt = PIX_FMT_PAL8;
+    vid->width   = avio_rl16(pb);
+    vid->height  = avio_rl16(pb);
     vid->bethsoft_global_delay = avio_rl16(pb);
     avio_rl16(pb);
 
-    // done with video codec, set up audio codec
-    stream = avformat_new_stream(s, NULL);
-    if (!stream)
-        return AVERROR(ENOMEM);
-    stream->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-    stream->codec->codec_id = CODEC_ID_PCM_U8;
-    stream->codec->channels = 1;
-    stream->codec->sample_rate = 11025;
-    stream->codec->bits_per_coded_sample = 8;
-    stream->codec->bit_rate = stream->codec->channels * stream->codec->sample_rate * stream->codec->bits_per_coded_sample;
+    // wait until the first packet to create each stream
+    vid->video_index = -1;
+    vid->audio_index = -1;
+    vid->sample_rate = DEFAULT_SAMPLE_RATE;
+    s->ctx_flags |= AVFMTCTX_NOHEADER;
 
     return 0;
 }
 
 #define BUFFER_PADDING_SIZE 1000
 static int read_frame(BVID_DemuxContext *vid, AVIOContext *pb, AVPacket *pkt,
-                      uint8_t block_type, AVFormatContext *s, int npixels)
+                      uint8_t block_type, AVFormatContext *s)
 {
     uint8_t * vidbuf_start = NULL;
     int vidbuf_nbytes = 0;
     int code;
     int bytes_copied = 0;
-    int position, duration;
+    int position, duration, npixels;
     unsigned int vidbuf_capacity;
     int ret = 0;
+    AVStream *st;
+
+    if (vid->video_index < 0) {
+        st = avformat_new_stream(s, NULL);
+        if (!st)
+            return AVERROR(ENOMEM);
+        vid->video_index = st->index;
+        if (vid->audio_index < 0) {
+            avpriv_request_sample(s, "Using default video time base since "
+                                  "having no audio packet before the first "
+                                  "video packet");
+        }
+        avpriv_set_pts_info(st, 64, 185, vid->sample_rate);
+        st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+        st->codecpar->codec_id   = AV_CODEC_ID_BETHSOFTVID;
+        st->codecpar->width      = vid->width;
+        st->codecpar->height     = vid->height;
+    }
+    st      = s->streams[vid->video_index];
+    npixels = st->codecpar->width * st->codecpar->height;
 
     vidbuf_start = av_malloc(vidbuf_capacity = BUFFER_PADDING_SIZE);
     if(!vidbuf_start)
@@ -165,10 +180,9 @@ static int read_frame(BVID_DemuxContext *vid, AVIOContext *pb, AVPacket *pkt,
     if ((ret = av_new_packet(pkt, vidbuf_nbytes)) < 0)
         goto fail;
     memcpy(pkt->data, vidbuf_start, vidbuf_nbytes);
-    av_free(vidbuf_start);
 
     pkt->pos = position;
-    pkt->stream_index = 0;  // use the video decoder, which was initialized as the first stream
+    pkt->stream_index = vid->video_index;
     pkt->duration = duration;
     if (block_type == VIDEO_I_FRAME)
         pkt->flags |= AV_PKT_FLAG_KEY;
@@ -177,12 +191,17 @@ static int read_frame(BVID_DemuxContext *vid, AVIOContext *pb, AVPacket *pkt,
     if (vid->palette) {
         uint8_t *pdata = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE,
                                                  BVID_PALETTE_SIZE);
+        if (!pdata) {
+            ret = AVERROR(ENOMEM);
+            av_log(s, AV_LOG_ERROR, "Failed to allocate palette side data\n");
+            goto fail;
+        }
         memcpy(pdata, vid->palette, BVID_PALETTE_SIZE);
+
         av_freep(&vid->palette);
     }
 
     vid->nframes--;  // used to check if all the frames were read
-    return 0;
 fail:
     av_free(vidbuf_start);
     return ret;
@@ -197,8 +216,8 @@ static int vid_read_packet(AVFormatContext *s,
     int audio_length;
     int ret_value;
 
-    if(vid->is_finished || pb->eof_reached)
-        return AVERROR(EIO);
+    if(vid->is_finished || avio_feof(pb))
+        return AVERROR_EOF;
 
     block_type = avio_r8(pb);
     switch(block_type){
@@ -219,9 +238,23 @@ static int vid_read_packet(AVFormatContext *s,
         case FIRST_AUDIO_BLOCK:
             avio_rl16(pb);
             // soundblaster DAC used for sample rate, as on specification page (link above)
-            s->streams[1]->codec->sample_rate = 1000000 / (256 - avio_r8(pb));
-            s->streams[1]->codec->bit_rate = s->streams[1]->codec->channels * s->streams[1]->codec->sample_rate * s->streams[1]->codec->bits_per_coded_sample;
+            vid->sample_rate = 1000000 / (256 - avio_r8(pb));
         case AUDIO_BLOCK:
+            if (vid->audio_index < 0) {
+                AVStream *st = avformat_new_stream(s, NULL);
+                if (!st)
+                    return AVERROR(ENOMEM);
+                vid->audio_index                 = st->index;
+                st->codecpar->codec_type            = AVMEDIA_TYPE_AUDIO;
+                st->codecpar->codec_id              = AV_CODEC_ID_PCM_U8;
+                st->codecpar->channels              = 1;
+                st->codecpar->channel_layout        = AV_CH_LAYOUT_MONO;
+                st->codecpar->bits_per_coded_sample = 8;
+                st->codecpar->sample_rate           = vid->sample_rate;
+                st->codecpar->bit_rate              = 8 * st->codecpar->sample_rate;
+                st->start_time                   = 0;
+                avpriv_set_pts_info(st, 64, 1, vid->sample_rate);
+            }
             audio_length = avio_rl16(pb);
             if ((ret_value = av_get_packet(pb, pkt, audio_length)) != audio_length) {
                 if (ret_value < 0)
@@ -229,15 +262,15 @@ static int vid_read_packet(AVFormatContext *s,
                 av_log(s, AV_LOG_ERROR, "incomplete audio block\n");
                 return AVERROR(EIO);
             }
-            pkt->stream_index = 1;
+            pkt->stream_index = vid->audio_index;
+            pkt->duration     = audio_length;
             pkt->flags |= AV_PKT_FLAG_KEY;
             return 0;
 
         case VIDEO_P_FRAME:
         case VIDEO_YOFF_P_FRAME:
         case VIDEO_I_FRAME:
-            return read_frame(vid, pb, pkt, block_type, s,
-                              s->streams[0]->codec->width * s->streams[0]->codec->height);
+            return read_frame(vid, pb, pkt, block_type, s);
 
         case EOF_BLOCK:
             if(vid->nframes != 0)
@@ -260,7 +293,7 @@ static int vid_read_close(AVFormatContext *s)
 
 AVInputFormat ff_bethsoftvid_demuxer = {
     .name           = "bethsoftvid",
-    .long_name      = NULL_IF_CONFIG_SMALL("Bethesda Softworks VID format"),
+    .long_name      = NULL_IF_CONFIG_SMALL("Bethesda Softworks VID"),
     .priv_data_size = sizeof(BVID_DemuxContext),
     .read_probe     = vid_probe,
     .read_header    = vid_read_header,