From d0a1ee56bec6127ad447c6e9b385422d454ef926 Mon Sep 17 00:00:00 2001 From: JusicP Date: Sat, 14 Nov 2020 18:27:14 +0200 Subject: [PATCH] update mp3codecs.cpp --- engine/voice_codecs/minimp3/mp3codecs.cpp | 24 +++-------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/engine/voice_codecs/minimp3/mp3codecs.cpp b/engine/voice_codecs/minimp3/mp3codecs.cpp index 2ab727b3..6867e610 100644 --- a/engine/voice_codecs/minimp3/mp3codecs.cpp +++ b/engine/voice_codecs/minimp3/mp3codecs.cpp @@ -17,12 +17,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); - - if( stream->decode_size > 0) - { - printf("mp3dec_read_callback size: %d\n", (int)size); - return size; - } 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); @@ -104,21 +98,9 @@ CMiniMP3::~CMiniMP3() // IAudioStream functions int CMiniMP3::Decode( void *pBuffer, unsigned int bufferSize ) { - printf("CMiniMP3::Decode size: %d\n", bufferSize); - audio_stream.decode_size = 1; - unsigned int readed = mp3dec_ex_read(&mp3d, (mp3d_sample_t*)pBuffer, bufferSize/2); - printf("mp3dec_ex_read %d\n", readed); - printf("dec.samples: %d\n", (int)mp3d.samples); - - if (readed != mp3d.samples) /* normal eof or error condition */ - { - if (mp3d.last_error) - { - printf("last_err: %d\n", mp3d.last_error); - /* error */ - } - } - + size_t readed = mp3dec_ex_read(&mp3d, pBuffer, 1152); + printf("CMiniMP3::Decode: readed samples: %d\n", readed); + return readed; }