typedef struct CDXLDemuxContext {
AVClass *class;
- int sample_rate;
- char *framerate;
- AVRational fps;
int read_chunk;
+ AVRational frate;
+ int srate;
+ AVRational frame_rate;
+ int sample_rate;
uint8_t header[CDXL_HEADER_SIZE];
int video_stream_index;
int audio_stream_index;
int64_t filesize;
+ int64_t pos;
} CDXLDemuxContext;
-static int cdxl_read_probe(AVProbeData *p)
+static int cdxl_read_probe(const AVProbeData *p)
{
int score = AVPROBE_SCORE_EXTENSION + 10;
+ const uint8_t *buf = p->buf;
if (p->buf_size < CDXL_HEADER_SIZE)
return 0;
- /* reserved bytes should always be set to 0 */
- if (AV_RN64(&p->buf[24]) || AV_RN16(&p->buf[10]))
+ /* check type */
+ if (buf[0] > 1)
return 0;
- /* check type */
- if (p->buf[0] != 1)
+ /* reserved bytes should always be set to 0 */
+ if (AV_RL24(&buf[29]))
return 0;
/* check palette size */
- if (AV_RB16(&p->buf[20]) > 512)
+ if (!AV_RN16(&buf[20]))
+ return 0;
+ if (buf[0] == 1 && AV_RB16(&buf[20]) > 512)
+ return 0;
+ if (buf[0] == 0 && AV_RB16(&buf[20]) > 768)
+ return 0;
+
+ if (!AV_RN16(&buf[22]) && AV_RN16(&buf[24]))
+ return 0;
+
+ if (buf[0] == 0 && (!buf[26] || !AV_RB16(&buf[24])))
return 0;
/* check number of planes */
- if (p->buf[18] || !p->buf[19])
+ if (buf[19] != 6 && buf[19] != 8 && buf[19] != 24)
+ return 0;
+
+ if (buf[18])
return 0;
/* check widh and height */
- if (!AV_RN16(&p->buf[14]) || !AV_RN16(&p->buf[16]))
+ if (AV_RB16(&buf[14]) > 640 || AV_RB16(&buf[16]) > 480 ||
+ AV_RB16(&buf[14]) == 0 || AV_RB16(&buf[16]) == 0)
return 0;
/* chunk size */
- if (AV_RB32(&p->buf[2]) < AV_RB16(&p->buf[22]) + AV_RB16(&p->buf[20]) + CDXL_HEADER_SIZE)
+ if (AV_RB32(&buf[2]) <= AV_RB16(&buf[20]) + AV_RB16(&buf[22]) * (1 + !!(buf[1] & 0x10)) + CDXL_HEADER_SIZE)
return 0;
/* previous chunk size */
- if (AV_RN32(&p->buf[6]))
+ if (AV_RN32(&buf[6]))
score /= 2;
/* current frame number, usually starts from 1 */
- if (AV_RB16(&p->buf[12]) != 1)
+ if (AV_RB32(&buf[10]) != 1)
score /= 2;
return score;
static int cdxl_read_header(AVFormatContext *s)
{
CDXLDemuxContext *cdxl = s->priv_data;
- int ret;
-
- if (cdxl->framerate && (ret = av_parse_video_rate(&cdxl->fps, cdxl->framerate)) < 0) {
- av_log(s, AV_LOG_ERROR,
- "Could not parse framerate: %s.\n", cdxl->framerate);
- return ret;
- }
cdxl->read_chunk = 0;
cdxl->video_stream_index = -1;
AVIOContext *pb = s->pb;
uint32_t current_size, video_size, image_size;
uint16_t audio_size, palette_size, width, height;
- int64_t pos;
- int format, frames, ret;
+ int channels, type, format, ret;
if (avio_feof(pb))
return AVERROR_EOF;
- pos = avio_tell(pb);
- if (!cdxl->read_chunk &&
- avio_read(pb, cdxl->header, CDXL_HEADER_SIZE) != CDXL_HEADER_SIZE)
- return AVERROR_EOF;
- if (cdxl->header[0] != 1) {
- av_log(s, AV_LOG_ERROR, "non-standard cdxl file\n");
+ if (!cdxl->read_chunk) {
+ cdxl->pos = avio_tell(pb);
+ if (avio_read(pb, cdxl->header, CDXL_HEADER_SIZE) != CDXL_HEADER_SIZE)
+ return AVERROR_EOF;
+ }
+ if (cdxl->header[0] > 1) {
+ av_log(s, AV_LOG_ERROR, "unsupported cdxl file\n");
return AVERROR_INVALIDDATA;
}
+ type = cdxl->header[0];
+ channels = 1 + !!(cdxl->header[1] & 0x10);
format = cdxl->header[1] & 0xE0;
current_size = AV_RB32(&cdxl->header[2]);
width = AV_RB16(&cdxl->header[14]);
height = AV_RB16(&cdxl->header[16]);
palette_size = AV_RB16(&cdxl->header[20]);
- audio_size = AV_RB16(&cdxl->header[22]);
- if (FFALIGN(width, 16) * (uint64_t)height * cdxl->header[19] > INT_MAX)
+ audio_size = AV_RB16(&cdxl->header[22]) * channels;
+ cdxl->srate = AV_RB16(&cdxl->header[24]);
+ if (!cdxl->srate && audio_size)
+ cdxl->srate = cdxl->sample_rate;
+ cdxl->frate.num = cdxl->header[26];
+ cdxl->frate.den = 1;
+ if (cdxl->header[19] == 0 ||
+ FFALIGN(width, 16) * (uint64_t)height * cdxl->header[19] > INT_MAX)
return AVERROR_INVALIDDATA;
if (format == 0x20)
image_size = width * height * cdxl->header[19] / 8;
image_size = FFALIGN(width, 16) * height * cdxl->header[19] / 8;
video_size = palette_size + image_size;
- if (palette_size > 512)
+ if ((type == 1 && palette_size > 512) ||
+ (type == 0 && palette_size > 768))
return AVERROR_INVALIDDATA;
if (current_size < (uint64_t)audio_size + video_size + CDXL_HEADER_SIZE)
return AVERROR_INVALIDDATA;
+ if (!cdxl->frate.num && audio_size && cdxl->srate > 0) {
+ cdxl->frate = (AVRational){ cdxl->srate, audio_size };
+ } else if (!cdxl->frate.num) {
+ cdxl->frate = cdxl->frame_rate;
+ }
+
if (cdxl->read_chunk && audio_size) {
if (cdxl->audio_stream_index == -1) {
AVStream *st = avformat_new_stream(s, NULL);
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_tag = 0;
- st->codecpar->codec_id = AV_CODEC_ID_PCM_S8;
- if (cdxl->header[1] & 0x10) {
- st->codecpar->channels = 2;
- st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO;
- } else {
- st->codecpar->channels = 1;
- st->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
- }
- st->codecpar->sample_rate = cdxl->sample_rate;
+ st->codecpar->codec_id = AV_CODEC_ID_PCM_S8_PLANAR;
+ st->codecpar->channels = channels;
+ st->codecpar->channel_layout = channels == 2 ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
+ st->codecpar->sample_rate= cdxl->srate;
st->start_time = 0;
cdxl->audio_stream_index = st->index;
- avpriv_set_pts_info(st, 64, 1, cdxl->sample_rate);
+ avpriv_set_pts_info(st, 64, 1, cdxl->srate);
+ if (current_size && cdxl->filesize > 0 && audio_size > 0)
+ st->duration = (cdxl->filesize / current_size) * audio_size / channels;
}
ret = av_get_packet(pb, pkt, audio_size);
if (ret < 0)
return ret;
pkt->stream_index = cdxl->audio_stream_index;
- pkt->pos = pos;
- pkt->duration = audio_size;
+ pkt->pos = cdxl->pos;
+ pkt->duration = audio_size / channels;
cdxl->read_chunk = 0;
} else {
if (cdxl->video_stream_index == -1) {
st->codecpar->width = width;
st->codecpar->height = height;
- if (audio_size + video_size && cdxl->filesize > 0) {
- frames = cdxl->filesize / (audio_size + video_size);
-
- if(cdxl->framerate)
- st->duration = frames;
- else
- st->duration = frames * (int64_t)audio_size;
- }
+ if (current_size && cdxl->filesize > 0)
+ st->nb_frames = cdxl->filesize / current_size;
st->start_time = 0;
cdxl->video_stream_index = st->index;
- if (cdxl->framerate)
- avpriv_set_pts_info(st, 64, cdxl->fps.den, cdxl->fps.num);
- else
- avpriv_set_pts_info(st, 64, 1, cdxl->sample_rate);
+ avpriv_set_pts_info(st, 64, cdxl->frate.den, cdxl->frate.num);
}
- if (av_new_packet(pkt, video_size + CDXL_HEADER_SIZE) < 0)
- return AVERROR(ENOMEM);
+ if ((ret = av_new_packet(pkt, video_size + CDXL_HEADER_SIZE)) < 0)
+ return ret;
memcpy(pkt->data, cdxl->header, CDXL_HEADER_SIZE);
ret = avio_read(pb, pkt->data + CDXL_HEADER_SIZE, video_size);
if (ret < 0) {
- av_packet_unref(pkt);
return ret;
}
av_shrink_packet(pkt, CDXL_HEADER_SIZE + ret);
pkt->stream_index = cdxl->video_stream_index;
pkt->flags |= AV_PKT_FLAG_KEY;
- pkt->pos = pos;
- pkt->duration = cdxl->framerate ? 1 : audio_size ? audio_size : 220;
+ pkt->pos = cdxl->pos;
+ pkt->duration = 1;
cdxl->read_chunk = audio_size;
}
return ret;
}
+static int read_seek(AVFormatContext *s, int stream_index,
+ int64_t timestamp, int flags)
+{
+ CDXLDemuxContext *cdxl = s->priv_data;
+
+ cdxl->read_chunk = 0;
+
+ return -1;
+}
+
#define OFFSET(x) offsetof(CDXLDemuxContext, x)
static const AVOption cdxl_options[] = {
- { "sample_rate", "", OFFSET(sample_rate), AV_OPT_TYPE_INT, { .i64 = 11025 }, 1, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
- { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_DECODING_PARAM },
+ { "sample_rate", "", OFFSET(sample_rate), AV_OPT_TYPE_INT, { .i64=11025 }, 8000, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
+ { "frame_rate", "", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, { .str="15" }, 1, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ NULL },
};
.version = LIBAVUTIL_VERSION_INT,
};
-AVInputFormat ff_cdxl_demuxer = {
+const AVInputFormat ff_cdxl_demuxer = {
.name = "cdxl",
.long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"),
.priv_data_size = sizeof(CDXLDemuxContext),
+ .priv_class = &cdxl_demuxer_class,
.read_probe = cdxl_read_probe,
.read_header = cdxl_read_header,
.read_packet = cdxl_read_packet,
+ .read_seek = read_seek,
.extensions = "cdxl,xl",
.flags = AVFMT_GENERIC_INDEX,
- .priv_class = &cdxl_demuxer_class,
};
projects / ffmpeg / blobdiff