diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2013-07-08 11:21:48 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-08 11:21:48 -0700 |
commit | 061979253985e59c4fcb82ede232717736e633b1 (patch) | |
tree | 39e6d96715dfe7f032d7eeb843ee71b0d3c638bc | |
parent | 7266bc80850dc327e9f18c27b81613f959399630 (diff) | |
parent | 267363ee2836ff9bc18d7fdd93aaedf19de546ad (diff) | |
download | frameworks_av-061979253985e59c4fcb82ede232717736e633b1.zip frameworks_av-061979253985e59c4fcb82ede232717736e633b1.tar.gz frameworks_av-061979253985e59c4fcb82ede232717736e633b1.tar.bz2 |
am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."
* commit '267363ee2836ff9bc18d7fdd93aaedf19de546ad':
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
-rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index bd28118..d53f442 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -617,7 +617,7 @@ bool AwesomePlayer::getBitrate(int64_t *bitrate) { bool AwesomePlayer::getCachedDuration_l(int64_t *durationUs, bool *eos) { int64_t bitrate; - if (mCachedSource != NULL && getBitrate(&bitrate)) { + if (mCachedSource != NULL && getBitrate(&bitrate) && (bitrate > 0)) { status_t finalStatus; size_t cachedDataRemaining = mCachedSource->approxDataRemaining(&finalStatus); *durationUs = cachedDataRemaining * 8000000ll / bitrate; |