From 2729ea9262ca60d93047e984739887cfc89e82eb Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 21 Oct 2008 07:00:00 -0700 Subject: Initial Contribution --- media/mediaserver/Android.mk | 22 +++++++++++++++++ media/mediaserver/main_mediaserver.cpp | 45 ++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 media/mediaserver/Android.mk create mode 100644 media/mediaserver/main_mediaserver.cpp (limited to 'media/mediaserver') diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk new file mode 100644 index 0000000..c681698 --- /dev/null +++ b/media/mediaserver/Android.mk @@ -0,0 +1,22 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + main_mediaserver.cpp + +LOCAL_SHARED_LIBRARIES := \ + libaudioflinger \ + libcameraservice \ + libmediaplayerservice \ + libutils + +base := $(LOCAL_PATH)/../.. + +LOCAL_C_INCLUDES := \ + $(base)/libs/audioflinger \ + $(base)/camera/libcameraservice \ + $(base)/media/libmediaplayerservice + +LOCAL_MODULE:= mediaserver + +include $(BUILD_EXECUTABLE) diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp new file mode 100644 index 0000000..6954b63 --- /dev/null +++ b/media/mediaserver/main_mediaserver.cpp @@ -0,0 +1,45 @@ +/* +** +** Copyright 2008, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + +// System headers required for setgroups, etc. +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +using namespace android; + +int main(int argc, char** argv) +{ + sp proc(ProcessState::self()); + sp sm = defaultServiceManager(); + LOGI("ServiceManager: %p", sm.get()); + AudioFlinger::instantiate(); + MediaPlayerService::instantiate(); + CameraService::instantiate(); + ProcessState::self()->startThreadPool(); + IPCThreadState::self()->joinThreadPool(); +} -- cgit v1.1 From 15f767b960b38059a74a42a33e16d8df2aec8bc1 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 3 Mar 2009 18:28:45 -0800 Subject: auto import from //depot/cupcake/@135843 --- media/mediaserver/Android.mk | 22 ----------------- media/mediaserver/main_mediaserver.cpp | 45 ---------------------------------- 2 files changed, 67 deletions(-) delete mode 100644 media/mediaserver/Android.mk delete mode 100644 media/mediaserver/main_mediaserver.cpp (limited to 'media/mediaserver') diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk deleted file mode 100644 index c681698..0000000 --- a/media/mediaserver/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - main_mediaserver.cpp - -LOCAL_SHARED_LIBRARIES := \ - libaudioflinger \ - libcameraservice \ - libmediaplayerservice \ - libutils - -base := $(LOCAL_PATH)/../.. - -LOCAL_C_INCLUDES := \ - $(base)/libs/audioflinger \ - $(base)/camera/libcameraservice \ - $(base)/media/libmediaplayerservice - -LOCAL_MODULE:= mediaserver - -include $(BUILD_EXECUTABLE) diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp deleted file mode 100644 index 6954b63..0000000 --- a/media/mediaserver/main_mediaserver.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/* -** -** Copyright 2008, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - -// System headers required for setgroups, etc. -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include - -using namespace android; - -int main(int argc, char** argv) -{ - sp proc(ProcessState::self()); - sp sm = defaultServiceManager(); - LOGI("ServiceManager: %p", sm.get()); - AudioFlinger::instantiate(); - MediaPlayerService::instantiate(); - CameraService::instantiate(); - ProcessState::self()->startThreadPool(); - IPCThreadState::self()->joinThreadPool(); -} -- cgit v1.1 From 89fa4ad53f2f4d57adbc97ae1149fc00c9b6f3c5 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 3 Mar 2009 19:31:44 -0800 Subject: auto import from //depot/cupcake/@135843 --- media/mediaserver/Android.mk | 22 +++++++++++++++++ media/mediaserver/main_mediaserver.cpp | 45 ++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 media/mediaserver/Android.mk create mode 100644 media/mediaserver/main_mediaserver.cpp (limited to 'media/mediaserver') diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk new file mode 100644 index 0000000..c681698 --- /dev/null +++ b/media/mediaserver/Android.mk @@ -0,0 +1,22 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + main_mediaserver.cpp + +LOCAL_SHARED_LIBRARIES := \ + libaudioflinger \ + libcameraservice \ + libmediaplayerservice \ + libutils + +base := $(LOCAL_PATH)/../.. + +LOCAL_C_INCLUDES := \ + $(base)/libs/audioflinger \ + $(base)/camera/libcameraservice \ + $(base)/media/libmediaplayerservice + +LOCAL_MODULE:= mediaserver + +include $(BUILD_EXECUTABLE) diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp new file mode 100644 index 0000000..6954b63 --- /dev/null +++ b/media/mediaserver/main_mediaserver.cpp @@ -0,0 +1,45 @@ +/* +** +** Copyright 2008, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + +// System headers required for setgroups, etc. +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +using namespace android; + +int main(int argc, char** argv) +{ + sp proc(ProcessState::self()); + sp sm = defaultServiceManager(); + LOGI("ServiceManager: %p", sm.get()); + AudioFlinger::instantiate(); + MediaPlayerService::instantiate(); + CameraService::instantiate(); + ProcessState::self()->startThreadPool(); + IPCThreadState::self()->joinThreadPool(); +} -- cgit v1.1 From 615a9bfbd98b90e09d868c128db84836feb658e4 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Mon, 18 May 2009 15:08:03 -0700 Subject: checkpoint: split libutils into libutils + libbinder --- media/mediaserver/Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'media/mediaserver') diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk index c681698..a92cea8 100644 --- a/media/mediaserver/Android.mk +++ b/media/mediaserver/Android.mk @@ -8,7 +8,8 @@ LOCAL_SHARED_LIBRARIES := \ libaudioflinger \ libcameraservice \ libmediaplayerservice \ - libutils + libutils \ + libbinder base := $(LOCAL_PATH)/../.. -- cgit v1.1 From 7562408b2261d38415453378b6188f74fda99d88 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Tue, 19 May 2009 19:08:10 -0700 Subject: move libbinder's header files under includes/binder --- media/mediaserver/main_mediaserver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'media/mediaserver') diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index 6954b63..fbea0d4 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include -- cgit v1.1 From c2f1f07084818942352c6bbfb36af9b6b330eb4e Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 17 Jul 2009 12:17:14 -0700 Subject: Fix issue 1795088 Improve audio routing code Initial commit for review. Integrated comments after patch set 1 review. Fixed lockup in AudioFlinger::ThreadBase::exit() Fixed lockup when playing tone with AudioPlocyService startTone() --- media/mediaserver/main_mediaserver.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'media/mediaserver') diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index fbea0d4..7094cfa 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include using namespace android; @@ -40,6 +41,7 @@ int main(int argc, char** argv) AudioFlinger::instantiate(); MediaPlayerService::instantiate(); CameraService::instantiate(); + AudioPolicyService::instantiate(); ProcessState::self()->startThreadPool(); IPCThreadState::self()->joinThreadPool(); } -- cgit v1.1 From 65ab47156e1c7dfcd8cc4266253a5ff30219e7f0 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Wed, 14 Jul 2010 17:59:35 -0700 Subject: move native services under services/ moved surfaceflinger, audioflinger, cameraservice all native services should now reside in this location. Change-Id: Iee42b83dd2a94c3bf5107ab0895fe2dfcd5337a8 --- media/mediaserver/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'media/mediaserver') diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk index a92cea8..0559812 100644 --- a/media/mediaserver/Android.mk +++ b/media/mediaserver/Android.mk @@ -14,8 +14,8 @@ LOCAL_SHARED_LIBRARIES := \ base := $(LOCAL_PATH)/../.. LOCAL_C_INCLUDES := \ - $(base)/libs/audioflinger \ - $(base)/camera/libcameraservice \ + $(base)/services/audioflinger \ + $(base)/services/camera/libcameraservice \ $(base)/media/libmediaplayerservice LOCAL_MODULE:= mediaserver -- cgit v1.1 From 837b8184e1307991578de5d5d25b62a67bb225f6 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Wed, 30 Nov 2011 09:05:19 -0800 Subject: Delete obsolete includes Change-Id: I960a179a026ff8d710b43b64cb358f18ee04de16 --- media/mediaserver/main_mediaserver.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'media/mediaserver') diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index 7094cfa..b5f85f9 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp @@ -15,11 +15,6 @@ ** limitations under the License. */ -// System headers required for setgroups, etc. -#include -#include -#include - #include #include #include @@ -29,7 +24,6 @@ #include #include #include -#include using namespace android; -- cgit v1.1 From df64d15042bbd5e0e4933ac49bf3c177dd94752c Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 4 Jan 2012 20:05:49 +0000 Subject: Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea --- media/mediaserver/main_mediaserver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'media/mediaserver') diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index b5f85f9..21496a9 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp @@ -31,7 +31,7 @@ int main(int argc, char** argv) { sp proc(ProcessState::self()); sp sm = defaultServiceManager(); - LOGI("ServiceManager: %p", sm.get()); + ALOGI("ServiceManager: %p", sm.get()); AudioFlinger::instantiate(); MediaPlayerService::instantiate(); CameraService::instantiate(); -- cgit v1.1 From 33df529414c248972587d97cbb2e3309e0a7eeff Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Mon, 19 Dec 2011 14:09:14 -0800 Subject: Fix missing tag in mediaserver ServiceManager: log Change-Id: I2d5525ffee0b66c0bc361a02b313ec4dd61e6552 --- media/mediaserver/main_mediaserver.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'media/mediaserver') diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index b5f85f9..54e77ef 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp @@ -15,6 +15,8 @@ ** limitations under the License. */ +#define LOG_TAG "mediaserver" + #include #include #include -- cgit v1.1 From 0e9350254736c4aea154a7a871dd212038050f70 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Tue, 13 Mar 2012 16:09:39 -0700 Subject: Prepare frameworks/native/services/audioflinger Part of this change will be reverted after the move is complete. Change-Id: Ie7f6355368258f2b1344f4ef754da9151a06e41d --- media/mediaserver/Android.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'media/mediaserver') diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk index 0559812..4e9b4cf 100644 --- a/media/mediaserver/Android.mk +++ b/media/mediaserver/Android.mk @@ -11,12 +11,12 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libbinder -base := $(LOCAL_PATH)/../.. - +# FIXME The duplicate audioflinger is temporary LOCAL_C_INCLUDES := \ - $(base)/services/audioflinger \ - $(base)/services/camera/libcameraservice \ - $(base)/media/libmediaplayerservice + frameworks/native/services/audioflinger \ + frameworks/base/services/audioflinger \ + frameworks/base/services/camera/libcameraservice \ + frameworks/base/media/libmediaplayerservice LOCAL_MODULE:= mediaserver -- cgit v1.1 From b4d307481960b6b348fae4b4e8edefd003c3d36c Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Tue, 13 Mar 2012 14:46:23 -0700 Subject: Use correct syntax for #include <> "" Change-Id: I943137108668ae66f8eba18dafe069a7951bcd8f --- media/mediaserver/main_mediaserver.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'media/mediaserver') diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index 1520c01..6b1abb1 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp @@ -16,16 +16,18 @@ */ #define LOG_TAG "mediaserver" +//#define LOG_NDEBUG 0 #include #include #include #include -#include -#include -#include -#include +// from LOCAL_C_INCLUDES +#include "AudioFlinger.h" +#include "CameraService.h" +#include "MediaPlayerService.h" +#include "AudioPolicyService.h" using namespace android; -- cgit v1.1