diff options
| author | Marco Nelissen <marcone@google.com> | 2013-11-13 18:11:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-13 18:11:54 +0000 |
| commit | 5595f6de606f51ec61fbf40a269b52312507aded (patch) | |
| tree | e76298c16e9a54166661d417012eb996e3e7f73d /include | |
| parent | 26c8f714361bfb6403a7c457adfb8b55c89a634a (diff) | |
| parent | e3067743d6ef2c6c1aac4361b6ed65e6d7bbe3e3 (diff) | |
| download | frameworks_av-5595f6de606f51ec61fbf40a269b52312507aded.zip frameworks_av-5595f6de606f51ec61fbf40a269b52312507aded.tar.gz frameworks_av-5595f6de606f51ec61fbf40a269b52312507aded.tar.bz2 | |
Merge "Only initialize sniffers once, don't hold mutex while sniffing" into klp-dev
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 &); |