X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fipmovie.c;h=6d84402cf8f6bd3dce939bac26ac23971ee4ec1e;hb=d42b09723ed154d5269b95efcc20cb1874f60816;hp=a290da734f2a191249c003ef15b114f3261d58d0;hpb=b76c707acd3d9b09b176e570f75b620e8cc84cbf;p=ffmpeg diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index a290da734f2..6d84402cf8f 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -2,23 +2,25 @@ * Interplay MVE File Demuxer * Copyright (c) 2003 The ffmpeg Project * - * This library is free software; you can redistribute it and/or + * This file is part of FFmpeg. + * + * 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library 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 this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file ipmovie.c + * @file * Interplay MVE file demuxer * by Mike Melanson (melanson@pcisys.net) * For more information regarding the Interplay MVE file format, visit: @@ -30,6 +32,7 @@ * up and sending out the chunks. */ +#include "libavutil/intreadwrite.h" #include "avformat.h" /* debugging support: #define DEBUG_IPMOVIE as non-zero to see extremely @@ -37,20 +40,12 @@ #define DEBUG_IPMOVIE 0 #if DEBUG_IPMOVIE +#undef printf #define debug_ipmovie printf #else static inline void debug_ipmovie(const char *format, ...) { } #endif - -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) -#define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ - (((uint8_t*)(x))[2] << 16) | \ - (((uint8_t*)(x))[1] << 8) | \ - ((uint8_t*)(x))[0]) - -#define IPMOVIE_SIGNATURE "Interplay MVE File\x1A\0" -#define IPMOVIE_SIGNATURE_SIZE 20 #define CHUNK_PREAMBLE_SIZE 4 #define OPCODE_PREAMBLE_SIZE 4 @@ -96,9 +91,9 @@ typedef struct IPMVEContext { unsigned char *buf; int buf_size; - int fps; - int frame_pts_inc; + uint64_t frame_pts_inc; + unsigned int video_bpp; unsigned int video_width; unsigned int video_height; int64_t video_pts; @@ -106,51 +101,46 @@ typedef struct IPMVEContext { unsigned int audio_bits; unsigned int audio_channels; unsigned int audio_sample_rate; - unsigned int audio_type; + enum CodecID audio_type; unsigned int audio_frame_count; int video_stream_index; int audio_stream_index; - offset_t audio_chunk_offset; + int64_t audio_chunk_offset; int audio_chunk_size; - offset_t video_chunk_offset; + int64_t video_chunk_offset; int video_chunk_size; - offset_t decode_map_chunk_offset; + int64_t decode_map_chunk_offset; int decode_map_chunk_size; - offset_t next_chunk_offset; + int64_t next_chunk_offset; AVPaletteControl palette_control; } IPMVEContext; -static int load_ipmovie_packet(IPMVEContext *s, ByteIOContext *pb, +static int load_ipmovie_packet(IPMVEContext *s, ByteIOContext *pb, AVPacket *pkt) { int chunk_type; - int64_t audio_pts = 0; if (s->audio_chunk_offset) { + /* adjust for PCM audio by skipping chunk header */ + if (s->audio_type != CODEC_ID_INTERPLAY_DPCM) { + s->audio_chunk_offset += 6; + s->audio_chunk_size -= 6; + } + url_fseek(pb, s->audio_chunk_offset, SEEK_SET); s->audio_chunk_offset = 0; - /* figure out the audio pts */ - audio_pts = 90000; - audio_pts *= s->audio_frame_count; - audio_pts /= s->audio_sample_rate; - - if (av_new_packet(pkt, s->audio_chunk_size)) - return CHUNK_NOMEM; + if (s->audio_chunk_size != av_get_packet(pb, pkt, s->audio_chunk_size)) + return CHUNK_EOF; pkt->stream_index = s->audio_stream_index; - pkt->pts = audio_pts; - if (get_buffer(pb, pkt->data, s->audio_chunk_size) != - s->audio_chunk_size) { - av_free_packet(pkt); - return CHUNK_EOF; - } + pkt->pts = s->audio_frame_count; /* audio frame maintenance */ if (s->audio_type != CODEC_ID_INTERPLAY_DPCM) @@ -160,8 +150,8 @@ static int load_ipmovie_packet(IPMVEContext *s, ByteIOContext *pb, s->audio_frame_count += (s->audio_chunk_size - 6) / s->audio_channels; - debug_ipmovie("sending audio frame with pts %lld (%d audio frames)\n", - audio_pts, s->audio_frame_count); + debug_ipmovie("sending audio frame with pts %"PRId64" (%d audio frames)\n", + pkt->pts, s->audio_frame_count); chunk_type = CHUNK_VIDEO; @@ -172,10 +162,11 @@ static int load_ipmovie_packet(IPMVEContext *s, ByteIOContext *pb, if (av_new_packet(pkt, s->decode_map_chunk_size + s->video_chunk_size)) return CHUNK_NOMEM; + pkt->pos= s->decode_map_chunk_offset; url_fseek(pb, s->decode_map_chunk_offset, SEEK_SET); s->decode_map_chunk_offset = 0; - if (get_buffer(pb, pkt->data, s->decode_map_chunk_size) != + if (get_buffer(pb, pkt->data, s->decode_map_chunk_size) != s->decode_map_chunk_size) { av_free_packet(pkt); return CHUNK_EOF; @@ -193,6 +184,9 @@ static int load_ipmovie_packet(IPMVEContext *s, ByteIOContext *pb, pkt->stream_index = s->video_stream_index; pkt->pts = s->video_pts; + debug_ipmovie("sending video frame with pts %"PRId64"\n", + pkt->pts); + s->video_pts += s->frame_pts_inc; chunk_type = CHUNK_VIDEO; @@ -209,7 +203,7 @@ static int load_ipmovie_packet(IPMVEContext *s, ByteIOContext *pb, /* This function loads and processes a single chunk in an IP movie file. * It returns the type of chunk that was processed. */ -static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, +static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, AVPacket *pkt) { unsigned char chunk_preamble[CHUNK_PREAMBLE_SIZE]; @@ -223,10 +217,11 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, int i, j; int first_color, last_color; int audio_flags; + unsigned char r, g, b; /* see if there are any pending packets */ chunk_type = load_ipmovie_packet(s, pb, pkt); - if ((chunk_type == CHUNK_VIDEO) && (chunk_type != CHUNK_DONE)) + if (chunk_type != CHUNK_DONE) return chunk_type; /* read the next chunk, wherever the file happens to be pointing */ @@ -235,8 +230,8 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, if (get_buffer(pb, chunk_preamble, CHUNK_PREAMBLE_SIZE) != CHUNK_PREAMBLE_SIZE) return CHUNK_BAD; - chunk_size = LE_16(&chunk_preamble[0]); - chunk_type = LE_16(&chunk_preamble[2]); + chunk_size = AV_RL16(&chunk_preamble[0]); + chunk_type = AV_RL16(&chunk_preamble[2]); debug_ipmovie("chunk type 0x%04X, 0x%04X bytes: ", chunk_type, chunk_size); @@ -276,7 +271,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, while ((chunk_size > 0) && (chunk_type != CHUNK_BAD)) { /* read the next chunk, wherever the file happens to be pointing */ - if (url_feof(pb)) { + if (url_feof(pb)) { chunk_type = CHUNK_EOF; break; } @@ -286,7 +281,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, break; } - opcode_size = LE_16(&opcode_preamble[0]); + opcode_size = AV_RL16(&opcode_preamble[0]); opcode_type = opcode_preamble[2]; opcode_version = opcode_preamble[3]; @@ -324,11 +319,9 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, chunk_type = CHUNK_BAD; break; } - s->fps = 1000000 / (LE_32(&scratch[0]) * LE_16(&scratch[4])); - s->fps++; /* above calculation usually yields 14.9; we need 15 */ - s->frame_pts_inc = 90000 / s->fps; - debug_ipmovie("%d frames/second (timer div = %d, subdiv = %d)\n", - s->fps, LE_32(&scratch[0]), LE_16(&scratch[4])); + s->frame_pts_inc = ((uint64_t)AV_RL32(&scratch[0])) * AV_RL16(&scratch[4]); + debug_ipmovie(" %.2f frames/second (timer div = %d, subdiv = %d)\n", + 1000000.0/s->frame_pts_inc, AV_RL32(&scratch[0]), AV_RL16(&scratch[4])); break; case OPCODE_INIT_AUDIO_BUFFERS: @@ -343,8 +336,8 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, chunk_type = CHUNK_BAD; break; } - s->audio_sample_rate = LE_16(&scratch[4]); - audio_flags = LE_16(&scratch[2]); + s->audio_sample_rate = AV_RL16(&scratch[4]); + audio_flags = AV_RL16(&scratch[2]); /* bit 0 of the flags: 0 = mono, 1 = stereo */ s->audio_channels = (audio_flags & 1) + 1; /* bit 1 of the flags: 0 = 8 bit, 1 = 16 bit */ @@ -360,7 +353,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, s->audio_bits, s->audio_sample_rate, (s->audio_channels == 2) ? "stereo" : "mono", - (s->audio_type == CODEC_ID_INTERPLAY_DPCM) ? + (s->audio_type == CODEC_ID_INTERPLAY_DPCM) ? "Interplay audio" : "PCM"); break; @@ -381,8 +374,13 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, chunk_type = CHUNK_BAD; break; } - s->video_width = LE_16(&scratch[0]) * 8; - s->video_height = LE_16(&scratch[2]) * 8; + s->video_width = AV_RL16(&scratch[0]) * 8; + s->video_height = AV_RL16(&scratch[2]) * 8; + if (opcode_version < 2 || !AV_RL16(&scratch[6])) { + s->video_bpp = 8; + } else { + s->video_bpp = 16; + } debug_ipmovie("video resolution: %d x %d\n", s->video_width, s->video_height); break; @@ -442,11 +440,11 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, } /* load the palette into internal data structure */ - first_color = LE_16(&scratch[0]); - last_color = LE_16(&scratch[2]); + first_color = AV_RL16(&scratch[0]); + last_color = first_color + AV_RL16(&scratch[2]) - 1; /* sanity check (since they are 16 bit values) */ if ((first_color > 0xFF) || (last_color > 0xFF)) { - debug_ipmovie("demux_ipmovie: set_palette indices out of range (%d -> %d)\n", + debug_ipmovie("demux_ipmovie: set_palette indexes out of range (%d -> %d)\n", first_color, last_color); chunk_type = CHUNK_BAD; break; @@ -455,9 +453,10 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, for (i = first_color; i <= last_color; i++) { /* the palette is stored as a 6-bit VGA palette, thus each * component is shifted up to a 8-bit range */ - s->palette_control.palette[i * 3 + 0] = scratch[j++] * 4; - s->palette_control.palette[i * 3 + 1] = scratch[j++] * 4; - s->palette_control.palette[i * 3 + 2] = scratch[j++] * 4; + r = scratch[j++] * 4; + g = scratch[j++] * 4; + b = scratch[j++] * 4; + s->palette_control.palette[i] = (r << 16) | (g << 8) | (b); } /* indicate a palette change */ s->palette_control.palette_changed = 1; @@ -504,73 +503,97 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, return chunk_type; } +static const char signature[] = "Interplay MVE File\x1A\0\x1A"; + static int ipmovie_probe(AVProbeData *p) { - if (p->buf_size < IPMOVIE_SIGNATURE_SIZE) - return 0; - if (strncmp(p->buf, IPMOVIE_SIGNATURE, IPMOVIE_SIGNATURE_SIZE) != 0) - return 0; + uint8_t *b = p->buf; + uint8_t *b_end = p->buf + p->buf_size - sizeof(signature); + do { + if (memcmp(b++, signature, sizeof(signature)) == 0) + return AVPROBE_SCORE_MAX; + } while (b < b_end); - return AVPROBE_SCORE_MAX; + return 0; } static int ipmovie_read_header(AVFormatContext *s, AVFormatParameters *ap) { - IPMVEContext *ipmovie = (IPMVEContext *)s->priv_data; - ByteIOContext *pb = &s->pb; + IPMVEContext *ipmovie = s->priv_data; + ByteIOContext *pb = s->pb; AVPacket pkt; AVStream *st; - + unsigned char chunk_preamble[CHUNK_PREAMBLE_SIZE]; + int chunk_type; + uint8_t signature_buffer[sizeof(signature)]; + + get_buffer(pb, signature_buffer, sizeof(signature_buffer)); + while (memcmp(signature_buffer, signature, sizeof(signature))) { + memmove(signature_buffer, signature_buffer + 1, sizeof(signature_buffer) - 1); + signature_buffer[sizeof(signature_buffer) - 1] = get_byte(pb); + if (url_feof(pb)) + return AVERROR_EOF; + } /* initialize private context members */ ipmovie->video_pts = ipmovie->audio_frame_count = 0; ipmovie->audio_chunk_offset = ipmovie->video_chunk_offset = ipmovie->decode_map_chunk_offset = 0; /* on the first read, this will position the stream at the first chunk */ - ipmovie->next_chunk_offset = IPMOVIE_SIGNATURE_SIZE + 6; + ipmovie->next_chunk_offset = url_ftell(pb) + 4; /* process the first chunk which should be CHUNK_INIT_VIDEO */ if (process_ipmovie_chunk(ipmovie, pb, &pkt) != CHUNK_INIT_VIDEO) return AVERROR_INVALIDDATA; - /* process the next chunk which should be CHUNK_INIT_AUDIO */ - if (process_ipmovie_chunk(ipmovie, pb, &pkt) != CHUNK_INIT_AUDIO) - return AVERROR_INVALIDDATA; + /* peek ahead to the next chunk-- if it is an init audio chunk, process + * it; if it is the first video chunk, this is a silent file */ + if (get_buffer(pb, chunk_preamble, CHUNK_PREAMBLE_SIZE) != + CHUNK_PREAMBLE_SIZE) + return AVERROR(EIO); + chunk_type = AV_RL16(&chunk_preamble[2]); + url_fseek(pb, -CHUNK_PREAMBLE_SIZE, SEEK_CUR); - /* set the pts reference (1 pts = 1/90000) */ - s->pts_num = 1; - s->pts_den = 90000; + if (chunk_type == CHUNK_VIDEO) + ipmovie->audio_type = CODEC_ID_NONE; /* no audio */ + else if (process_ipmovie_chunk(ipmovie, pb, &pkt) != CHUNK_INIT_AUDIO) + return AVERROR_INVALIDDATA; /* initialize the stream decoders */ st = av_new_stream(s, 0); if (!st) - return AVERROR_NOMEM; + return AVERROR(ENOMEM); + av_set_pts_info(st, 63, 1, 1000000); ipmovie->video_stream_index = st->index; - st->codec.codec_type = CODEC_TYPE_VIDEO; - st->codec.codec_id = CODEC_ID_INTERPLAY_VIDEO; - st->codec.codec_tag = 0; /* no fourcc */ - st->codec.width = ipmovie->video_width; - st->codec.height = ipmovie->video_height; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + st->codec->codec_id = CODEC_ID_INTERPLAY_VIDEO; + st->codec->codec_tag = 0; /* no fourcc */ + st->codec->width = ipmovie->video_width; + st->codec->height = ipmovie->video_height; + st->codec->bits_per_coded_sample = ipmovie->video_bpp; /* palette considerations */ - st->codec.extradata_size = sizeof(AVPaletteControl); - st->codec.extradata = &ipmovie->palette_control; - - st = av_new_stream(s, 0); - if (!st) - return AVERROR_NOMEM; - ipmovie->audio_stream_index = st->index; - st->codec.codec_type = CODEC_TYPE_AUDIO; - st->codec.codec_id = ipmovie->audio_type; - st->codec.codec_tag = 0; /* no tag */ - st->codec.channels = ipmovie->audio_channels; - st->codec.sample_rate = ipmovie->audio_sample_rate; - st->codec.bits_per_sample = ipmovie->audio_bits; - st->codec.bit_rate = st->codec.channels * st->codec.sample_rate * - st->codec.bits_per_sample / - (st->codec.codec_id == CODEC_ID_INTERPLAY_DPCM) ? 2 : 1; - st->codec.block_align = st->codec.channels * st->codec.bits_per_sample; + st->codec->palctrl = &ipmovie->palette_control; + + if (ipmovie->audio_type) { + st = av_new_stream(s, 0); + if (!st) + return AVERROR(ENOMEM); + av_set_pts_info(st, 32, 1, ipmovie->audio_sample_rate); + ipmovie->audio_stream_index = st->index; + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_id = ipmovie->audio_type; + st->codec->codec_tag = 0; /* no tag */ + st->codec->channels = ipmovie->audio_channels; + st->codec->sample_rate = ipmovie->audio_sample_rate; + st->codec->bits_per_coded_sample = ipmovie->audio_bits; + st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * + st->codec->bits_per_coded_sample; + if (st->codec->codec_id == CODEC_ID_INTERPLAY_DPCM) + st->codec->bit_rate /= 2; + st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; + } return 0; } @@ -578,43 +601,30 @@ static int ipmovie_read_header(AVFormatContext *s, static int ipmovie_read_packet(AVFormatContext *s, AVPacket *pkt) { - IPMVEContext *ipmovie = (IPMVEContext *)s->priv_data; - ByteIOContext *pb = &s->pb; + IPMVEContext *ipmovie = s->priv_data; + ByteIOContext *pb = s->pb; int ret; ret = process_ipmovie_chunk(ipmovie, pb, pkt); if (ret == CHUNK_BAD) ret = AVERROR_INVALIDDATA; else if (ret == CHUNK_EOF) - ret = -EIO; + ret = AVERROR(EIO); else if (ret == CHUNK_NOMEM) - ret = AVERROR_NOMEM; - else + ret = AVERROR(ENOMEM); + else if (ret == CHUNK_VIDEO) ret = 0; + else + ret = -1; return ret; } -static int ipmovie_read_close(AVFormatContext *s) -{ -// IPMVEContext *ipmovie = (IPMVEContext *)s->priv_data; - - return 0; -} - -static AVInputFormat ipmovie_iformat = { +AVInputFormat ff_ipmovie_demuxer = { "ipmovie", - "Interplay MVE format", + NULL_IF_CONFIG_SMALL("Interplay MVE format"), sizeof(IPMVEContext), ipmovie_probe, ipmovie_read_header, ipmovie_read_packet, - ipmovie_read_close, }; - -int ipmovie_init(void) -{ - av_register_input_format(&ipmovie_iformat); - return 0; -} -