From d55e5c3b1bd791f0f579315c30bf14064eff5824 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 27 Dec 2015 17:44:16 +0000 Subject: using float output in the mpeg and vorbis plugins git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5917 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/mad/decoder_mad.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/plugins/Input/mad/decoder_mad.h') diff --git a/src/plugins/Input/mad/decoder_mad.h b/src/plugins/Input/mad/decoder_mad.h index a846a96ed..73dc43f3b 100644 --- a/src/plugins/Input/mad/decoder_mad.h +++ b/src/plugins/Input/mad/decoder_mad.h @@ -46,13 +46,11 @@ public: qint64 totalTime(); int bitrate(); qint64 read(unsigned char *data, qint64 size); - qint64 read(float *data, qint64 samples); void seek(qint64); private: // helper functions bool decodeFrame(); - qint64 madOutput(unsigned char *data, qint64 size); qint64 madOutputFloat(float *data, qint64 samples); bool fillBuffer(); void deinit(); @@ -64,7 +62,6 @@ private: int m_channels, m_skip_frames; uint m_bitrate; long m_freq, m_len; - qint64 m_output_bytes, m_output_at; // file input buffer char *m_input_buf; @@ -88,27 +85,9 @@ private: XING_SCALE = 0x0008 }; - struct audio_dither - { - mad_fixed_t error[3]; - mad_fixed_t random; - }; - struct mad_stream m_stream; struct mad_frame m_frame; struct mad_synth m_synth; - struct audio_dither m_left_dither, m_right_dither; - - enum - { - CLIP_MIN = -MAD_F_ONE, - CLIP_MAX = MAD_F_ONE - 1 - }; - - //converter functions - unsigned long prng(unsigned long state); - long audio_linear_dither(unsigned int bits, mad_fixed_t sample, struct audio_dither *dither); - long audio_linear_round(unsigned int bits, mad_fixed_t sample); }; -- cgit v1.2.3-13-gbd6f