diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-06-08 19:28:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-08 19:28:49 +0000 |
| commit | b4b4cd11c9b95af613f5c0f14f93e3c9590fda7c (patch) | |
| tree | b5cfeed2adbb5e08b67d340af590f0cbb5f00cf4 /include | |
| parent | a31d237241545d7d2e1b5663426de06dea2426d4 (diff) | |
| parent | a09152c6317e0295773b91f529e63c4d7c107752 (diff) | |
| download | frameworks_av-b4b4cd11c9b95af613f5c0f14f93e3c9590fda7c.zip frameworks_av-b4b4cd11c9b95af613f5c0f14f93e3c9590fda7c.tar.gz frameworks_av-b4b4cd11c9b95af613f5c0f14f93e3c9590fda7c.tar.bz2 | |
Merge "libstagefright: run codec profiling in worker thread." into mnc-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodecList.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaCodecList.h b/include/media/stagefright/MediaCodecList.h index df5e519..3aaa032 100644 --- a/include/media/stagefright/MediaCodecList.h +++ b/include/media/stagefright/MediaCodecList.h @@ -55,7 +55,10 @@ struct MediaCodecList : public BnMediaCodecList { // to be used by MediaPlayerService alone static sp<IMediaCodecList> getLocalInstance(); - // only to be used in getLocalInstance + // only to be used by getLocalInstance + static void *profilerThreadWrapper(void * /*arg*/); + + // only to be used by MediaPlayerService void parseTopLevelXMLFile(const char *path, bool ignore_errors = false); private: |