fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace references to libav.

Browse Source
This commit is contained in:
Joel Linn
2020-06-19 22:34:06 +02:00
committed by Rick Gibbed
parent 47e36e6aee
commit d4cf474665
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/xenia/apu/xma_context.cc
View File

@@ -2,7 +2,7 @@
******************************************************************************
* Xenia : Xbox 360 Emulator Research Project *
******************************************************************************
* Copyright 2015 Ben Vanik. All rights reserved. *
* Copyright 2021 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. *
******************************************************************************
*/
@@ -20,9 +20,8 @@
#include "xenia/base/ring_buffer.h"
extern "C" {
#include "third_party/libav/libavcodec/avcodec.h"
#include "third_party/libav/libavcodec/xma2dec.h"
#include "third_party/libav/libavutil/channel_layout.h"
#include "third_party/FFmpeg/libavcodec/avcodec.h"
#include "third_party/FFmpeg/libavcodec/wma.h"
extern AVCodec ff_xma2_decoder;
} // extern "C"
@@ -559,7 +558,7 @@ void XmaContext::DecodePackets(XMA_CONTEXT_DATA* data) {
}
} else if (len < 0) {
// Did not get frame
XELOGAPU("libav failed to decode a frame!");
XELOGAPU("FFmpeg failed to decode a frame!");
if (frame_size && frame_size != 0x7FFF) {
data->input_buffer_read_offset += frame_size;
} else {
@@ -638,7 +637,7 @@ int XmaContext::PrepareDecoder(uint8_t* block, size_t size, int sample_rate,
channels == 2 ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
if (avcodec_open2(context_, codec_, NULL) < 0) {
XELOGE("XmaContext: Failed to reopen libav context");
XELOGE("XmaContext: Failed to reopen FFmpeg context");
return 1;
}
}