diff options
| author | Chong Zhang <chz@google.com> | 2014-11-21 00:44:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 00:44:04 +0000 |
| commit | 0cd651d18eeee52be945b0379b667473549bbf63 (patch) | |
| tree | 18fc2c0f0b583c74bb20176ac69cde01bf3485c0 /media/libmediaplayerservice | |
| parent | 56df21d760d70a106adfbc8417b6ea179d576e24 (diff) | |
| parent | 9111465a5f4a0bed8747da594070f35010644979 (diff) | |
| download | frameworks_av-0cd651d18eeee52be945b0379b667473549bbf63.zip frameworks_av-0cd651d18eeee52be945b0379b667473549bbf63.tar.gz frameworks_av-0cd651d18eeee52be945b0379b667473549bbf63.tar.bz2 | |
am 9111465a: am ec9459c6: Merge "close fd if data source is reset without prepare" into lmp-mr1-dev
* commit '9111465a5f4a0bed8747da594070f35010644979':
close fd if data source is reset without prepare
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index e619926..e7a26b6 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -56,6 +56,7 @@ NuPlayer::GenericSource::GenericSource( mIsWidevine(false), mUIDValid(uidValid), mUID(uid), + mFd(-1), mDrmManagerClient(NULL), mMetaDataSize(-1ll), mBitrate(-1ll), @@ -70,7 +71,10 @@ void NuPlayer::GenericSource::resetDataSource() { mHttpSource.clear(); mUri.clear(); mUriHeaders.clear(); - mFd = -1; + if (mFd >= 0) { + close(mFd); + mFd = -1; + } mOffset = 0; mLength = 0; setDrmPlaybackStatusIfNeeded(Playback::STOP, 0); @@ -270,6 +274,7 @@ NuPlayer::GenericSource::~GenericSource() { mLooper->unregisterHandler(id()); mLooper->stop(); } + resetDataSource(); } void NuPlayer::GenericSource::prepareAsync() { @@ -312,6 +317,7 @@ void NuPlayer::GenericSource::onPrepareAsync() { mIsWidevine = false; mDataSource = new FileSource(mFd, mOffset, mLength); + mFd = -1; } if (mDataSource == NULL) { |