diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 23:51:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 23:51:29 +0000 |
| commit | 8eeda89ae361ccd048d7bba0fd11291e05577e2a (patch) | |
| tree | d0d3caa349992dcf13355e512ba4e1da28d63f66 /cmds | |
| parent | fb4dac55d0d3943e09680e779ba77310eedf011b (diff) | |
| parent | d0e12a161471823d1ab269cb608be3f3b0a71ed1 (diff) | |
| download | frameworks_av-8eeda89ae361ccd048d7bba0fd11291e05577e2a.zip frameworks_av-8eeda89ae361ccd048d7bba0fd11291e05577e2a.tar.gz frameworks_av-8eeda89ae361ccd048d7bba0fd11291e05577e2a.tar.bz2 | |
am d0e12a16: am 902dc42d: am 07715ac3: Merge "C++11 compatibility."
* commit 'd0e12a161471823d1ab269cb608be3f3b0a71ed1':
C++11 compatibility.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/SineSource.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/stagefright/SineSource.h b/cmds/stagefright/SineSource.h index d772e0d..be05661 100644 --- a/cmds/stagefright/SineSource.h +++ b/cmds/stagefright/SineSource.h @@ -3,6 +3,7 @@ #define SINE_SOURCE_H_ #include <media/stagefright/MediaSource.h> +#include <utils/Compat.h> namespace android { @@ -24,7 +25,7 @@ protected: private: enum { kBufferSize = 8192 }; - static const double kFrequency = 500.0; + static const CONSTEXPR double kFrequency = 500.0; bool mStarted; int32_t mSampleRate; |