*/
/**
- * @file tiertexseq.c
+ * @file libavformat/tiertexseq.c
* Tiertex Limited SEQ file demuxer
*/
/* there's no real header in a .seq file, the only thing they have in common */
/* is the first 256 bytes of the file which are always filled with 0 */
for (i = 0; i < 256; i++)
- if (p->buf[i] != 0)
+ if (p->buf[i])
return 0;
if(p->buf[256]==0 && p->buf[257]==0)
return AVERROR_INVALIDDATA;
seq_buffer = &seq->frame_buffers[buffer_num];
- if (seq_buffer->fill_size + data_size > seq_buffer->data_size)
+ if (seq_buffer->fill_size + data_size > seq_buffer->data_size || data_size <= 0)
return AVERROR_INVALIDDATA;
url_fseek(pb, seq->current_frame_offs + data_offs, SEEK_SET);
if (get_buffer(pb, seq_buffer->data + seq_buffer->fill_size, data_size) != data_size)
- return AVERROR_IO;
+ return AVERROR(EIO);
seq_buffer->fill_size += data_size;
return 0;
/* sound data */
seq->current_audio_data_offs = get_le16(pb);
- if (seq->current_audio_data_offs != 0) {
+ if (seq->current_audio_data_offs) {
seq->current_audio_data_size = SEQ_AUDIO_BUFFER_SIZE * 2;
} else {
seq->current_audio_data_size = 0;
/* palette data */
seq->current_pal_data_offs = get_le16(pb);
- if (seq->current_pal_data_offs != 0) {
+ if (seq->current_pal_data_offs) {
seq->current_pal_data_size = 768;
} else {
seq->current_pal_data_size = 0;
offset_table[i] = get_le16(pb);
for (i = 0; i < 3; i++) {
- if (offset_table[i] != 0) {
- for (e = i + 1; e < 4 && offset_table[e] == 0; e++);
+ if (offset_table[i]) {
+ for (e = i + 1; e < 3 && offset_table[e] == 0; e++);
err = seq_fill_buffer(seq, pb, buffer_num[1 + i],
offset_table[i],
offset_table[e] - offset_table[i]);
- if (err != 0)
+ if (err)
return err;
}
}
{
int i, rc;
SeqDemuxContext *seq = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVStream *st;
/* init internal buffers */
st->codec->codec_tag = 0; /* no tag */
st->codec->channels = 1;
st->codec->sample_rate = SEQ_SAMPLE_RATE;
- st->codec->bits_per_sample = 16;
- st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_sample * st->codec->channels;
- st->codec->block_align = st->codec->channels * st->codec->bits_per_sample;
+ st->codec->bits_per_coded_sample = 16;
+ st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample * st->codec->channels;
+ st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
return 0;
}
{
int rc;
SeqDemuxContext *seq = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
if (!seq->audio_buffer_full) {
rc = seq_parse_frame_data(seq, pb);
return AVERROR(ENOMEM);
pkt->data[0] = 0;
- if (seq->current_pal_data_size != 0) {
+ if (seq->current_pal_data_size) {
pkt->data[0] |= 1;
url_fseek(pb, seq->current_frame_offs + seq->current_pal_data_offs, SEEK_SET);
if (get_buffer(pb, &pkt->data[1], seq->current_pal_data_size) != seq->current_pal_data_size)
- return AVERROR_IO;
+ return AVERROR(EIO);
}
- if (seq->current_video_data_size != 0) {
+ if (seq->current_video_data_size) {
pkt->data[0] |= 2;
memcpy(&pkt->data[1 + seq->current_pal_data_size],
seq->current_video_data_ptr,
/* audio packet */
if (seq->current_audio_data_offs == 0) /* end of data reached */
- return AVERROR_IO;
+ return AVERROR(EIO);
url_fseek(pb, seq->current_frame_offs + seq->current_audio_data_offs, SEEK_SET);
rc = av_get_packet(pb, pkt, seq->current_audio_data_size);
return rc;
pkt->stream_index = seq->audio_stream_index;
- pkt->pts = seq->current_frame_pts++;
+ seq->current_frame_pts++;
seq->audio_buffer_full = 0;
return 0;
AVInputFormat tiertexseq_demuxer = {
"tiertexseq",
- "Tiertex Limited SEQ format",
+ NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ format"),
sizeof(SeqDemuxContext),
seq_probe,
seq_read_header,