*/
/**
- * @file 4xm.c
+ * @file libavformat/4xm.c
* 4X Technologies file demuxer
* by Mike Melanson (melanson@pcisys.net)
* for more information on the .4xm file format, visit:
int channels;
int stream_index;
int adpcm;
+ int64_t audio_pts;
} AudioTrack;
typedef struct FourxmDemuxContext {
int video_stream_index;
int track_count;
AudioTrack *tracks;
- int selected_track;
- int64_t audio_pts;
int64_t video_pts;
float fps;
} FourxmDemuxContext;
int header_size;
FourxmDemuxContext *fourxm = s->priv_data;
unsigned char *header;
- int i;
- int current_track = -1;
+ int i, ret;
AVStream *st;
fourxm->track_count = 0;
fourxm->tracks = NULL;
- fourxm->selected_track = 0;
fourxm->fps = 1.0;
/* skip the first 3 32-bit numbers */
/* check for LIST-HEAD */
GET_LIST_HEADER();
header_size = size - 4;
- if (fourcc_tag != HEAD_TAG || size < 4)
+ if (fourcc_tag != HEAD_TAG || header_size < 0)
return AVERROR_INVALIDDATA;
/* allocate space for the header and load the whole thing */
header = av_malloc(header_size);
if (!header)
return AVERROR(ENOMEM);
- if (get_buffer(pb, header, header_size) != header_size)
+ if (get_buffer(pb, header, header_size) != header_size){
+ av_free(header);
return AVERROR(EIO);
+ }
/* take the lazy approach and search for any and all vtrk and strk chunks */
for (i = 0; i < header_size - 8; i++) {
} else if (fourcc_tag == vtrk_TAG) {
/* check that there is enough data */
if (size != vtrk_SIZE) {
- av_free(header);
- return AVERROR_INVALIDDATA;
+ ret= AVERROR_INVALIDDATA;
+ goto fail;
}
- fourxm->width = AV_RL32(&header[i + 36]);
+ fourxm->width = AV_RL32(&header[i + 36]);
fourxm->height = AV_RL32(&header[i + 40]);
/* allocate a new AVStream */
st = av_new_stream(s, 0);
- if (!st)
- return AVERROR(ENOMEM);
+ if (!st){
+ ret= AVERROR(ENOMEM);
+ goto fail;
+ }
av_set_pts_info(st, 60, 1, fourxm->fps);
fourxm->video_stream_index = st->index;
st->codec->extradata_size = 4;
st->codec->extradata = av_malloc(4);
AV_WL32(st->codec->extradata, AV_RL32(&header[i + 16]));
- st->codec->width = fourxm->width;
+ st->codec->width = fourxm->width;
st->codec->height = fourxm->height;
i += 8 + size;
} else if (fourcc_tag == strk_TAG) {
+ int current_track;
/* check that there is enough data */
if (size != strk_SIZE) {
- av_free(header);
- return AVERROR_INVALIDDATA;
+ ret= AVERROR_INVALIDDATA;
+ goto fail;
}
current_track = AV_RL32(&header[i + 8]);
+ if((unsigned)current_track >= UINT_MAX / sizeof(AudioTrack) - 1){
+ av_log(s, AV_LOG_ERROR, "current_track too large\n");
+ ret= -1;
+ goto fail;
+ }
if (current_track + 1 > fourxm->track_count) {
fourxm->track_count = current_track + 1;
- if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack))
- return -1;
fourxm->tracks = av_realloc(fourxm->tracks,
fourxm->track_count * sizeof(AudioTrack));
if (!fourxm->tracks) {
- av_free(header);
- return AVERROR(ENOMEM);
+ ret= AVERROR(ENOMEM);
+ goto fail;
}
}
- fourxm->tracks[current_track].adpcm = AV_RL32(&header[i + 12]);
- fourxm->tracks[current_track].channels = AV_RL32(&header[i + 36]);
+ fourxm->tracks[current_track].adpcm = AV_RL32(&header[i + 12]);
+ fourxm->tracks[current_track].channels = AV_RL32(&header[i + 36]);
fourxm->tracks[current_track].sample_rate = AV_RL32(&header[i + 40]);
- fourxm->tracks[current_track].bits = AV_RL32(&header[i + 44]);
+ fourxm->tracks[current_track].bits = AV_RL32(&header[i + 44]);
+ fourxm->tracks[current_track].audio_pts = 0;
i += 8 + size;
/* allocate a new AVStream */
st = av_new_stream(s, current_track);
- if (!st)
- return AVERROR(ENOMEM);
+ if (!st){
+ ret= AVERROR(ENOMEM);
+ goto fail;
+ }
av_set_pts_info(st, 60, 1, fourxm->tracks[current_track].sample_rate);
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_tag = 0;
- st->codec->channels = fourxm->tracks[current_track].channels;
- st->codec->sample_rate = fourxm->tracks[current_track].sample_rate;
+ st->codec->channels = fourxm->tracks[current_track].channels;
+ st->codec->sample_rate = fourxm->tracks[current_track].sample_rate;
st->codec->bits_per_coded_sample = fourxm->tracks[current_track].bits;
- st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
+ st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
st->codec->bits_per_coded_sample;
st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
- if (fourxm->tracks[current_track].adpcm)
+ if (fourxm->tracks[current_track].adpcm){
st->codec->codec_id = CODEC_ID_ADPCM_4XM;
- else if (st->codec->bits_per_coded_sample == 8)
+ }else if (st->codec->bits_per_coded_sample == 8){
st->codec->codec_id = CODEC_ID_PCM_U8;
- else
+ }else
st->codec->codec_id = CODEC_ID_PCM_S16LE;
}
}
- av_free(header);
-
/* skip over the LIST-MOVI chunk (which is where the stream should be */
GET_LIST_HEADER();
- if (fourcc_tag != MOVI_TAG)
- return AVERROR_INVALIDDATA;
+ if (fourcc_tag != MOVI_TAG){
+ ret= AVERROR_INVALIDDATA;
+ goto fail;
+ }
+ av_free(header);
/* initialize context members */
fourxm->video_pts = -1; /* first frame will push to 0 */
- fourxm->audio_pts = 0;
return 0;
+fail:
+ av_freep(&fourxm->tracks);
+ av_free(header);
+ return ret;
}
static int fourxm_read_packet(AVFormatContext *s,
unsigned int fourcc_tag;
unsigned int size, out_size;
int ret = 0;
- int track_number;
+ unsigned int track_number;
int packet_read = 0;
unsigned char header[8];
int audio_frame_count;
case ifr2_TAG:
case pfr2_TAG:
case cfr2_TAG:
- {
-
/* allocate 8 more bytes than 'size' to account for fourcc
* and size */
if (size + 8 < size || av_new_packet(pkt, size + 8))
memcpy(pkt->data, header, 8);
ret = get_buffer(s->pb, &pkt->data[8], size);
- if (ret < 0)
+ if (ret < 0){
av_free_packet(pkt);
- else
+ }else
packet_read = 1;
break;
- }
case snd__TAG:
track_number = get_le32(pb);
out_size= get_le32(pb);
size-=8;
- if (track_number == fourxm->selected_track) {
+ if (track_number < fourxm->track_count) {
ret= av_get_packet(s->pb, pkt, size);
if(ret<0)
return AVERROR(EIO);
pkt->stream_index =
- fourxm->tracks[fourxm->selected_track].stream_index;
- pkt->pts = fourxm->audio_pts;
+ fourxm->tracks[track_number].stream_index;
+ pkt->pts = fourxm->tracks[track_number].audio_pts;
packet_read = 1;
/* pts accounting */
audio_frame_count = size;
- if (fourxm->tracks[fourxm->selected_track].adpcm)
+ if (fourxm->tracks[track_number].adpcm)
audio_frame_count -=
- 2 * (fourxm->tracks[fourxm->selected_track].channels);
+ 2 * (fourxm->tracks[track_number].channels);
audio_frame_count /=
- fourxm->tracks[fourxm->selected_track].channels;
- if (fourxm->tracks[fourxm->selected_track].adpcm)
+ fourxm->tracks[track_number].channels;
+ if (fourxm->tracks[track_number].adpcm){
audio_frame_count *= 2;
- else
+ }else
audio_frame_count /=
- (fourxm->tracks[fourxm->selected_track].bits / 8);
- fourxm->audio_pts += audio_frame_count;
+ (fourxm->tracks[track_number].bits / 8);
+ fourxm->tracks[track_number].audio_pts += audio_frame_count;
} else {
url_fseek(pb, size, SEEK_CUR);
{
FourxmDemuxContext *fourxm = s->priv_data;
- av_free(fourxm->tracks);
+ av_freep(&fourxm->tracks);
return 0;
}
projects / frescor / ffmpeg.git / blobdiff