mirror of
https://github.com/sle118/squeezelite-esp32.git
synced 2025-12-11 22:17:17 +03:00
Bell catchup
This commit is contained in:
@@ -1,18 +1,23 @@
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h> // for uint8_t, uint32_t, int16_t
|
||||
#include <vector>
|
||||
|
||||
#include "BaseCodec.h" // for BaseCodec
|
||||
#include "aacdec.h" // for AACFrameInfo, HAACDecoder
|
||||
#include "BaseCodec.h" // for BaseCodec
|
||||
#include "pvmp4audiodecoder_api.h" // for tPVMP4AudioDecoderExternal
|
||||
|
||||
namespace bell {
|
||||
class AudioContainer;
|
||||
|
||||
class AACDecoder : public BaseCodec {
|
||||
private:
|
||||
HAACDecoder aac;
|
||||
int16_t* pcmData;
|
||||
AACFrameInfo frame = {};
|
||||
tPVMP4AudioDecoderExternal* aacDecoder;
|
||||
std::vector<uint8_t> inputBuffer;
|
||||
std::vector<int16_t> outputBuffer;
|
||||
void* pMem;
|
||||
bool firstFrame = true;
|
||||
|
||||
int getDecodedStreamType();
|
||||
|
||||
public:
|
||||
AACDecoder();
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <stdio.h> // for NULL
|
||||
|
||||
#include "aacdec.h" // for AACFreeDecoder, AACInitDecoder, HAACDecoder
|
||||
// #include "aacdec.h" // for AACFreeDecoder, AACInitDecoder, HAACDecoder
|
||||
#include "mp3dec.h" // for MP3FreeDecoder, MP3InitDecoder, HMP3Decoder
|
||||
|
||||
namespace bell {
|
||||
@@ -16,16 +16,16 @@ class DecodersInstance {
|
||||
DecodersInstance(){};
|
||||
~DecodersInstance() {
|
||||
MP3FreeDecoder(mp3Decoder);
|
||||
AACFreeDecoder(aacDecoder);
|
||||
// AACFreeDecoder(aacDecoder);
|
||||
};
|
||||
|
||||
HAACDecoder aacDecoder = NULL;
|
||||
// HAACDecoder aacDecoder = NULL;
|
||||
HMP3Decoder mp3Decoder = NULL;
|
||||
|
||||
void ensureAAC() {
|
||||
if (aacDecoder == NULL) {
|
||||
aacDecoder = AACInitDecoder();
|
||||
}
|
||||
// if (aacDecoder == NULL) {
|
||||
// aacDecoder = AACInitDecoder();
|
||||
// }
|
||||
}
|
||||
|
||||
void ensureMP3() {
|
||||
|
||||
Reference in New Issue
Block a user