- Add method in MediaPlayerService to collect and pull (d211f41f) · Commits · e / os / android_frameworks_base

include/media/IMediaPlayerService.h

+16 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,22 @@ public:
		virtual sp<IMemory> decode(const char* url, uint32_t pSampleRate, int pNumChannels, int* pFormat) = 0;
		virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t pSampleRate, int pNumChannels, int* pFormat) = 0;
		virtual sp<IOMX> getOMX() = 0;

		// codecs usage tracking for the battery app
		enum BatteryDataBits {
		// tracking audio codec
		kBatteryDataTrackAudio = 1,
		// tracking video codec
		kBatteryDataTrackVideo = 2,
		// codec is started, otherwise codec is paused
		kBatteryDataCodecStarted = 4,
		// tracking decoder (for media player),
		// otherwise tracking encoder (for media recorder)
		kBatteryDataTrackDecoder = 8,
		};

		virtual void addBatteryData(uint32_t params) = 0;
		virtual status_t pullBatteryData(Parcel* reply) = 0;
		};

		// ----------------------------------------------------------------------------

media/java/android/media/MediaPlayer.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -1228,6 +1228,14 @@ public class MediaPlayer
		private native final void native_setup(Object mediaplayer_this);
		private native final void native_finalize();

		/**
		* @param reply Parcel with audio/video duration info for battery
		tracking usage
		* @return The status code.
		* {@hide}
		*/
		public native static int native_pullBatteryData(Parcel reply);

		@Override
		protected void finalize() { native_finalize(); }

media/jni/android_media_MediaPlayer.cpp

+18 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@
		#include "android_util_Binder.h"
		#include <binder/Parcel.h>
		#include <surfaceflinger/Surface.h>
		#include <binder/IPCThreadState.h>
		#include <binder/IServiceManager.h>

		// ----------------------------------------------------------------------------

		@@ -723,6 +725,21 @@ static void android_media_MediaPlayer_attachAuxEffect(JNIEnv *env, jobject thiz
		process_media_player_call( env, thiz, mp->attachAuxEffect(effectId), NULL, NULL );
		}

		static jint
		android_media_MediaPlayer_pullBatteryData(JNIEnv *env, jobject thiz, jobject java_reply)
		{
		sp<IBinder> binder = defaultServiceManager()->getService(String16("media.player"));
		sp<IMediaPlayerService> service = interface_cast<IMediaPlayerService>(binder);
		if (service.get() == NULL) {
		jniThrowException(env, "java/lang/RuntimeException", "cannot get MediaPlayerService");
		return UNKNOWN_ERROR;
		}

		Parcel *reply = parcelForJavaObject(env, java_reply);

		return service->pullBatteryData(reply);
		}

		// ----------------------------------------------------------------------------

		static JNINativeMethod gMethods[] = {
		@@ -758,6 +775,7 @@ static JNINativeMethod gMethods[] = {
		{"setAudioSessionId", "(I)V", (void *)android_media_MediaPlayer_set_audio_session_id},
		{"setAuxEffectSendLevel", "(F)V", (void *)android_media_MediaPlayer_setAuxEffectSendLevel},
		{"attachAuxEffect", "(I)V", (void *)android_media_MediaPlayer_attachAuxEffect},
		{"native_pullBatteryData", "(Landroid/os/Parcel;)I", (void *)android_media_MediaPlayer_pullBatteryData},
		};

		static const char* const kClassPathName = "android/media/MediaPlayer";

media/libmedia/IMediaPlayerService.cpp

+27 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,9 @@ enum {
		DECODE_FD,
		CREATE_MEDIA_RECORDER,
		CREATE_METADATA_RETRIEVER,
		GET_OMX
		GET_OMX,
		ADD_BATTERY_DATA,
		PULL_BATTERY_DATA
		};

		class BpMediaPlayerService: public BpInterface<IMediaPlayerService>
		@@ -156,6 +158,19 @@ public:
		remote()->transact(GET_OMX, data, &reply);
		return interface_cast<IOMX>(reply.readStrongBinder());
		}

		virtual void addBatteryData(uint32_t params) {
		Parcel data, reply;
		data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor());
		data.writeInt32(params);
		remote()->transact(ADD_BATTERY_DATA, data, &reply);
		}

		virtual status_t pullBatteryData(Parcel* reply) {
		Parcel data;
		data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor());
		return remote()->transact(PULL_BATTERY_DATA, data, reply);
		}
		};

		IMPLEMENT_META_INTERFACE(MediaPlayerService, "android.media.IMediaPlayerService");
		@@ -270,6 +285,17 @@ status_t BnMediaPlayerService::onTransact(
		reply->writeStrongBinder(omx->asBinder());
		return NO_ERROR;
		} break;
		case ADD_BATTERY_DATA: {
		CHECK_INTERFACE(IMediaPlayerService, data, reply);
		uint32_t params = data.readInt32();
		addBatteryData(params);
		return NO_ERROR;
		} break;
		case PULL_BATTERY_DATA: {
		CHECK_INTERFACE(IMediaPlayerService, data, reply);
		pullBatteryData(reply);
		return NO_ERROR;
		} break;
		default:
		return BBinder::onTransact(code, data, reply, flags);
		}

