diff options
| author | Marco Nelissen <marcone@google.com> | 2013-11-06 10:50:17 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2013-11-11 23:43:22 +0000 |
| commit | e3067743d6ef2c6c1aac4361b6ed65e6d7bbe3e3 (patch) | |
| tree | 4ea5d1b5c2574b9e5f9f0a50452d1419f39bb1d6 /include | |
| parent | e100b813c4d833b48b48b74100ad0b9a82c46954 (diff) | |
| download | frameworks_av-e3067743d6ef2c6c1aac4361b6ed65e6d7bbe3e3.zip frameworks_av-e3067743d6ef2c6c1aac4361b6ed65e6d7bbe3e3.tar.gz frameworks_av-e3067743d6ef2c6c1aac4361b6ed65e6d7bbe3e3.tar.bz2 | |
Only initialize sniffers once, don't hold mutex while sniffing
b/11482896
Change-Id: Ie036554b4c9e7e8863cb07901d414ea457f1b2f1
(cherry picked from commit 377fce69297a0e5b7c3b266a7602b17146785635)
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/DataSource.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/media/stagefright/DataSource.h b/include/media/stagefright/DataSource.h index 742bc0e..157b1aa 100644 --- a/include/media/stagefright/DataSource.h +++ b/include/media/stagefright/DataSource.h @@ -80,7 +80,6 @@ public: const sp<DataSource> &source, String8 *mimeType, float *confidence, sp<AMessage> *meta); - static void RegisterSniffer(SnifferFunc func); static void RegisterDefaultSniffers(); // for DRM @@ -101,6 +100,9 @@ protected: private: static Mutex gSnifferMutex; static List<SnifferFunc> gSniffers; + static bool gSniffersRegistered; + + static void RegisterSniffer_l(SnifferFunc func); DataSource(const DataSource &); DataSource &operator=(const DataSource &); |