From 559bf2836f5da25b75bfb229fec0d20d540ee426 Mon Sep 17 00:00:00 2001 From: James Dong Date: Wed, 28 Mar 2012 10:29:14 -0700 Subject: AV Android make files changes o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10 --- media/libmediaplayerservice/ActivityManager.cpp | 61 ++++++++++++++++++++++ media/libmediaplayerservice/ActivityManager.h | 31 +++++++++++ media/libmediaplayerservice/Android.mk | 6 +-- media/libmediaplayerservice/MediaPlayerService.cpp | 3 +- .../libmediaplayerservice/MediaRecorderClient.cpp | 1 - .../MetadataRetrieverClient.cpp | 1 - media/libmediaplayerservice/nuplayer/Android.mk | 8 +-- 7 files changed, 100 insertions(+), 11 deletions(-) create mode 100644 media/libmediaplayerservice/ActivityManager.cpp create mode 100644 media/libmediaplayerservice/ActivityManager.h (limited to 'media/libmediaplayerservice') diff --git a/media/libmediaplayerservice/ActivityManager.cpp b/media/libmediaplayerservice/ActivityManager.cpp new file mode 100644 index 0000000..60a209f --- /dev/null +++ b/media/libmediaplayerservice/ActivityManager.cpp @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2006 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. + */ + +#include +#include +#include +#include +#include + +#include "ActivityManager.h" + +namespace android { + +const uint32_t OPEN_CONTENT_URI_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION + 4; + +// Perform ContentProvider.openFile() on the given URI, returning +// the resulting native file descriptor. Returns < 0 on error. +int openContentProviderFile(const String16& uri) +{ + int fd = -1; + + sp sm = defaultServiceManager(); + sp am = sm->getService(String16("activity")); + if (am != NULL) { + Parcel data, reply; + data.writeInterfaceToken(String16("android.app.IActivityManager")); + data.writeString16(uri); + status_t ret = am->transact(OPEN_CONTENT_URI_TRANSACTION, data, &reply); + if (ret == NO_ERROR) { + int32_t exceptionCode = reply.readExceptionCode(); + if (!exceptionCode) { + // Success is indicated here by a nonzero int followed by the fd; + // failure by a zero int with no data following. + if (reply.readInt32() != 0) { + fd = dup(reply.readFileDescriptor()); + } + } else { + // An exception was thrown back; fall through to return failure + ALOGD("openContentUri(%s) caught exception %d\n", + String8(uri).string(), exceptionCode); + } + } + } + + return fd; +} + +} /* namespace android */ diff --git a/media/libmediaplayerservice/ActivityManager.h b/media/libmediaplayerservice/ActivityManager.h new file mode 100644 index 0000000..451a004 --- /dev/null +++ b/media/libmediaplayerservice/ActivityManager.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 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. + */ + +#ifndef ActivityManager_H +#define ActivityManager_H + +#include + +namespace android { + +// Perform a ContentProvider.openFile() call for the given URI. +// +// Returns the native file descriptor for the opened stream, < 0 on error. +extern int openContentProviderFile(const String16& uri); + +} + +#endif diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index 675c563..f173e2e 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -7,6 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ + ActivityManager.cpp \ Crypto.cpp \ MediaRecorderClient.cpp \ MediaPlayerService.cpp \ @@ -26,7 +27,6 @@ LOCAL_SHARED_LIBRARIES := \ libmedia \ libmedia_native \ libcamera_client \ - libandroid_runtime \ libstagefright \ libstagefright_omx \ libstagefright_foundation \ @@ -40,8 +40,8 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_C_INCLUDES := \ $(call include-path-for, graphics corecg) \ - $(TOP)/frameworks/base/media/libstagefright/include \ - $(TOP)/frameworks/base/media/libstagefright/rtsp \ + $(TOP)/frameworks/av/media/libstagefright/include \ + $(TOP)/frameworks/av/media/libstagefright/rtsp \ $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/external/tremolo/Tremolo \ diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 123d07f..cc3138d 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -34,8 +34,6 @@ #include -#include - #include #include #include @@ -59,6 +57,7 @@ #include +#include "ActivityManager.h" #include "MediaRecorderClient.h" #include "MediaPlayerService.h" #include "MetadataRetrieverClient.h" diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp index beda945..eadc8ee 100644 --- a/media/libmediaplayerservice/MediaRecorderClient.cpp +++ b/media/libmediaplayerservice/MediaRecorderClient.cpp @@ -25,7 +25,6 @@ #include #include #include // for property_get -#include #include #include #include diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp index 776d288..e44031e 100644 --- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp +++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/media/libmediaplayerservice/nuplayer/Android.mk b/media/libmediaplayerservice/nuplayer/Android.mk index 73336ef..f97ba57 100644 --- a/media/libmediaplayerservice/nuplayer/Android.mk +++ b/media/libmediaplayerservice/nuplayer/Android.mk @@ -13,10 +13,10 @@ LOCAL_SRC_FILES:= \ StreamingSource.cpp \ LOCAL_C_INCLUDES := \ - $(TOP)/frameworks/base/media/libstagefright/httplive \ - $(TOP)/frameworks/base/media/libstagefright/include \ - $(TOP)/frameworks/base/media/libstagefright/mpeg2ts \ - $(TOP)/frameworks/base/media/libstagefright/rtsp \ + $(TOP)/frameworks/av/media/libstagefright/httplive \ + $(TOP)/frameworks/av/media/libstagefright/include \ + $(TOP)/frameworks/av/media/libstagefright/mpeg2ts \ + $(TOP)/frameworks/av/media/libstagefright/rtsp \ $(TOP)/frameworks/native/include/media/openmax LOCAL_MODULE:= libstagefright_nuplayer -- cgit v1.1