diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-07-08 11:25:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-08 11:25:40 -0700 |
| commit | 046d9c8dad97118535778cf93efc662ceb5fec8d (patch) | |
| tree | ac8d2ad8ad65d9d9812b20f209bbc47be6b43f64 /media/libstagefright/AwesomePlayer.cpp | |
| parent | 9f0e05978e236352fd2a4a7c6dce909755c36ead (diff) | |
| parent | 061979253985e59c4fcb82ede232717736e633b1 (diff) | |
| download | frameworks_av-046d9c8dad97118535778cf93efc662ceb5fec8d.zip frameworks_av-046d9c8dad97118535778cf93efc662ceb5fec8d.tar.gz frameworks_av-046d9c8dad97118535778cf93efc662ceb5fec8d.tar.bz2 | |
am 06197925: am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."
* commit '061979253985e59c4fcb82ede232717736e633b1':
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -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; |