From d4c9ed338f982a29e1831983aa879c7e00a5fa97 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Sun, 15 Nov 2020 22:04:09 +0300 Subject: [PATCH] update minimp3 --- engine/voice_codecs/minimp3/mp3codecs.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/engine/voice_codecs/minimp3/mp3codecs.cpp b/engine/voice_codecs/minimp3/mp3codecs.cpp index cc373dee..86bf9cc8 100644 --- a/engine/voice_codecs/minimp3/mp3codecs.cpp +++ b/engine/voice_codecs/minimp3/mp3codecs.cpp @@ -6,6 +6,7 @@ // memdbgon must be the last include file in a .cpp file!!! #include "tier0/memdbgon.h" +#include struct AudioStream_s { @@ -17,7 +18,6 @@ struct AudioStream_s size_t mp3dec_read_callback(void *buf, size_t size, void *user_data) { AudioStream_s *stream = static_cast( (void*)user_data); - int ret_size = stream->stream_event->StreamRequestData( buf, size, stream->offset ); printf("mp3dec_read_callback size: %d, ret_size: %d\n", (int)size, ret_size); stream->offset += ret_size; @@ -99,42 +99,38 @@ CMiniMP3::~CMiniMP3() int CMiniMP3::Decode( void *pBuffer, unsigned int bufferSize ) { size_t readed = mp3dec_ex_read(&mp3d, pBuffer, bufferSize/2); - printf("CMiniMP3::Decode: readed samples: %d\n", readed); return readed*2; } int CMiniMP3::GetOutputBits() { - printf("CMiniMP3::GetOutputBits\n"); - return mp3d.info.bitrate_kbps; + return 16; } int CMiniMP3::GetOutputRate() { - printf("CMiniMP3::GetOutputRate: %d\n", mp3d.info.hz); return mp3d.info.hz; } int CMiniMP3::GetOutputChannels() { - printf("CMiniMP3::GetOutputChannels %d\n", mp3d.info.channels); return mp3d.info.channels; } unsigned int CMiniMP3::GetPosition() { - printf("CMiniMP3::GetPosition %d\n", 0); - return 0; + return audio_stream.offset; } // NOTE: Only supports seeking forward right now void CMiniMP3::SetPosition( unsigned int position ) { - printf("CMiniMP3::SetPosition %d\n", position); + audio_stream.offset = position; + mp3dec_ex_seek(&mp3d, position); }