X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fipmovie.c;h=2ef5ca07396a5ae1dd663e40e163ba02438abfa9;hb=79fdbfdb3e50f3f906903e027714ee04c1a00e89;hp=839e099a5e960b4d8b7399e34198f4243b158659;hpb=dd1c8f3e6e5380f993c86750bb09fd42e130143f;p=ffmpeg diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index 839e099a5e9..2ef5ca07396 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -2,25 +2,25 @@ * Interplay MVE File Demuxer * Copyright (c) 2003 The ffmpeg Project * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * License along with Libav; 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: @@ -32,20 +32,11 @@ * up and sending out the chunks. */ +#include "libavutil/channel_layout.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" +#include "internal.h" -/* debugging support: #define DEBUG_IPMOVIE as non-zero to see extremely - * verbose information about the demux process */ -#define DEBUG_IPMOVIE 0 - -#if DEBUG_IPMOVIE -#define debug_ipmovie printf -#else -static inline void debug_ipmovie(const char *format, ...) { } -#endif - -#define IPMOVIE_SIGNATURE "Interplay MVE File\x1A\0" -#define IPMOVIE_SIGNATURE_SIZE 20 #define CHUNK_PREAMBLE_SIZE 4 #define OPCODE_PREAMBLE_SIZE 4 @@ -91,73 +82,73 @@ typedef struct IPMVEContext { unsigned char *buf; int buf_size; - float 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; + uint32_t palette[256]; + int has_palette; + int changed; unsigned int audio_bits; unsigned int audio_channels; unsigned int audio_sample_rate; - unsigned int audio_type; + enum AVCodecID 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; - - AVPaletteControl palette_control; + int64_t next_chunk_offset; } IPMVEContext; -static int load_ipmovie_packet(IPMVEContext *s, ByteIOContext *pb, +static int load_ipmovie_packet(IPMVEContext *s, AVIOContext *pb, AVPacket *pkt) { int chunk_type; - int64_t audio_pts = 0; if (s->audio_chunk_offset) { + if (s->audio_type == AV_CODEC_ID_NONE) { + av_log(NULL, AV_LOG_ERROR, "Can not read audio packet before" + "audio codec is known\n"); + return CHUNK_BAD; + } /* adjust for PCM audio by skipping chunk header */ - if (s->audio_type != CODEC_ID_INTERPLAY_DPCM) { + if (s->audio_type != AV_CODEC_ID_INTERPLAY_DPCM) { s->audio_chunk_offset += 6; s->audio_chunk_size -= 6; } - url_fseek(pb, s->audio_chunk_offset, SEEK_SET); + avio_seek(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 (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; + pkt->pts = s->audio_frame_count; /* audio frame maintenance */ - if (s->audio_type != CODEC_ID_INTERPLAY_DPCM) + if (s->audio_type != AV_CODEC_ID_INTERPLAY_DPCM) s->audio_frame_count += (s->audio_chunk_size / s->audio_channels / (s->audio_bits / 8)); else s->audio_frame_count += - (s->audio_chunk_size - 6) / s->audio_channels; + (s->audio_chunk_size - 6 - s->audio_channels) / s->audio_channels; - debug_ipmovie("sending audio frame with pts %"PRId64" (%d audio frames)\n", - audio_pts, s->audio_frame_count); + av_log(NULL, AV_LOG_TRACE, "sending audio frame with pts %"PRId64" (%d audio frames)\n", + pkt->pts, s->audio_frame_count); chunk_type = CHUNK_VIDEO; @@ -168,30 +159,44 @@ 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; + if (s->has_palette) { + uint8_t *pal; + + pal = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE, + AVPALETTE_SIZE); + if (pal) { + memcpy(pal, s->palette, AVPALETTE_SIZE); + s->has_palette = 0; + } + } + + if (s->changed) { + ff_add_param_change(pkt, 0, 0, 0, s->video_width, s->video_height); + s->changed = 0; + } pkt->pos= s->decode_map_chunk_offset; - url_fseek(pb, s->decode_map_chunk_offset, SEEK_SET); + avio_seek(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 (avio_read(pb, pkt->data, s->decode_map_chunk_size) != s->decode_map_chunk_size) { - av_free_packet(pkt); + av_packet_unref(pkt); return CHUNK_EOF; } - url_fseek(pb, s->video_chunk_offset, SEEK_SET); + avio_seek(pb, s->video_chunk_offset, SEEK_SET); s->video_chunk_offset = 0; - if (get_buffer(pb, pkt->data + s->decode_map_chunk_size, + if (avio_read(pb, pkt->data + s->decode_map_chunk_size, s->video_chunk_size) != s->video_chunk_size) { - av_free_packet(pkt); + av_packet_unref(pkt); return CHUNK_EOF; } pkt->stream_index = s->video_stream_index; pkt->pts = s->video_pts; - debug_ipmovie("sending video frame with pts %"PRId64"\n", - pkt->pts); + av_log(NULL, AV_LOG_TRACE, "sending video frame with pts %"PRId64"\n", pkt->pts); s->video_pts += s->frame_pts_inc; @@ -199,7 +204,7 @@ static int load_ipmovie_packet(IPMVEContext *s, ByteIOContext *pb, } else { - url_fseek(pb, s->next_chunk_offset, SEEK_SET); + avio_seek(pb, s->next_chunk_offset, SEEK_SET); chunk_type = CHUNK_DONE; } @@ -209,7 +214,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, AVIOContext *pb, AVPacket *pkt) { unsigned char chunk_preamble[CHUNK_PREAMBLE_SIZE]; @@ -224,6 +229,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, int first_color, last_color; int audio_flags; unsigned char r, g, b; + unsigned int width, height; /* see if there are any pending packets */ chunk_type = load_ipmovie_packet(s, pb, pkt); @@ -231,44 +237,44 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, return chunk_type; /* read the next chunk, wherever the file happens to be pointing */ - if (url_feof(pb)) + if (pb->eof_reached) return CHUNK_EOF; - if (get_buffer(pb, chunk_preamble, CHUNK_PREAMBLE_SIZE) != + if (avio_read(pb, chunk_preamble, CHUNK_PREAMBLE_SIZE) != CHUNK_PREAMBLE_SIZE) return CHUNK_BAD; 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); + av_log(NULL, AV_LOG_TRACE, "chunk type 0x%04X, 0x%04X bytes: ", chunk_type, chunk_size); switch (chunk_type) { case CHUNK_INIT_AUDIO: - debug_ipmovie("initialize audio\n"); + av_log(NULL, AV_LOG_TRACE, "initialize audio\n"); break; case CHUNK_AUDIO_ONLY: - debug_ipmovie("audio only\n"); + av_log(NULL, AV_LOG_TRACE, "audio only\n"); break; case CHUNK_INIT_VIDEO: - debug_ipmovie("initialize video\n"); + av_log(NULL, AV_LOG_TRACE, "initialize video\n"); break; case CHUNK_VIDEO: - debug_ipmovie("video (and audio)\n"); + av_log(NULL, AV_LOG_TRACE, "video (and audio)\n"); break; case CHUNK_SHUTDOWN: - debug_ipmovie("shutdown\n"); + av_log(NULL, AV_LOG_TRACE, "shutdown\n"); break; case CHUNK_END: - debug_ipmovie("end\n"); + av_log(NULL, AV_LOG_TRACE, "end\n"); break; default: - debug_ipmovie("invalid chunk\n"); + av_log(NULL, AV_LOG_TRACE, "invalid chunk\n"); chunk_type = CHUNK_BAD; break; @@ -277,11 +283,11 @@ 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 (pb->eof_reached) { chunk_type = CHUNK_EOF; break; } - if (get_buffer(pb, opcode_preamble, CHUNK_PREAMBLE_SIZE) != + if (avio_read(pb, opcode_preamble, CHUNK_PREAMBLE_SIZE) != CHUNK_PREAMBLE_SIZE) { chunk_type = CHUNK_BAD; break; @@ -294,51 +300,51 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, chunk_size -= OPCODE_PREAMBLE_SIZE; chunk_size -= opcode_size; if (chunk_size < 0) { - debug_ipmovie("chunk_size countdown just went negative\n"); + av_log(NULL, AV_LOG_TRACE, "chunk_size countdown just went negative\n"); chunk_type = CHUNK_BAD; break; } - debug_ipmovie(" opcode type %02X, version %d, 0x%04X bytes: ", - opcode_type, opcode_version, opcode_size); + av_log(NULL, AV_LOG_TRACE, " opcode type %02X, version %d, 0x%04X bytes: ", + opcode_type, opcode_version, opcode_size); switch (opcode_type) { case OPCODE_END_OF_STREAM: - debug_ipmovie("end of stream\n"); - url_fseek(pb, opcode_size, SEEK_CUR); + av_log(NULL, AV_LOG_TRACE, "end of stream\n"); + avio_skip(pb, opcode_size); break; case OPCODE_END_OF_CHUNK: - debug_ipmovie("end of chunk\n"); - url_fseek(pb, opcode_size, SEEK_CUR); + av_log(NULL, AV_LOG_TRACE, "end of chunk\n"); + avio_skip(pb, opcode_size); break; case OPCODE_CREATE_TIMER: - debug_ipmovie("create timer\n"); + av_log(NULL, AV_LOG_TRACE, "create timer\n"); if ((opcode_version > 0) || (opcode_size > 6)) { - debug_ipmovie("bad create_timer opcode\n"); + av_log(NULL, AV_LOG_TRACE, "bad create_timer opcode\n"); chunk_type = CHUNK_BAD; break; } - if (get_buffer(pb, scratch, opcode_size) != + if (avio_read(pb, scratch, opcode_size) != opcode_size) { chunk_type = CHUNK_BAD; break; } - s->fps = 1000000.0 / (AV_RL32(&scratch[0]) * AV_RL16(&scratch[4])); - s->frame_pts_inc = 90000 / s->fps; - debug_ipmovie(" %.2f frames/second (timer div = %d, subdiv = %d)\n", - s->fps, AV_RL32(&scratch[0]), AV_RL16(&scratch[4])); + s->frame_pts_inc = ((uint64_t)AV_RL32(&scratch[0])) * AV_RL16(&scratch[4]); + av_log(NULL, AV_LOG_TRACE, " %.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: - debug_ipmovie("initialize audio buffers\n"); + av_log(NULL, AV_LOG_TRACE, "initialize audio buffers\n"); if ((opcode_version > 1) || (opcode_size > 10)) { - debug_ipmovie("bad init_audio_buffers opcode\n"); + av_log(NULL, AV_LOG_TRACE, "bad init_audio_buffers opcode\n"); chunk_type = CHUNK_BAD; break; } - if (get_buffer(pb, scratch, opcode_size) != + if (avio_read(pb, scratch, opcode_size) != opcode_size) { chunk_type = CHUNK_BAD; break; @@ -351,40 +357,52 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, s->audio_bits = (((audio_flags >> 1) & 1) + 1) * 8; /* bit 2 indicates compressed audio in version 1 opcode */ if ((opcode_version == 1) && (audio_flags & 0x4)) - s->audio_type = CODEC_ID_INTERPLAY_DPCM; + s->audio_type = AV_CODEC_ID_INTERPLAY_DPCM; else if (s->audio_bits == 16) - s->audio_type = CODEC_ID_PCM_S16LE; + s->audio_type = AV_CODEC_ID_PCM_S16LE; else - s->audio_type = CODEC_ID_PCM_U8; - debug_ipmovie("audio: %d bits, %d Hz, %s, %s format\n", - s->audio_bits, - s->audio_sample_rate, - (s->audio_channels == 2) ? "stereo" : "mono", - (s->audio_type == CODEC_ID_INTERPLAY_DPCM) ? - "Interplay audio" : "PCM"); + s->audio_type = AV_CODEC_ID_PCM_U8; + av_log(NULL, AV_LOG_TRACE, "audio: %d bits, %d Hz, %s, %s format\n", + s->audio_bits, s->audio_sample_rate, + (s->audio_channels == 2) ? "stereo" : "mono", + (s->audio_type == AV_CODEC_ID_INTERPLAY_DPCM) ? + "Interplay audio" : "PCM"); break; case OPCODE_START_STOP_AUDIO: - debug_ipmovie("start/stop audio\n"); - url_fseek(pb, opcode_size, SEEK_CUR); + av_log(NULL, AV_LOG_TRACE, "start/stop audio\n"); + avio_skip(pb, opcode_size); break; case OPCODE_INIT_VIDEO_BUFFERS: - debug_ipmovie("initialize video buffers\n"); + av_log(NULL, AV_LOG_TRACE, "initialize video buffers\n"); if ((opcode_version > 2) || (opcode_size > 8)) { - debug_ipmovie("bad init_video_buffers opcode\n"); + av_log(NULL, AV_LOG_TRACE, "bad init_video_buffers opcode\n"); chunk_type = CHUNK_BAD; break; } - if (get_buffer(pb, scratch, opcode_size) != + if (avio_read(pb, scratch, opcode_size) != opcode_size) { chunk_type = CHUNK_BAD; break; } - s->video_width = AV_RL16(&scratch[0]) * 8; - s->video_height = AV_RL16(&scratch[2]) * 8; - debug_ipmovie("video resolution: %d x %d\n", - s->video_width, s->video_height); + width = AV_RL16(&scratch[0]) * 8; + height = AV_RL16(&scratch[2]) * 8; + if (width != s->video_width) { + s->video_width = width; + s->changed++; + } + if (height != s->video_height) { + s->video_height = height; + s->changed++; + } + if (opcode_version < 2 || !AV_RL16(&scratch[6])) { + s->video_bpp = 8; + } else { + s->video_bpp = 16; + } + av_log(NULL, AV_LOG_TRACE, "video resolution: %d x %d\n", + s->video_width, s->video_height); break; case OPCODE_UNKNOWN_06: @@ -394,49 +412,49 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, case OPCODE_UNKNOWN_13: case OPCODE_UNKNOWN_14: case OPCODE_UNKNOWN_15: - debug_ipmovie("unknown (but documented) opcode %02X\n", opcode_type); - url_fseek(pb, opcode_size, SEEK_CUR); + av_log(NULL, AV_LOG_TRACE, "unknown (but documented) opcode %02X\n", opcode_type); + avio_skip(pb, opcode_size); break; case OPCODE_SEND_BUFFER: - debug_ipmovie("send buffer\n"); - url_fseek(pb, opcode_size, SEEK_CUR); + av_log(NULL, AV_LOG_TRACE, "send buffer\n"); + avio_skip(pb, opcode_size); break; case OPCODE_AUDIO_FRAME: - debug_ipmovie("audio frame\n"); + av_log(NULL, AV_LOG_TRACE, "audio frame\n"); /* log position and move on for now */ - s->audio_chunk_offset = url_ftell(pb); + s->audio_chunk_offset = avio_tell(pb); s->audio_chunk_size = opcode_size; - url_fseek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; case OPCODE_SILENCE_FRAME: - debug_ipmovie("silence frame\n"); - url_fseek(pb, opcode_size, SEEK_CUR); + av_log(NULL, AV_LOG_TRACE, "silence frame\n"); + avio_skip(pb, opcode_size); break; case OPCODE_INIT_VIDEO_MODE: - debug_ipmovie("initialize video mode\n"); - url_fseek(pb, opcode_size, SEEK_CUR); + av_log(NULL, AV_LOG_TRACE, "initialize video mode\n"); + avio_skip(pb, opcode_size); break; case OPCODE_CREATE_GRADIENT: - debug_ipmovie("create gradient\n"); - url_fseek(pb, opcode_size, SEEK_CUR); + av_log(NULL, AV_LOG_TRACE, "create gradient\n"); + avio_skip(pb, opcode_size); break; case OPCODE_SET_PALETTE: - debug_ipmovie("set palette\n"); + av_log(NULL, AV_LOG_TRACE, "set palette\n"); /* check for the logical maximum palette size * (3 * 256 + 4 bytes) */ if (opcode_size > 0x304) { - debug_ipmovie("demux_ipmovie: set_palette opcode too large\n"); + av_log(NULL, AV_LOG_TRACE, "demux_ipmovie: set_palette opcode too large\n"); chunk_type = CHUNK_BAD; break; } - if (get_buffer(pb, scratch, opcode_size) != opcode_size) { + if (avio_read(pb, scratch, opcode_size) != opcode_size) { chunk_type = CHUNK_BAD; break; } @@ -446,7 +464,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, 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 indexes out of range (%d -> %d)\n", + av_log(NULL, AV_LOG_TRACE, "demux_ipmovie: set_palette indexes out of range (%d -> %d)\n", first_color, last_color); chunk_type = CHUNK_BAD; break; @@ -458,37 +476,36 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, r = scratch[j++] * 4; g = scratch[j++] * 4; b = scratch[j++] * 4; - s->palette_control.palette[i] = (r << 16) | (g << 8) | (b); + s->palette[i] = (r << 16) | (g << 8) | (b); } - /* indicate a palette change */ - s->palette_control.palette_changed = 1; + s->has_palette = 1; break; case OPCODE_SET_PALETTE_COMPRESSED: - debug_ipmovie("set palette compressed\n"); - url_fseek(pb, opcode_size, SEEK_CUR); + av_log(NULL, AV_LOG_TRACE, "set palette compressed\n"); + avio_skip(pb, opcode_size); break; case OPCODE_SET_DECODING_MAP: - debug_ipmovie("set decoding map\n"); + av_log(NULL, AV_LOG_TRACE, "set decoding map\n"); /* log position and move on for now */ - s->decode_map_chunk_offset = url_ftell(pb); + s->decode_map_chunk_offset = avio_tell(pb); s->decode_map_chunk_size = opcode_size; - url_fseek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; case OPCODE_VIDEO_DATA: - debug_ipmovie("set video data\n"); + av_log(NULL, AV_LOG_TRACE, "set video data\n"); /* log position and move on for now */ - s->video_chunk_offset = url_ftell(pb); + s->video_chunk_offset = avio_tell(pb); s->video_chunk_size = opcode_size; - url_fseek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; default: - debug_ipmovie("*** unknown opcode type\n"); + av_log(NULL, AV_LOG_TRACE, "*** unknown opcode type\n"); chunk_type = CHUNK_BAD; break; @@ -496,7 +513,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, } /* make a note of where the stream is sitting */ - s->next_chunk_offset = url_ftell(pb); + s->next_chunk_offset = avio_tell(pb); /* dispatch the first of any pending packets */ if ((chunk_type == CHUNK_VIDEO) || (chunk_type == CHUNK_AUDIO_ONLY)) @@ -505,31 +522,44 @@ 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 (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) +static int ipmovie_read_header(AVFormatContext *s) { IPMVEContext *ipmovie = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; AVPacket pkt; AVStream *st; unsigned char chunk_preamble[CHUNK_PREAMBLE_SIZE]; int chunk_type; - + uint8_t signature_buffer[sizeof(signature)]; + + avio_read(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] = avio_r8(pb); + if (pb->eof_reached) + 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 = avio_tell(pb) + 4; /* process the first chunk which should be CHUNK_INIT_VIDEO */ if (process_ipmovie_chunk(ipmovie, pb, &pkt) != CHUNK_INIT_VIDEO) @@ -537,49 +567,49 @@ static int ipmovie_read_header(AVFormatContext *s, /* 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) != + if (avio_read(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); + avio_seek(pb, -CHUNK_PREAMBLE_SIZE, SEEK_CUR); if (chunk_type == CHUNK_VIDEO) - ipmovie->audio_type = 0; /* no audio */ + ipmovie->audio_type = AV_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); + st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); - av_set_pts_info(st, 33, 1, 90000); + avpriv_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; - - /* palette considerations */ - st->codec->palctrl = &ipmovie->palette_control; + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; + st->codecpar->codec_id = AV_CODEC_ID_INTERPLAY_VIDEO; + st->codecpar->codec_tag = 0; /* no fourcc */ + st->codecpar->width = ipmovie->video_width; + st->codecpar->height = ipmovie->video_height; + st->codecpar->bits_per_coded_sample = ipmovie->video_bpp; if (ipmovie->audio_type) { - st = av_new_stream(s, 0); + st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); - av_set_pts_info(st, 33, 1, 90000); + avpriv_set_pts_info(st, 32, 1, ipmovie->audio_sample_rate); 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_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; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = ipmovie->audio_type; + st->codecpar->codec_tag = 0; /* no tag */ + st->codecpar->channels = ipmovie->audio_channels; + st->codecpar->channel_layout = st->codecpar->channels == 1 ? AV_CH_LAYOUT_MONO : + AV_CH_LAYOUT_STEREO; + st->codecpar->sample_rate = ipmovie->audio_sample_rate; + st->codecpar->bits_per_coded_sample = ipmovie->audio_bits; + st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * + st->codecpar->bits_per_coded_sample; + if (st->codecpar->codec_id == AV_CODEC_ID_INTERPLAY_DPCM) + st->codecpar->bit_rate /= 2; + st->codecpar->block_align = st->codecpar->channels * st->codecpar->bits_per_coded_sample; } return 0; @@ -589,7 +619,7 @@ static int ipmovie_read_packet(AVFormatContext *s, AVPacket *pkt) { IPMVEContext *ipmovie = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int ret; ret = process_ipmovie_chunk(ipmovie, pb, pkt); @@ -607,11 +637,11 @@ static int ipmovie_read_packet(AVFormatContext *s, return ret; } -AVInputFormat ipmovie_demuxer = { - "ipmovie", - NULL_IF_CONFIG_SMALL("Interplay MVE format"), - sizeof(IPMVEContext), - ipmovie_probe, - ipmovie_read_header, - ipmovie_read_packet, +AVInputFormat ff_ipmovie_demuxer = { + .name = "ipmovie", + .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE"), + .priv_data_size = sizeof(IPMVEContext), + .read_probe = ipmovie_probe, + .read_header = ipmovie_read_header, + .read_packet = ipmovie_read_packet, };