X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Faudio_encoder.cpp;h=126e0e2dce19ef40f0406bea7a3d4abed120c731;hb=e4037149c9a6fbbd6b3747cdbd0909c0ca3b6382;hp=0f7f9aac8c957e3d686c87daa863719d102982d1;hpb=9ffd4f03f314cc6e0254449593def95c9bc203d6;p=nageru

diff --git a/nageru/audio_encoder.cpp b/nageru/audio_encoder.cpp
index 0f7f9aa..126e0e2 100644
--- a/nageru/audio_encoder.cpp
+++ b/nageru/audio_encoder.cpp
@@ -29,7 +29,7 @@ using namespace std;
 
 AudioEncoder::AudioEncoder(const string &codec_name, int bit_rate, const AVOutputFormat *oformat)
 {
-	AVCodec *codec = avcodec_find_encoder_by_name(codec_name.c_str());
+	const AVCodec *codec = avcodec_find_encoder_by_name(codec_name.c_str());
 	if (codec == nullptr) {
 		fprintf(stderr, "ERROR: Could not find codec '%s'\n", codec_name.c_str());
 		abort();
@@ -39,8 +39,9 @@ AudioEncoder::AudioEncoder(const string &codec_name, int bit_rate, const AVOutpu
 	ctx->bit_rate = bit_rate;
 	ctx->sample_rate = OUTPUT_FREQUENCY;
 	ctx->sample_fmt = codec->sample_fmts[0];
-	ctx->channels = 2;
-	ctx->channel_layout = AV_CH_LAYOUT_STEREO;
+	ctx->ch_layout.order = AV_CHANNEL_ORDER_NATIVE;
+	ctx->ch_layout.nb_channels = 2;
+	ctx->ch_layout.u.mask = AV_CH_LAYOUT_STEREO;
 	ctx->time_base = AVRational{1, TIMEBASE};
 	if (oformat->flags & AVFMT_GLOBALHEADER) {
 		ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
@@ -50,16 +51,17 @@ AudioEncoder::AudioEncoder(const string &codec_name, int bit_rate, const AVOutpu
 		abort();
 	}
 
-	resampler = swr_alloc_set_opts(nullptr,
-	                               /*out_ch_layout=*/AV_CH_LAYOUT_STEREO,
-	                               /*out_sample_fmt=*/ctx->sample_fmt,
-	                               /*out_sample_rate=*/OUTPUT_FREQUENCY,
-	                               /*in_ch_layout=*/AV_CH_LAYOUT_STEREO,
-	                               /*in_sample_fmt=*/AV_SAMPLE_FMT_FLT,
-	                               /*in_sample_rate=*/OUTPUT_FREQUENCY,
-	                               /*log_offset=*/0,
-	                               /*log_ctx=*/nullptr);
-	if (resampler == nullptr) {
+	resampler = nullptr;
+	int ok = swr_alloc_set_opts2(&resampler,
+	                             /*out_ch_layout=*/&ctx->ch_layout,
+	                             /*out_sample_fmt=*/ctx->sample_fmt,
+	                             /*out_sample_rate=*/OUTPUT_FREQUENCY,
+	                             /*in_ch_layout=*/&ctx->ch_layout,
+	                             /*in_sample_fmt=*/AV_SAMPLE_FMT_FLT,
+	                             /*in_sample_rate=*/OUTPUT_FREQUENCY,
+	                             /*log_offset=*/0,
+	                             /*log_ctx=*/nullptr);
+	if (ok != 0) {
 		fprintf(stderr, "Allocating resampler failed.\n");
 		abort();
 	}
@@ -110,7 +112,9 @@ void AudioEncoder::encode_audio_one_frame(const float *audio, size_t num_samples
 {
 	audio_frame->pts = audio_pts;
 	audio_frame->nb_samples = num_samples;
-	audio_frame->channel_layout = AV_CH_LAYOUT_STEREO;
+	audio_frame->ch_layout.order = AV_CHANNEL_ORDER_NATIVE;
+	audio_frame->ch_layout.nb_channels = 2;
+	audio_frame->ch_layout.u.mask = AV_CH_LAYOUT_STEREO;
 	audio_frame->format = ctx->sample_fmt;
 	audio_frame->sample_rate = OUTPUT_FREQUENCY;