RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libopenmpt: convert to new channel layout API 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2022-01-17 13:42:13 -03:00
parent eac3a902a4
commit 51c2c6ff59
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/libopenmpt.c
View File

@ -40,11 +40,10 @@ typedef struct OpenMPTContext {
const AVClass *class; const AVClass *class;
openmpt_module *module; openmpt_module *module;
int channels;
double duration; double duration;
/* options */ /* options */
int sample_rate; int sample_rate;
int64_t layout; AVChannelLayout ch_layout;
int subsong; int subsong;
} OpenMPTContext; } OpenMPTContext;
@ -53,7 +52,7 @@ typedef struct OpenMPTContext {
#define D AV_OPT_FLAG_DECODING_PARAM #define D AV_OPT_FLAG_DECODING_PARAM
static const AVOption options[] = { static const AVOption options[] = {
{ "sample_rate", "set sample rate", OFFSET(sample_rate), AV_OPT_TYPE_INT, { .i64 = 48000 }, 1000, INT_MAX, A | D }, { "sample_rate", "set sample rate", OFFSET(sample_rate), AV_OPT_TYPE_INT, { .i64 = 48000 }, 1000, INT_MAX, A | D },
{ "layout", "set channel layout", OFFSET(layout), AV_OPT_TYPE_CHANNEL_LAYOUT, { .i64 = AV_CH_LAYOUT_STEREO }, 0, INT64_MAX, A | D }, { "layout", "set channel layout", OFFSET(ch_layout), AV_OPT_TYPE_CHLAYOUT, { .str = "stereo" }, 0, 0, A | D },
{ "subsong", "set subsong", OFFSET(subsong), AV_OPT_TYPE_INT, { .i64 = -2 }, -2, INT_MAX, A | D, "subsong"}, { "subsong", "set subsong", OFFSET(subsong), AV_OPT_TYPE_INT, { .i64 = -2 }, -2, INT_MAX, A | D, "subsong"},
{ "all", "all", 0, AV_OPT_TYPE_CONST, { .i64 = -1}, 0, 0, A | D, "subsong" }, { "all", "all", 0, AV_OPT_TYPE_CONST, { .i64 = -1}, 0, 0, A | D, "subsong" },
{ "auto", "auto", 0, AV_OPT_TYPE_CONST, { .i64 = -2}, 0, 0, A | D, "subsong" }, { "auto", "auto", 0, AV_OPT_TYPE_CONST, { .i64 = -2}, 0, 0, A | D, "subsong" },
@ -120,8 +119,6 @@ static int read_header_openmpt(AVFormatContext *s)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
#endif #endif
openmpt->channels = av_get_channel_layout_nb_channels(openmpt->layout);
if (openmpt->subsong >= openmpt_module_get_num_subsongs(openmpt->module)) { if (openmpt->subsong >= openmpt_module_get_num_subsongs(openmpt->module)) {
av_log(s, AV_LOG_ERROR, "Invalid subsong index: %d\n", openmpt->subsong); av_log(s, AV_LOG_ERROR, "Invalid subsong index: %d\n", openmpt->subsong);
return AVERROR(EINVAL); return AVERROR(EINVAL);
@ -154,8 +151,10 @@ static int read_header_openmpt(AVFormatContext *s)
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = AV_NE(AV_CODEC_ID_PCM_F32BE, AV_CODEC_ID_PCM_F32LE); st->codecpar->codec_id = AV_NE(AV_CODEC_ID_PCM_F32BE, AV_CODEC_ID_PCM_F32LE);
st->codecpar->channels = openmpt->channels;
st->codecpar->sample_rate = openmpt->sample_rate; st->codecpar->sample_rate = openmpt->sample_rate;
ret = av_channel_layout_copy(&st->codecpar->ch_layout, &openmpt->ch_layout);
if (ret < 0)
return ret;
return 0; return 0;
} }
@ -165,13 +164,13 @@ static int read_header_openmpt(AVFormatContext *s)
static int read_packet_openmpt(AVFormatContext *s, AVPacket *pkt) static int read_packet_openmpt(AVFormatContext *s, AVPacket *pkt)
{ {
OpenMPTContext *openmpt = s->priv_data; OpenMPTContext *openmpt = s->priv_data;
int n_samples = AUDIO_PKT_SIZE / (openmpt->channels ? openmpt->channels*4 : 4); int n_samples = AUDIO_PKT_SIZE / (openmpt->ch_layout.nb_channels ? openmpt->ch_layout.nb_channels*4 : 4);
int ret; int ret;
if ((ret = av_new_packet(pkt, AUDIO_PKT_SIZE)) < 0) if ((ret = av_new_packet(pkt, AUDIO_PKT_SIZE)) < 0)
return ret; return ret;
switch (openmpt->channels) { switch (openmpt->ch_layout.nb_channels) {
case 1: case 1:
ret = openmpt_module_read_float_mono(openmpt->module, openmpt->sample_rate, ret = openmpt_module_read_float_mono(openmpt->module, openmpt->sample_rate,
n_samples, (float *)pkt->data); n_samples, (float *)pkt->data);
@ -185,7 +184,7 @@ static int read_packet_openmpt(AVFormatContext *s, AVPacket *pkt)
n_samples, (float *)pkt->data); n_samples, (float *)pkt->data);
break; break;
default: default:
av_log(s, AV_LOG_ERROR, "Unsupported number of channels: %d", openmpt->channels); av_log(s, AV_LOG_ERROR, "Unsupported number of channels: %d", openmpt->ch_layout.nb_channels);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -194,7 +193,7 @@ static int read_packet_openmpt(AVFormatContext *s, AVPacket *pkt)
return AVERROR_EOF; return AVERROR_EOF;
} }
pkt->size = ret * (openmpt->channels * 4); pkt->size = ret * (openmpt->ch_layout.nb_channels * 4);
return 0; return 0;
} }