summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/g711/dec/SoftG711.h
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-03-20 09:15:11 -0700
committerMarco Nelissen <marcone@google.com>2015-03-20 09:15:11 -0700
commit17c39e708ed657b8fa66f8acce5128e51696915c (patch)
treeec0f96c66e44c39e83800bb7a02792ab57781e99 /media/libstagefright/codecs/g711/dec/SoftG711.h
parent340cebdaa2875ba2ab9725b81218ebc59d84164b (diff)
downloadframeworks_av-17c39e708ed657b8fa66f8acce5128e51696915c.zip
frameworks_av-17c39e708ed657b8fa66f8acce5128e51696915c.tar.gz
frameworks_av-17c39e708ed657b8fa66f8acce5128e51696915c.tar.bz2
ulaw and alaw aren't limited to 8kHz
Bug: https://code.google.com/p/android/issues/detail?id=158490 Change-Id: Ib30e156c99a997db861bb85e17244a5effdd55cf
Diffstat (limited to 'media/libstagefright/codecs/g711/dec/SoftG711.h')
-rw-r--r--media/libstagefright/codecs/g711/dec/SoftG711.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/g711/dec/SoftG711.h b/media/libstagefright/codecs/g711/dec/SoftG711.h
index bff0c68..16b6340 100644
--- a/media/libstagefright/codecs/g711/dec/SoftG711.h
+++ b/media/libstagefright/codecs/g711/dec/SoftG711.h
@@ -46,8 +46,9 @@ private:
};
bool mIsMLaw;
- OMX_U32 mNumChannels;
bool mSignalledError;
+ OMX_U32 mNumChannels;
+ int32_t mSamplingRate;
void initPorts();