highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flv: convert to new channel layout API

Browse Source 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Vittorio Giovara
2017-03-31 14:04:07 +02:00
committed by James Almer
parent ce5165f8ad
commit 53a132f0c5
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/flvenc.c
View File

@@ -138,7 +138,7 @@ static int get_audio_flags(AVFormatContext *s, AVCodecParameters *par)
"FLV only supports wideband (16kHz) Speex audio\n");
return AVERROR(EINVAL);
}
if (par->channels != 1) {
if (par->ch_layout.nb_channels != 1) {
av_log(s, AV_LOG_ERROR, "FLV only supports mono Speex audio\n");
return AVERROR(EINVAL);
}
@@ -178,7 +178,7 @@ error:
}
}
if (par->channels > 1)
if (par->ch_layout.nb_channels > 1)
flags |= FLV_STEREO;
switch (par->codec_id) {
@@ -342,7 +342,7 @@ static void write_metadata(AVFormatContext *s, unsigned int ts)
put_amf_double(pb, flv->audio_par->codec_id == AV_CODEC_ID_PCM_U8 ? 8 : 16);
put_amf_string(pb, "stereo");
put_amf_bool(pb, flv->audio_par->channels == 2);
put_amf_bool(pb, flv->audio_par->ch_layout.nb_channels == 2);
put_amf_string(pb, "audiocodecid");
put_amf_double(pb, flv->audio_par->codec_tag);
@@ -507,8 +507,8 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i
if (!par->extradata_size && (flv->flags & FLV_AAC_SEQ_HEADER_DETECT)) {
PutBitContext pbc;
int samplerate_index;
int channels = flv->audio_par->channels
- (flv->audio_par->channels == 8 ? 1 : 0);
int channels = flv->audio_par->ch_layout.nb_channels
- (flv->audio_par->ch_layout.nb_channels == 8 ? 1 : 0);
uint8_t data[2];
for (samplerate_index = 0; samplerate_index < 16;