virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/cdxl: add back options to override sample and frame rate

Browse Source 
It make sense to allow to control speed of playback when
no infomation is provided.
This commit is contained in:
Paul B Mahol 2021-02-05 18:06:28 +01:00
parent 2a2f685613
commit 6b8ef5119c
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/cdxl.c
View File

@ -33,6 +33,8 @@ typedef struct CDXLDemuxContext {
int read_chunk; int read_chunk;
AVRational frate; AVRational frate;
int srate; int srate;
AVRational frame_rate;
int sample_rate;
uint8_t header[CDXL_HEADER_SIZE]; uint8_t header[CDXL_HEADER_SIZE];
int video_stream_index; int video_stream_index;
int audio_stream_index; int audio_stream_index;
@ -143,7 +145,7 @@ static int cdxl_read_packet(AVFormatContext *s, AVPacket *pkt)
audio_size = AV_RB16(&cdxl->header[22]) * channels; audio_size = AV_RB16(&cdxl->header[22]) * channels;
cdxl->srate = AV_RB16(&cdxl->header[24]); cdxl->srate = AV_RB16(&cdxl->header[24]);
if (!cdxl->srate && audio_size) if (!cdxl->srate && audio_size)
cdxl->srate = 11025; cdxl->srate = cdxl->sample_rate;
cdxl->frate.num = cdxl->header[26]; cdxl->frate.num = cdxl->header[26];
cdxl->frate.den = 1; cdxl->frate.den = 1;
if (cdxl->header[19] == 0 || if (cdxl->header[19] == 0 ||
@ -164,7 +166,7 @@ static int cdxl_read_packet(AVFormatContext *s, AVPacket *pkt)
if (!cdxl->frate.num && audio_size && cdxl->srate > 0) { if (!cdxl->frate.num && audio_size && cdxl->srate > 0) {
cdxl->frate = (AVRational){ cdxl->srate, audio_size }; cdxl->frate = (AVRational){ cdxl->srate, audio_size };
} else if (!cdxl->frate.num) { } else if (!cdxl->frate.num) {
cdxl->frate.num = 15; cdxl->frate = cdxl->frame_rate;
} }
if (cdxl->read_chunk && audio_size) { if (cdxl->read_chunk && audio_size) {
@ -242,10 +244,25 @@ static int read_seek(AVFormatContext *s, int stream_index,
return -1; return -1;
} }
#define OFFSET(x) offsetof(CDXLDemuxContext, x)
static const AVOption cdxl_options[] = {
{ "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 },
};
static const AVClass cdxl_demuxer_class = {
.class_name = "CDXL demuxer",
.item_name = av_default_item_name,
.option = cdxl_options,
.version = LIBAVUTIL_VERSION_INT,
};
AVInputFormat ff_cdxl_demuxer = { AVInputFormat ff_cdxl_demuxer = {
.name = "cdxl", .name = "cdxl",
.long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"), .long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"),
.priv_data_size = sizeof(CDXLDemuxContext), .priv_data_size = sizeof(CDXLDemuxContext),
.priv_class = &cdxl_demuxer_class,
.read_probe = cdxl_read_probe, .read_probe = cdxl_read_probe,
.read_header = cdxl_read_header, .read_header = cdxl_read_header,
.read_packet = cdxl_read_packet, .read_packet = cdxl_read_packet,