preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-13 01:29:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup SimpleAudioDec

Browse Source 
and remove unused AudioCreate fonction, it can be down in the class constructor.
This commit is contained in:
kaienfr committed 2014-04-01 00:33:46 +02:00
1 parent f5d4b7bcb4
commit c03e591ecd
3 files changed
+12 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/HW/SimpleAudioDec.cpp
+11 -44
View File
@@ -60,12 +60,13 @@ bool SimpleAudio::GetAudioCodecID(int audioType){
}
SimpleAudio::SimpleAudio(int audioType)
: codec_(0),
codecCtx_(0),
swrCtx_(0) {
SimpleAudio::audioType = audioType;
: codec_(0), codecCtx_(0), swrCtx_(0), audioType(audioType){
#ifdef USE_FFMPEG
frame_ = av_frame_alloc();
avcodec_register_all();
av_register_all();
InitFFmpeg();
frame_ = av_frame_alloc();
// Get Audio Codec ID
if (!GetAudioCodecID(audioType)){
@@ -100,12 +101,12 @@ swrCtx_(0) {
SimpleAudio::SimpleAudio(u32 ctxPtr, int audioType)
: codec_(0),
codecCtx_(0),
swrCtx_(0) {
SimpleAudio::ctxPtr = ctxPtr;
SimpleAudio::audioType = audioType;
: codec_(0), codecCtx_(0), swrCtx_(0), ctxPtr(ctxPtr), audioType(audioType){
#ifdef USE_FFMPEG
avcodec_register_all();
av_register_all();
InitFFmpeg();
frame_ = av_frame_alloc();
// Get Audio Codec ID
@@ -211,40 +212,6 @@ bool SimpleAudio::Decode(void* inbuf, int inbytes, uint8_t *outbuf, int *outbyte
}
SimpleAudio *AudioCreate(int audioType) {
#ifdef USE_FFMPEG
avcodec_register_all();
av_register_all();
InitFFmpeg();
SimpleAudio *Audio = new SimpleAudio(audioType);
if (!Audio->IsOK()) {
delete Audio;
return 0;
}
return Audio;
#else
return 0;
#endif // USE_FFMPEG
}
SimpleAudio *AudioCreate(u32 ctxPtr, int audioType) {
#ifdef USE_FFMPEG
avcodec_register_all();
av_register_all();
InitFFmpeg();
SimpleAudio *Audio = new SimpleAudio(ctxPtr, audioType);
if (!Audio->IsOK()) {
delete Audio;
return 0;
}
return Audio;
#else
return 0;
#endif // USE_FFMPEG
}
bool AudioDecode(SimpleAudio *ctx, void* inbuf, int inbytes, int *outbytes, uint8_t *outbuf) {
#ifdef USE_FFMPEG
return ctx->Decode(inbuf, inbytes, outbuf, outbytes);