media/libmediaplayerservice/MediaPlayerService.cpp

+92 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@

		#include <sys/types.h>
		#include <sys/stat.h>
		#include <sys/time.h>
		#include <dirent.h>
		#include <unistd.h>

		@@ -51,6 +52,8 @@
		#include <media/Metadata.h>
		#include <media/AudioTrack.h>

		#include <private/android_filesystem_config.h>

		#include "MediaRecorderClient.h"
		#include "MediaPlayerService.h"
		#include "MetadataRetrieverClient.h"
		@@ -1762,4 +1765,93 @@ int MediaPlayerService::AudioCache::getSessionId()
		return 0;
		}

		void MediaPlayerService::addBatteryData(uint32_t params)
		{
		Mutex::Autolock lock(mLock);
		int uid = IPCThreadState::self()->getCallingUid();
		if (uid == AID_MEDIA) {
		return;
		}
		int index = mBatteryData.indexOfKey(uid);
		int32_t time = systemTime() / 1000000L;

		if (index < 0) { // create a new entry for this UID
		BatteryUsageInfo info;
		info.audioTotalTime = 0;
		info.videoTotalTime = 0;
		info.audioLastTime = 0;
		info.videoLastTime = 0;
		info.refCount = 0;

		mBatteryData.add(uid, info);
		}

		BatteryUsageInfo &info = mBatteryData.editValueFor(uid);

		if (params & kBatteryDataCodecStarted) {
		if (params & kBatteryDataTrackAudio) {
		info.audioLastTime -= time;
		info.refCount ++;
		}
		if (params & kBatteryDataTrackVideo) {
		info.videoLastTime -= time;
		info.refCount ++;
		}
		} else {
		if (info.refCount == 0) {
		LOGW("Battery track warning: refCount is already 0");
		return;
		} else if (info.refCount < 0) {
		LOGE("Battery track error: refCount < 0");
		mBatteryData.removeItem(uid);
		return;
		}

		if (params & kBatteryDataTrackAudio) {
		info.audioLastTime += time;
		info.refCount --;
		}
		if (params & kBatteryDataTrackVideo) {
		info.videoLastTime += time;
		info.refCount --;
		}

		// no stream is being played by this UID
		if (info.refCount == 0) {
		info.audioTotalTime += info.audioLastTime;
		info.audioLastTime = 0;
		info.videoTotalTime += info.videoLastTime;
		info.videoLastTime = 0;
		}
		}
		}

		status_t MediaPlayerService::pullBatteryData(Parcel* reply) {
		Mutex::Autolock lock(mLock);
		BatteryUsageInfo info;
		int size = mBatteryData.size();

		reply->writeInt32(size);
		int i = 0;

		while (i < size) {
		info = mBatteryData.valueAt(i);

		reply->writeInt32(mBatteryData.keyAt(i)); //UID
		reply->writeInt32(info.audioTotalTime);
		reply->writeInt32(info.videoTotalTime);

		info.audioTotalTime = 0;
		info.videoTotalTime = 0;

		// remove the UID entry where no stream is being played
		if (info.refCount <= 0) {
		mBatteryData.removeItemsAt(i);
		size --;
		i --;
		}
		i++;
		}
		return NO_ERROR;
		}
		} // namespace android