*/
/**
- * @file segafilm.c
+ * @file libavformat/segafilm.c
* 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')
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;
AVFormatParameters *ap)
{
FilmDemuxContext *film = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVStream *st;
unsigned char scratch[256];
int i;
/* normal Saturn .cpk files; 32-byte header */
if (get_buffer(pb, scratch, 32) != 32)
return AVERROR(EIO);
- film->audio_samplerate = AV_RB16(&scratch[24]);;
+ film->audio_samplerate = AV_RB16(&scratch[24]);
film->audio_channels = scratch[21];
film->audio_bits = scratch[22];
if (film->audio_bits == 8)
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 (AV_RB32(&scratch[0]) != FDSC_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->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 */
return AVERROR_INVALIDDATA;
film->base_clock = AV_RB32(&scratch[8]);
film->sample_count = AV_RB32(&scratch[12]);
- if(film->sample_count >= UINT_MAX / sizeof(film_sample_t))
+ 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; i<s->nb_streams; i++)
av_set_pts_info(s->streams[i], 33, 1, film->base_clock);
AVPacket *pkt)
{
FilmDemuxContext *film = s->priv_data;
- ByteIOContext *pb = &s->pb;
- film_sample_t *sample;
+ ByteIOContext *pb = s->pb;
+ film_sample *sample;
int ret = 0;
int i;
int left, right;
AVInputFormat segafilm_demuxer = {
"film_cpk",
- "Sega FILM/CPK format",
+ NULL_IF_CONFIG_SMALL("Sega FILM/CPK format"),
sizeof(FilmDemuxContext),
film_probe,
film_read_header,