Commit 16dedb02 authored by hbono@chromium.org's avatar hbono@chromium.org

A quick fix for Bug 69906.

This change just re-adds SpeexEncoder::~SpeexEncoder(), which has been deleted by r71599 <http://crrev.com/71599> to delete the speex resources allocated in SpeexEncoder::SpeexEncoder().

BUG=69906
TEST=make the "Linux Tests (valgrind)" bot and green.
Review URL: http://codereview.chromium.org/6294005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71641 0039d316-1c4b-4281-b951-d872f2087c98
parent a1d9e628
...@@ -109,7 +109,8 @@ COMPILE_ASSERT(kMaxSpeexFrameLength <= 0xFF, invalidLength); ...@@ -109,7 +109,8 @@ COMPILE_ASSERT(kMaxSpeexFrameLength <= 0xFF, invalidLength);
class SpeexEncoder : public speech_input::AudioEncoder { class SpeexEncoder : public speech_input::AudioEncoder {
public: public:
SpeexEncoder(int sampling_rate); explicit SpeexEncoder(int sampling_rate);
virtual ~SpeexEncoder();
virtual void Encode(const short* samples, int num_samples); virtual void Encode(const short* samples, int num_samples);
virtual void Flush() {} virtual void Flush() {}
...@@ -138,6 +139,11 @@ SpeexEncoder::SpeexEncoder(int sampling_rate) ...@@ -138,6 +139,11 @@ SpeexEncoder::SpeexEncoder(int sampling_rate)
memset(encoded_frame_data_, 0, sizeof(encoded_frame_data_)); memset(encoded_frame_data_, 0, sizeof(encoded_frame_data_));
} }
SpeexEncoder::~SpeexEncoder() {
speex_bits_destroy(&bits_);
speex_encoder_destroy(encoder_state_);
}
void SpeexEncoder::Encode(const short* samples, int num_samples) { void SpeexEncoder::Encode(const short* samples, int num_samples) {
// Drop incomplete frames, typically those which come in when recording stops. // Drop incomplete frames, typically those which come in when recording stops.
num_samples -= (num_samples % samples_per_frame_); num_samples -= (num_samples % samples_per_frame_);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment