diff options
| author | XpLoDWilD <xplodgui@gmail.com> | 2012-11-26 22:44:46 +0000 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2012-11-27 02:04:38 +0100 |
| commit | 001573b26e5ccfb6bee9a34837ec4f29d5f73f7f (patch) | |
| tree | 04214a1dbec4931b32ff9bda1df39bfa437b61b5 /media/mediaserver | |
| parent | dcab2607c1a4afb2355c1c1a3a137dffc99927c0 (diff) | |
| download | frameworks_av-001573b26e5ccfb6bee9a34837ec4f29d5f73f7f.zip frameworks_av-001573b26e5ccfb6bee9a34837ec4f29d5f73f7f.tar.gz frameworks_av-001573b26e5ccfb6bee9a34837ec4f29d5f73f7f.tar.bz2 | |
mediaserver: instantiate SecTVOutService for samsung tvout
Change-Id: I0e7767f8cf3ffd0bc376d14cf4fffffed225e701
Diffstat (limited to 'media/mediaserver')
| -rw-r--r-- | media/mediaserver/Android.mk | 5 | ||||
| -rw-r--r-- | media/mediaserver/main_mediaserver.cpp | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk index 5a73cdd..1ff87c8 100644 --- a/media/mediaserver/Android.mk +++ b/media/mediaserver/Android.mk @@ -11,6 +11,11 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libbinder +ifeq ($(BOARD_USE_SECTVOUT),true) + LOCAL_CFLAGS += -DSECTVOUT + LOCAL_SHARED_LIBRARIES += libTVOut +endif + # FIXME The duplicate audioflinger is temporary LOCAL_C_INCLUDES := \ frameworks/av/media/libmediaplayerservice \ diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index 6b1abb1..b8fddc4 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp @@ -31,11 +31,20 @@ using namespace android; +#ifdef SECTVOUT +namespace android { namespace SecTVOutService { +void instantiate(void); +} } +#endif + int main(int argc, char** argv) { sp<ProcessState> proc(ProcessState::self()); sp<IServiceManager> sm = defaultServiceManager(); ALOGI("ServiceManager: %p", sm.get()); +#ifdef SECTVOUT + SecTVOutService::instantiate(); +#endif AudioFlinger::instantiate(); MediaPlayerService::instantiate(); CameraService::instantiate(); |