|
Line
Link Here
|
| 0 |
-- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp |
0 |
++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp |
|
Lines 564-570
Link Here
|
| 564 |
} |
564 |
} |
| 565 |
#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT |
565 |
#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT |
| 566 |
auto result = swr_alloc_set_opts( |
566 |
auto result = swr_alloc_set_opts( |
| 567 |
existing ? existing.get() : nullptr, |
567 |
existing ? existing->get() : nullptr, |
| 568 |
dstLayout, |
568 |
dstLayout, |
| 569 |
dstFormat, |
569 |
dstFormat, |
| 570 |
dstRate, |
570 |
dstRate, |
|
Lines 576-581
Link Here
|
| 576 |
if (!result) { |
576 |
if (!result) { |
| 577 |
LogError(u"swr_alloc_set_opts"_q); |
577 |
LogError(u"swr_alloc_set_opts"_q); |
| 578 |
} |
578 |
} |
|
|
579 |
auto |
| 579 |
#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT |
580 |
#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT |
| 580 |
|
581 |
|
| 581 |
error = AvErrorWrap(swr_init(result)); |
582 |
error = AvErrorWrap(swr_init(result)); |
| 582 |
-- a/Telegram/SourceFiles/media/audio/media_audio_local_cache.cpp |
583 |
++ b/Telegram/SourceFiles/media/audio/media_audio_local_cache.cpp |
|
Lines 44-50
Link Here
|
| 44 |
return {}; |
44 |
return {}; |
| 45 |
} |
45 |
} |
| 46 |
|
46 |
|
| 47 |
auto inCodec = (const AVCodec*)nullptr; |
47 |
auto inCodec = (AVCodec*)nullptr; |
| 48 |
const auto streamId = av_find_best_stream( |
48 |
const auto streamId = av_find_best_stream( |
| 49 |
input.get(), |
49 |
input.get(), |
| 50 |
AVMEDIA_TYPE_AUDIO, |
50 |
AVMEDIA_TYPE_AUDIO, |
|
Lines 152-161
Link Here
|
| 152 |
inCodecContext->sample_rate, |
152 |
inCodecContext->sample_rate, |
| 153 |
&outCodecContext->ch_layout, |
153 |
&outCodecContext->ch_layout, |
| 154 |
#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT |
154 |
#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT |
| 155 |
&inCodecContext->channel_layout, |
155 |
inCodecContext->channel_layout, |
| 156 |
inCodecContext->sample_fmt, |
156 |
inCodecContext->sample_fmt, |
| 157 |
inCodecContext->sample_rate, |
157 |
inCodecContext->sample_rate, |
| 158 |
&outCodecContext->channel_layout, |
158 |
outCodecContext->channel_layout, |
| 159 |
#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT |
159 |
#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT |
| 160 |
outCodecContext->sample_fmt, |
160 |
outCodecContext->sample_fmt, |
| 161 |
outCodecContext->sample_rate); |
161 |
outCodecContext->sample_rate); |
| 162 |
-- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp |
162 |
++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp |
|
Lines 341-350
Link Here
|
| 341 |
&_swrContext); |
341 |
&_swrContext); |
| 342 |
#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT |
342 |
#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT |
| 343 |
_swrContext = MakeSwresamplePointer( |
343 |
_swrContext = MakeSwresamplePointer( |
| 344 |
&_audioCodec->channel_layout, |
344 |
_audioCodec->channel_layout, |
| 345 |
AV_SAMPLE_FMT_S16, |
345 |
AV_SAMPLE_FMT_S16, |
| 346 |
_audioCodec->sample_rate, |
346 |
_audioCodec->sample_rate, |
| 347 |
&_audioCodec->channel_layout, |
347 |
_audioCodec->channel_layout, |
| 348 |
_audioCodec->sample_fmt, |
348 |
_audioCodec->sample_fmt, |
| 349 |
_audioCodec->sample_rate, |
349 |
_audioCodec->sample_rate, |
| 350 |
&_swrContext); |
350 |
&_swrContext); |
