har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/pcmdec: add support to set channel layout

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2022-03-18 19:24:58 +01:00 committed by James Almer
parent 327efa6633
commit fce0127642
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/pcmdec.c
View File

@ -22,6 +22,7 @@
#include "config_components.h" #include "config_components.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/channel_layout.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "pcm.h" #include "pcm.h"
@ -33,6 +34,7 @@ typedef struct PCMAudioDemuxerContext {
AVClass *class; AVClass *class;
int sample_rate; int sample_rate;
int channels; int channels;
AVChannelLayout ch_layout;
} PCMAudioDemuxerContext; } PCMAudioDemuxerContext;
static int pcm_read_header(AVFormatContext *s) static int pcm_read_header(AVFormatContext *s)
@ -50,7 +52,13 @@ static int pcm_read_header(AVFormatContext *s)
par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_type = AVMEDIA_TYPE_AUDIO;
par->codec_id = s->iformat->raw_codec_id; par->codec_id = s->iformat->raw_codec_id;
par->sample_rate = s1->sample_rate; par->sample_rate = s1->sample_rate;
if (s1->channels)
par->ch_layout.nb_channels = s1->channels; par->ch_layout.nb_channels = s1->channels;
else {
int ret = av_channel_layout_copy(&par->ch_layout, &s1->ch_layout);
if (ret < 0)
return ret;
}
av_opt_get(s->pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type); av_opt_get(s->pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type);
if (mime_type && s->iformat->mime_type) { if (mime_type && s->iformat->mime_type) {
@ -78,8 +86,10 @@ static int pcm_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
par->sample_rate = rate; par->sample_rate = rate;
if (channels > 0) if (channels > 0) {
av_channel_layout_uninit(&par->ch_layout);
par->ch_layout.nb_channels = channels; par->ch_layout.nb_channels = channels;
}
if (little_endian) if (little_endian)
par->codec_id = AV_CODEC_ID_PCM_S16LE; par->codec_id = AV_CODEC_ID_PCM_S16LE;
} }
@ -98,7 +108,8 @@ static int pcm_read_header(AVFormatContext *s)
static const AVOption pcm_options[] = { static const AVOption pcm_options[] = {
{ "sample_rate", "", offsetof(PCMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 44100}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, { "sample_rate", "", offsetof(PCMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 44100}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, { "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ "ch_layout", "", offsetof(PCMAudioDemuxerContext, ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = "mono"}, 0, 0, AV_OPT_FLAG_DECODING_PARAM },
{ NULL }, { NULL },
}; };
static const AVClass pcm_demuxer_class = { static const AVClass pcm_demuxer_class = {

2
libavformat/version.h
View File

@ -32,7 +32,7 @@
#include "version_major.h" #include "version_major.h"
#define LIBAVFORMAT_VERSION_MINOR 20 #define LIBAVFORMAT_VERSION_MINOR 20
#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \