diff options
| author | James Almer <jamrial@gmail.com> | 2023-02-17 15:41:56 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2023-02-19 18:30:15 -0300 |
| commit | a34b348328dd33d122ea772fc9f516e6aaef193e (patch) | |
| tree | 0493c1c4d62052fd0525aceb7cbbf2299c19b3ae /libswresample/swresample_internal.h | |
| parent | 6112745d8eecd9842b2b0854c4415b9a2244bbeb (diff) | |
| download | ffmpeg-a34b348328dd33d122ea772fc9f516e6aaef193e.tar.gz | |
swresample/swresample: add a used channel layout option using the new API
Replaces the "used channel count" option, which is now deprecated.
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 223c70cf1d8b816b59dede36a21492d7e8542e06)
Diffstat (limited to 'libswresample/swresample_internal.h')
| -rw-r--r-- | libswresample/swresample_internal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h index 262a0e2b8c..ad902d73fa 100644 --- a/libswresample/swresample_internal.h +++ b/libswresample/swresample_internal.h @@ -99,6 +99,7 @@ struct SwrContext { enum AVSampleFormat in_sample_fmt; ///< input sample format enum AVSampleFormat int_sample_fmt; ///< internal sample format (AV_SAMPLE_FMT_FLTP or AV_SAMPLE_FMT_S16P) enum AVSampleFormat out_sample_fmt; ///< output sample format + AVChannelLayout used_ch_layout; ///< number of used input channels (mapped channel count if channel_map, otherwise in.ch_count) AVChannelLayout in_ch_layout; ///< input channel layout AVChannelLayout out_ch_layout; ///< output channel layout int in_sample_rate; ///< input sample rate @@ -111,16 +112,16 @@ struct SwrContext { float rematrix_maxval; ///< maximum value for rematrixing output int matrix_encoding; /**< matrixed stereo encoding */ const int *channel_map; ///< channel index (or -1 if muted channel) map - int used_ch_count; ///< number of used input channels (mapped channel count if channel_map, otherwise in.ch_count) int engine; - int user_used_ch_count; ///< User set used channel count #if FF_API_OLD_CHANNEL_LAYOUT + int user_used_ch_count; ///< User set used channel count int user_in_ch_count; ///< User set input channel count int user_out_ch_count; ///< User set output channel count int64_t user_in_ch_layout; ///< User set input channel layout int64_t user_out_ch_layout; ///< User set output channel layout #endif + AVChannelLayout user_used_chlayout; ///< User set used channel layout AVChannelLayout user_in_chlayout; ///< User set input channel layout AVChannelLayout user_out_chlayout; ///< User set output channel layout enum AVSampleFormat user_int_sample_fmt; ///< User set internal sample format |