TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: Use ch_layout in favor of removed channel_layout and channels

Browse Source 
Closes #1641
This commit is contained in:
Disyer 2024-03-31 12:05:05 +03:00 committed by rdb
parent 5da013e2e9
commit a9206041d9
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
panda/src/ffmpeg/ffmpegAudioCursor.cxx
View File

@ -99,7 +99,15 @@ FfmpegAudioCursor(FfmpegAudio *src) :
_audio_timebase = av_q2d(stream->time_base); _audio_timebase = av_q2d(stream->time_base);
_audio_rate = codecpar->sample_rate; _audio_rate = codecpar->sample_rate;
// As of libavformat version 60.25.100, the deprecated
// AVCodecParameters.channels has been removed.
// AVCodecParameters.ch_layout is available since version 59.18.101.
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 18, 101)
_audio_channels = codecpar->ch_layout.nb_channels;
#else
_audio_channels = codecpar->channels; _audio_channels = codecpar->channels;
#endif /* LIBAVFORMAT_VERSION_INT */
const AVCodec *pAudioCodec = avcodec_find_decoder(codecpar->codec_id); const AVCodec *pAudioCodec = avcodec_find_decoder(codecpar->codec_id);
if (pAudioCodec == nullptr) { if (pAudioCodec == nullptr) {
@ -138,10 +146,20 @@ FfmpegAudioCursor(FfmpegAudio *src) :
} }
_resample_ctx = swr_alloc(); _resample_ctx = swr_alloc();
// As of libavformat version 60.25.100, the deprecated
// AVCodecContext.channel_layout has been removed.
// AVCodecContext.ch_layout is available since version 59.18.101.
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 18, 101)
av_opt_set_chlayout(_resample_ctx, "in_chlayout", &_audio_ctx->ch_layout, 0);
av_opt_set_chlayout(_resample_ctx, "out_chlayout", &_audio_ctx->ch_layout, 0);
#else
av_opt_set_int(_resample_ctx, "in_channel_count", _audio_channels, 0); av_opt_set_int(_resample_ctx, "in_channel_count", _audio_channels, 0);
av_opt_set_int(_resample_ctx, "out_channel_count", _audio_channels, 0); av_opt_set_int(_resample_ctx, "out_channel_count", _audio_channels, 0);
av_opt_set_int(_resample_ctx, "in_channel_layout", _audio_ctx->channel_layout, 0); av_opt_set_int(_resample_ctx, "in_channel_layout", _audio_ctx->channel_layout, 0);
av_opt_set_int(_resample_ctx, "out_channel_layout", _audio_ctx->channel_layout, 0); av_opt_set_int(_resample_ctx, "out_channel_layout", _audio_ctx->channel_layout, 0);
#endif /* LIBAVFORMAT_VERSION_INT */
av_opt_set_int(_resample_ctx, "in_sample_rate", _audio_ctx->sample_rate, 0); av_opt_set_int(_resample_ctx, "in_sample_rate", _audio_ctx->sample_rate, 0);
av_opt_set_int(_resample_ctx, "out_sample_rate", _audio_ctx->sample_rate, 0); av_opt_set_int(_resample_ctx, "out_sample_rate", _audio_ctx->sample_rate, 0);
av_opt_set_sample_fmt(_resample_ctx, "in_sample_fmt", _audio_ctx->sample_fmt, 0); av_opt_set_sample_fmt(_resample_ctx, "in_sample_fmt", _audio_ctx->sample_fmt, 0);
@ -155,7 +173,7 @@ FfmpegAudioCursor(FfmpegAudio *src) :
#else #else
ffmpeg_cat.error() ffmpeg_cat.error()
<< "Codec does not use signed 16-bit sample format, but support for libswresample has not been enabled.\n"; << "Codec does not use signed 16-bit sample format, but support for libswresample has not been enabled.\n";
#endif #endif /* HAVE_SWRESAMPLE */
} }
_length = (_format_ctx->duration * 1.0) / AV_TIME_BASE; _length = (_format_ctx->duration * 1.0) / AV_TIME_BASE;
@ -220,10 +238,10 @@ cleanup() {
avcodec_flush_buffers(_audio_ctx); avcodec_flush_buffers(_audio_ctx);
#endif #endif
avcodec_close(_audio_ctx);
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 52, 0) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 52, 0)
avcodec_free_context(&_audio_ctx); avcodec_free_context(&_audio_ctx);
#else #else
avcodec_close(_audio_ctx);
av_free(_audio_ctx); av_free(_audio_ctx);
#endif #endif
} }

2
panda/src/ffmpeg/ffmpegVideoCursor.cxx
View File

@ -603,10 +603,10 @@ close_stream() {
avcodec_flush_buffers(_video_ctx); avcodec_flush_buffers(_video_ctx);
#endif #endif
avcodec_close(_video_ctx);
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 52, 0) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 52, 0)
avcodec_free_context(&_video_ctx); avcodec_free_context(&_video_ctx);
#else #else
avcodec_close(_video_ctx);
av_free(_video_ctx); av_free(_video_ctx);
#endif #endif
} }