diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-29 14:01:58 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-29 14:01:58 -0700 |
| commit | 9b91e4cbe2e3e5135b55a0e9128a620f00aaf8f7 (patch) | |
| tree | 9fbcdc6968c12a64700f777a4615bf8554aecc75 /media/libmediaplayerservice | |
| parent | bedd71770a410b5e707bbca24e4e04eba62875be (diff) | |
| parent | 1dafcd15418346edb5b0fd1a925a29ea90b5c3c2 (diff) | |
| download | frameworks_av-9b91e4cbe2e3e5135b55a0e9128a620f00aaf8f7.zip frameworks_av-9b91e4cbe2e3e5135b55a0e9128a620f00aaf8f7.tar.gz frameworks_av-9b91e4cbe2e3e5135b55a0e9128a620f00aaf8f7.tar.bz2 | |
Merge "GenericSource: Hold an additional reference to dataSource."
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index a86dce1..ddad991 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -156,7 +156,12 @@ status_t NuPlayer::GenericSource::initFromDataSource() { return UNKNOWN_ERROR; } } else if (mIsStreaming) { - if (!mDataSource->sniff(&mimeType, &confidence, &dummy)) { + sp<DataSource> dataSource; + { + Mutex::Autolock _l(mSourceLock); + dataSource = mDataSource; + } + if (!dataSource->sniff(&mimeType, &confidence, &dummy)) { return UNKNOWN_ERROR; } isWidevineStreaming = !strcasecmp( |