[3PP] Switch FFmpeg to latest release with port of xmaframes codec
And pull out all the xenia specific build junk into third_party/ffmpeg-xenia rather than keeping it checked in the submodule
This commit is contained in:
@@ -130,7 +130,7 @@ ProcessAudioResult ProcessAudioLoop(AudioMediaPlayer* player,
|
||||
break;
|
||||
}
|
||||
|
||||
ConvertAudioFrame(frame, avctx->channels, &frameBuffer);
|
||||
ConvertAudioFrame(frame, avctx->ch_layout.nb_channels, &frameBuffer);
|
||||
player->ProcessAudioBuffer(&frameBuffer);
|
||||
}
|
||||
}
|
||||
@@ -230,7 +230,8 @@ void AudioMediaPlayer::Play() {
|
||||
AVCodecContext* codecContext = nullptr;
|
||||
InitializeAndOpenAvCodec(song_buffer, formatContext, codecContext);
|
||||
|
||||
if (!SetupDriver(codecContext->sample_rate, codecContext->channels)) {
|
||||
if (!SetupDriver(codecContext->sample_rate,
|
||||
codecContext->ch_layout.nb_channels)) {
|
||||
XELOGE("Driver initialization failed!");
|
||||
avcodec_free_context(&codecContext);
|
||||
av_freep(&formatContext->pb->buffer);
|
||||
|
||||
Reference in New Issue
Block a user