diff options
| author | Chih-hung Hsieh <chh@google.com> | 2018-12-17 15:13:45 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-17 15:13:45 -0800 |
| commit | babba309e32018b4e5fc432252cf54fcb954a3b2 (patch) | |
| tree | 6c197b8e7556277638f9e2e03e31f8d298be3478 | |
| parent | 7aa5e8a2d0677025d093fedc64f48d49bf22f29d (diff) | |
| parent | fef87a55cabcf85244f4ba681d22596e74c56279 (diff) | |
| download | wilhelm-babba309e32018b4e5fc432252cf54fcb954a3b2.tar.gz | |
Merge "Fix cert-dcl16-c clang-tidy warnings."
am: fef87a55ca
Change-Id: I6acabf5df83fe2e60769191bb32a2f2ed7d69ca7
| -rw-r--r-- | src/android/android_AudioSfDecoder.cpp | 4 | ||||
| -rw-r--r-- | src/android/util/AacAdtsExtractor.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/android/android_AudioSfDecoder.cpp b/src/android/android_AudioSfDecoder.cpp index 0600549..8620bf0 100644 --- a/src/android/android_AudioSfDecoder.cpp +++ b/src/android/android_AudioSfDecoder.cpp @@ -283,7 +283,7 @@ void AudioSfDecoder::onPrepare() { if (dataSource->getSize(&size) == OK && meta->findInt64(kKeyDuration, &durationUs)) { if (durationUs != 0) { - mBitrate = size * 8000000ll / durationUs; // in bits/sec + mBitrate = size * 8000000LL / durationUs; // in bits/sec } else { mBitrate = -1; } @@ -684,7 +684,7 @@ CacheStatus_t AudioSfDecoder::getCacheRemaining(bool *eos) { CHECK_GE(mBitrate, 0); - int64_t dataRemainingUs = dataRemaining * 8000000ll / mBitrate; + int64_t dataRemainingUs = dataRemaining * 8000000LL / mBitrate; //SL_LOGV("AudioSfDecoder::getCacheRemaining: approx %.2f secs remaining (eos=%d)", // dataRemainingUs / 1E6, *eos); diff --git a/src/android/util/AacAdtsExtractor.cpp b/src/android/util/AacAdtsExtractor.cpp index 549acc5..383f616 100644 --- a/src/android/util/AacAdtsExtractor.cpp +++ b/src/android/util/AacAdtsExtractor.cpp @@ -128,7 +128,7 @@ AacAdtsExtractor::AacAdtsExtractor(const sp<DataSource> &source) MakeAACCodecSpecificData(*mMeta, profile, sf_index, channel); // Round up and get the duration of each frame - mFrameDurationUs = (1024 * 1000000ll + (sr - 1)) / sr; + mFrameDurationUs = (1024 * 1000000LL + (sr - 1)) / sr; off64_t streamSize; if (mDataSource->getSize(&streamSize) == OK) { |