#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;
-
- /** video presentation time stamp.
- * delay = 16 milliseconds * (global_delay + per_frame_delay) */
- int video_pts;
+ int video_index; /**< video stream index */
+ int audio_index; /**< audio stream index */
uint8_t *palette;
int is_finished;
{
BVID_DemuxContext *vid = s->priv_data;
AVIOContext *pb = s->pb;
- AVStream *stream;
/* load main header. Contents:
* bytes: 'V' 'I' 'D'
*/
avio_skip(pb, 5);
vid->nframes = avio_rl16(pb);
-
- stream = avformat_new_stream(s, NULL);
- if (!stream)
- return AVERROR(ENOMEM);
- 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;
+ 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) {
+ av_log_ask_for_sample(s, "No audio packet before first video "
+ "packet. Using default video time base.\n");
+ }
+ avpriv_set_pts_info(st, 64, 185, vid->sample_rate);
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codec->codec_id = CODEC_ID_BETHSOFTVID;
+ st->codec->width = vid->width;
+ st->codec->height = vid->height;
+ }
+ st = s->streams[vid->video_index];
+ npixels = st->codec->width * st->codec->height;
vidbuf_start = av_malloc(vidbuf_capacity = BUFFER_PADDING_SIZE);
if(!vidbuf_start)
vidbuf_start[vidbuf_nbytes++] = block_type;
- // get the video delay (next int16), and set the presentation time
- vid->video_pts += vid->bethsoft_global_delay + avio_rl16(pb);
+ // get the current packet duration
+ duration = vid->bethsoft_global_delay + avio_rl16(pb);
// set the y offset if it exists (decoder header data should be in data section)
if(block_type == VIDEO_YOFF_P_FRAME){
av_free(vidbuf_start);
pkt->pos = position;
- pkt->stream_index = 0; // use the video decoder, which was initialized as the first stream
- pkt->pts = vid->video_pts;
+ pkt->stream_index = vid->video_index;
+ pkt->duration = duration;
if (block_type == VIDEO_I_FRAME)
pkt->flags |= AV_PKT_FLAG_KEY;
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->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codec->codec_id = CODEC_ID_PCM_U8;
+ st->codec->channels = 1;
+ st->codec->bits_per_coded_sample = 8;
+ st->codec->sample_rate = vid->sample_rate;
+ st->codec->bit_rate = 8 * st->codec->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)
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)
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,
projects / ffmpeg / blobdiff