comparison data/fileio/MP3FileReader.h @ 1290:fa574c909c3d 3.0-integration

Add MAD_BUFFER_GUARD padding at end of mp3 buffer, in order to ensure last frame is decoded successfully (otherwise the decoded audio is truncated). Another thing learned from madplay.
author Chris Cannam
date Thu, 24 Nov 2016 17:06:31 +0000
parents 5ef9b4d4bbdb
children 9f9f55a8af92
comparison
equal deleted inserted replaced
1289:a45312bd9306 1290:fa574c909c3d
73 int m_bitrateDenom; 73 int m_bitrateDenom;
74 int m_mp3FrameCount; 74 int m_mp3FrameCount;
75 int m_completion; 75 int m_completion;
76 bool m_done; 76 bool m_done;
77 77
78 unsigned char *m_filebuffer; 78 unsigned char *m_fileBuffer;
79 float **m_samplebuffer; 79 size_t m_fileBufferSize;
80 int m_samplebuffersize; 80
81 float **m_sampleBuffer;
82 size_t m_sampleBufferSize;
81 83
82 ProgressReporter *m_reporter; 84 ProgressReporter *m_reporter;
83 bool m_cancelled; 85 bool m_cancelled;
84 86
85 bool m_decodeErrorShown; 87 bool m_decodeErrorShown;
86 88
87 struct DecoderData 89 struct DecoderData {
88 {
89 unsigned char const *start; 90 unsigned char const *start;
90 sv_frame_t length; 91 sv_frame_t length;
91 MP3FileReader *reader; 92 MP3FileReader *reader;
92 }; 93 };
93 94