X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsegafilm.c;h=906cb915ad8a0940c44b980330f30f144275a8b4;hb=e63a362857d9807b23e65872598d782fa53bb6af;hp=56e898b98524cfc8853e052fd583703ec06539ba;hpb=b40a061fcb4b2c249b5dd3208f7148d5990f537d;p=ffmpeg diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 56e898b9852..906cb915ad8 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -20,13 +20,14 @@ */ /** - * @file segafilm.c + * @file * Sega FILM (.cpk) file demuxer * by Mike Melanson (melanson@pcisys.net) * For more information regarding the Sega FILM file format, visit: * http://www.pcisys.net/~melanson/codecs/ */ +#include "libavutil/intreadwrite.h" #include "avformat.h" #define FILM_TAG MKBETAG('F', 'I', 'L', 'M') @@ -36,24 +37,24 @@ typedef struct { int stream; - offset_t sample_offset; + int64_t sample_offset; unsigned int sample_size; int64_t pts; int keyframe; -} film_sample_t; +} film_sample; typedef struct FilmDemuxContext { int video_stream_index; int audio_stream_index; - unsigned int audio_type; + enum CodecID audio_type; unsigned int audio_samplerate; unsigned int audio_bits; unsigned int audio_channels; - unsigned int video_type; + enum CodecID video_type; unsigned int sample_count; - film_sample_t *sample_table; + film_sample *sample_table; unsigned int current_sample; unsigned int base_clock; @@ -66,10 +67,7 @@ typedef struct FilmDemuxContext { static int film_probe(AVProbeData *p) { - if (p->buf_size < 4) - return 0; - - if (BE_32(&p->buf[0]) != FILM_TAG) + if (AV_RB32(&p->buf[0]) != FILM_TAG) return 0; return AVPROBE_SCORE_MAX; @@ -78,8 +76,8 @@ static int film_probe(AVProbeData *p) static int film_read_header(AVFormatContext *s, AVFormatParameters *ap) { - FilmDemuxContext *film = (FilmDemuxContext *)s->priv_data; - ByteIOContext *pb = &s->pb; + FilmDemuxContext *film = s->priv_data; + AVIOContext *pb = s->pb; AVStream *st; unsigned char scratch[256]; int i; @@ -91,16 +89,16 @@ static int film_read_header(AVFormatContext *s, film->stereo_buffer_size = 0; /* load the main FILM header */ - if (get_buffer(pb, scratch, 16) != 16) - return AVERROR_IO; - data_offset = BE_32(&scratch[4]); - film->version = BE_32(&scratch[8]); + if (avio_read(pb, scratch, 16) != 16) + return AVERROR(EIO); + data_offset = AV_RB32(&scratch[4]); + film->version = AV_RB32(&scratch[8]); /* load the FDSC chunk */ if (film->version == 0) { /* special case for Lemmings .film files; 20-byte header */ - if (get_buffer(pb, scratch, 20) != 20) - return AVERROR_IO; + if (avio_read(pb, scratch, 20) != 20) + return AVERROR(EIO); /* make some assumptions about the audio parameters */ film->audio_type = CODEC_ID_PCM_S8; film->audio_samplerate = 22050; @@ -108,9 +106,9 @@ static int film_read_header(AVFormatContext *s, film->audio_bits = 8; } else { /* normal Saturn .cpk files; 32-byte header */ - if (get_buffer(pb, scratch, 32) != 32) - return AVERROR_IO; - film->audio_samplerate = BE_16(&scratch[24]);; + if (avio_read(pb, scratch, 32) != 32) + return AVERROR(EIO); + film->audio_samplerate = AV_RB16(&scratch[24]); film->audio_channels = scratch[21]; film->audio_bits = scratch[22]; if (film->audio_bits == 8) @@ -118,57 +116,57 @@ static int film_read_header(AVFormatContext *s, else if (film->audio_bits == 16) film->audio_type = CODEC_ID_PCM_S16BE; else - film->audio_type = 0; + film->audio_type = CODEC_ID_NONE; } - if (BE_32(&scratch[0]) != FDSC_TAG) + if (AV_RB32(&scratch[0]) != FDSC_TAG) return AVERROR_INVALIDDATA; - if (BE_32(&scratch[8]) == CVID_TAG) { + if (AV_RB32(&scratch[8]) == CVID_TAG) { film->video_type = CODEC_ID_CINEPAK; } else - film->video_type = 0; + film->video_type = CODEC_ID_NONE; /* initialize the decoder streams */ if (film->video_type) { st = av_new_stream(s, 0); if (!st) - return AVERROR_NOMEM; + return AVERROR(ENOMEM); film->video_stream_index = st->index; - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = film->video_type; st->codec->codec_tag = 0; /* no fourcc */ - st->codec->width = BE_32(&scratch[16]); - st->codec->height = BE_32(&scratch[12]); + st->codec->width = AV_RB32(&scratch[16]); + st->codec->height = AV_RB32(&scratch[12]); } if (film->audio_type) { st = av_new_stream(s, 0); if (!st) - return AVERROR_NOMEM; + return AVERROR(ENOMEM); film->audio_stream_index = st->index; - st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = film->audio_type; st->codec->codec_tag = 1; st->codec->channels = film->audio_channels; - st->codec->bits_per_sample = film->audio_bits; + st->codec->bits_per_coded_sample = film->audio_bits; st->codec->sample_rate = film->audio_samplerate; st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * - st->codec->bits_per_sample; + st->codec->bits_per_coded_sample; st->codec->block_align = st->codec->channels * - st->codec->bits_per_sample / 8; + st->codec->bits_per_coded_sample / 8; } /* load the sample table */ - if (get_buffer(pb, scratch, 16) != 16) - return AVERROR_IO; - if (BE_32(&scratch[0]) != STAB_TAG) + if (avio_read(pb, scratch, 16) != 16) + return AVERROR(EIO); + if (AV_RB32(&scratch[0]) != STAB_TAG) return AVERROR_INVALIDDATA; - film->base_clock = BE_32(&scratch[8]); - film->sample_count = BE_32(&scratch[12]); - if(film->sample_count >= UINT_MAX / sizeof(film_sample_t)) + film->base_clock = AV_RB32(&scratch[8]); + film->sample_count = AV_RB32(&scratch[12]); + if(film->sample_count >= UINT_MAX / sizeof(film_sample)) return -1; - film->sample_table = av_malloc(film->sample_count * sizeof(film_sample_t)); + film->sample_table = av_malloc(film->sample_count * sizeof(film_sample)); for(i=0; inb_streams; i++) av_set_pts_info(s->streams[i], 33, 1, film->base_clock); @@ -176,14 +174,14 @@ static int film_read_header(AVFormatContext *s, audio_frame_counter = 0; for (i = 0; i < film->sample_count; i++) { /* load the next sample record and transfer it to an internal struct */ - if (get_buffer(pb, scratch, 16) != 16) { + if (avio_read(pb, scratch, 16) != 16) { av_free(film->sample_table); - return AVERROR_IO; + return AVERROR(EIO); } film->sample_table[i].sample_offset = - data_offset + BE_32(&scratch[0]); - film->sample_table[i].sample_size = BE_32(&scratch[4]); - if (BE_32(&scratch[8]) == 0xFFFFFFFF) { + data_offset + AV_RB32(&scratch[0]); + film->sample_table[i].sample_size = AV_RB32(&scratch[4]); + if (AV_RB32(&scratch[8]) == 0xFFFFFFFF) { film->sample_table[i].stream = film->audio_stream_index; film->sample_table[i].pts = audio_frame_counter; film->sample_table[i].pts *= film->base_clock; @@ -193,7 +191,7 @@ static int film_read_header(AVFormatContext *s, (film->audio_channels * film->audio_bits / 8)); } else { film->sample_table[i].stream = film->video_stream_index; - film->sample_table[i].pts = BE_32(&scratch[8]) & 0x7FFFFFFF; + film->sample_table[i].pts = AV_RB32(&scratch[8]) & 0x7FFFFFFF; film->sample_table[i].keyframe = (scratch[8] & 0x80) ? 0 : 1; } } @@ -206,15 +204,15 @@ static int film_read_header(AVFormatContext *s, static int film_read_packet(AVFormatContext *s, AVPacket *pkt) { - FilmDemuxContext *film = (FilmDemuxContext *)s->priv_data; - ByteIOContext *pb = &s->pb; - film_sample_t *sample; + FilmDemuxContext *film = s->priv_data; + AVIOContext *pb = s->pb; + film_sample *sample; int ret = 0; int i; int left, right; if (film->current_sample >= film->sample_count) - return AVERROR_IO; + return AVERROR(EIO); sample = &film->sample_table[film->current_sample]; @@ -226,14 +224,14 @@ static int film_read_packet(AVFormatContext *s, (film->video_type == CODEC_ID_CINEPAK)) { pkt->pos= url_ftell(pb); if (av_new_packet(pkt, sample->sample_size)) - return AVERROR_NOMEM; - get_buffer(pb, pkt->data, sample->sample_size); + return AVERROR(ENOMEM); + avio_read(pb, pkt->data, sample->sample_size); } else if ((sample->stream == film->audio_stream_index) && (film->audio_channels == 2)) { /* stereo PCM needs to be interleaved */ if (av_new_packet(pkt, sample->sample_size)) - return AVERROR_NOMEM; + return AVERROR(ENOMEM); /* make sure the interleave buffer is large enough */ if (sample->sample_size > film->stereo_buffer_size) { @@ -243,9 +241,9 @@ static int film_read_packet(AVFormatContext *s, } pkt->pos= url_ftell(pb); - ret = get_buffer(pb, film->stereo_buffer, sample->sample_size); + ret = avio_read(pb, film->stereo_buffer, sample->sample_size); if (ret != sample->sample_size) - ret = AVERROR_IO; + ret = AVERROR(EIO); left = 0; right = sample->sample_size / 2; @@ -263,7 +261,7 @@ static int film_read_packet(AVFormatContext *s, } else { ret= av_get_packet(pb, pkt, sample->sample_size); if (ret != sample->sample_size) - ret = AVERROR_IO; + ret = AVERROR(EIO); } pkt->stream_index = sample->stream; @@ -276,7 +274,7 @@ static int film_read_packet(AVFormatContext *s, static int film_read_close(AVFormatContext *s) { - FilmDemuxContext *film = (FilmDemuxContext *)s->priv_data; + FilmDemuxContext *film = s->priv_data; av_free(film->sample_table); av_free(film->stereo_buffer); @@ -284,9 +282,9 @@ static int film_read_close(AVFormatContext *s) return 0; } -AVInputFormat segafilm_demuxer = { +AVInputFormat ff_segafilm_demuxer = { "film_cpk", - "Sega FILM/CPK format", + NULL_IF_CONFIG_SMALL("Sega FILM/CPK format"), sizeof(FilmDemuxContext), film_probe, film_read_header,