summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-02-06 12:05:41 +0000
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-02-06 12:05:41 +0000
commit0db8a19fb3216a8a83d5d6cbd5f1ccbf997a20d8 (patch)
tree84c447f1105f8525a57aa4ce2f2f6d15ce316e29 /include/media
parent12170a107e7c96170a38dbe43e98447c87624bd7 (diff)
downloadframeworks_av-0db8a19fb3216a8a83d5d6cbd5f1ccbf997a20d8.zip
frameworks_av-0db8a19fb3216a8a83d5d6cbd5f1ccbf997a20d8.tar.gz
frameworks_av-0db8a19fb3216a8a83d5d6cbd5f1ccbf997a20d8.tar.bz2
Revert "libstagefright: Convert mono to stereo for LPA clips"
Change-Id: Ib6cc3401c889a8ec52dc83e3bea367f94a582a40
Diffstat (limited to 'include/media')
-rwxr-xr-xinclude/media/stagefright/LPAPlayer.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/media/stagefright/LPAPlayer.h b/include/media/stagefright/LPAPlayer.h
index c3c5cac..b0e1d31 100755
--- a/include/media/stagefright/LPAPlayer.h
+++ b/include/media/stagefright/LPAPlayer.h
@@ -92,8 +92,7 @@ private:
bool mPaused;
bool mA2DPEnabled;
int32_t mChannelMask;
- int32_t mNumOutputChannels;
- int32_t mNumInputChannels;
+ int32_t numChannels;
int32_t mSampleRate;
int64_t mLatencyUs;
size_t mFrameSize;
@@ -260,8 +259,6 @@ private:
void *buffer, size_t size, void *cookie);
size_t AudioCallback(void *cookie, void *data, size_t size);
- void convertMonoToStereo(int16_t *data, size_t size);
-
LPAPlayer(const LPAPlayer &);
LPAPlayer &operator=(const LPAPlayer &);
};