diff options
| author | James Dong <jdong@google.com> | 2010-12-14 12:28:31 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-14 12:28:31 -0800 |
| commit | d27f1e6959cdcdadfa471b9824686d784ca55def (patch) | |
| tree | 0e9301196a76a95efce618b147eac6c1bc47079e /media/libstagefright | |
| parent | 123e95a584556a64a2e0f9e242f48b9a080750a5 (diff) | |
| parent | 36fb2077764093a0a19ed65770078b9987bd82b1 (diff) | |
| download | frameworks_av-d27f1e6959cdcdadfa471b9824686d784ca55def.zip frameworks_av-d27f1e6959cdcdadfa471b9824686d784ca55def.tar.gz frameworks_av-d27f1e6959cdcdadfa471b9824686d784ca55def.tar.bz2 | |
Merge "Fix an issue where a fixed number of bits per sample is used for seek position calculation."
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/WAVExtractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/WAVExtractor.cpp b/media/libstagefright/WAVExtractor.cpp index 446021c..9332120 100644 --- a/media/libstagefright/WAVExtractor.cpp +++ b/media/libstagefright/WAVExtractor.cpp @@ -318,7 +318,7 @@ status_t WAVSource::read( int64_t seekTimeUs; ReadOptions::SeekMode mode; if (options != NULL && options->getSeekTo(&seekTimeUs, &mode)) { - int64_t pos = (seekTimeUs * mSampleRate) / 1000000 * mNumChannels * 2; + int64_t pos = (seekTimeUs * mSampleRate) / 1000000 * mNumChannels * (mBitsPerSample >> 3); if (pos > mSize) { pos = mSize; } |