Merge "Refine MediaAnalytics framework" (da913494) · Commits · e / os / android_frameworks_av

include/media/IMediaAnalyticsService.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -49,14 +49,16 @@ public:
		// 'forcenew' marks any matching incomplete record as complete before
		// inserting this new record.
		// returns the sessionID associated with that item.
		virtual MediaAnalyticsItem::SessionID_t submit(sp<MediaAnalyticsItem> item, bool forcenew) = 0;
		// caller continues to own the passed item
		virtual MediaAnalyticsItem::SessionID_t submit(MediaAnalyticsItem *item, bool forcenew) = 0;


		// return lists of records that match the supplied parameters.
		// finished [or not] records since time 'ts' with key 'key'
		// timestamp 'ts' is nanoseconds, unix time.
		virtual List<sp<MediaAnalyticsItem>> *getMediaAnalyticsItemList(bool finished, int64_t ts) = 0;
		virtual List<sp<MediaAnalyticsItem>> *getMediaAnalyticsItemList(bool finished, int64_t ts, MediaAnalyticsItem::Key key) = 0;
		// caller responsible for deallocating returned data structures
		virtual List<MediaAnalyticsItem > getMediaAnalyticsItemList(bool finished, int64_t ts) = 0;
		virtual List<MediaAnalyticsItem > getMediaAnalyticsItemList(bool finished, int64_t ts, MediaAnalyticsItem::Key key) = 0;

		};

include/media/MediaAnalyticsItem.h

+49 −29

Original line number	Diff line number	Diff line
		@@ -36,13 +36,22 @@ class IMediaAnalyticsService;
		// the class interface
		//

		class MediaAnalyticsItem : public RefBase {
		class MediaAnalyticsItem {

		friend class MediaAnalyticsService;
		friend class IMediaAnalyticsService;

		public:

		enum Type {
		kTypeNone = 0,
		kTypeInt32 = 1,
		kTypeInt64 = 2,
		kTypeDouble = 3,
		kTypeCString = 4,
		kTypeRate = 5,
		};

		// sessionid
		// unique within device, within boot,
		typedef int64_t SessionID_t;
		@@ -61,7 +70,7 @@ class MediaAnalyticsItem : public RefBase {
		// Attr: names for attributes within a record
		// format "prop1" or "prop/subprop"
		// XXX: need to better define the format
		typedef AString Attr;
		typedef const char *Attr;


		public:
		@@ -87,6 +96,7 @@ class MediaAnalyticsItem : public RefBase {

		// reset all contents, discarding any extra data
		void clear();
		MediaAnalyticsItem *dup();

		// set the key discriminator for the record.
		// most often initialized as part of the constructor
		@@ -97,28 +107,32 @@ class MediaAnalyticsItem : public RefBase {
		int32_t count() const;

		// set values appropriately
		// return values tell us whether we overwrote an existing value
		bool setInt32(Attr, int32_t value);
		bool setInt64(Attr, int64_t value);
		bool setDouble(Attr, double value);
		bool setCString(Attr, const char *value);
		void setInt32(Attr, int32_t value);
		void setInt64(Attr, int64_t value);
		void setDouble(Attr, double value);
		void setRate(Attr, int64_t count, int64_t duration);
		void setCString(Attr, const char *value);

		// fused get/add/set; if attr wasn't there, it's a simple set.
		// type-mismatch counts as "wasn't there".
		// return value tells us whether we overwrote an existing value
		bool addInt32(Attr, int32_t value);
		bool addInt64(Attr, int64_t value);
		bool addDouble(Attr, double value);
		void addInt32(Attr, int32_t value);
		void addInt64(Attr, int64_t value);
		void addDouble(Attr, double value);
		void addRate(Attr, int64_t count, int64_t duration);

		// find & extract values
		// return indicates whether attr exists (and thus value filled in)
		// NULL parameter value suppresses storage of value.
		bool getInt32(Attr, int32_t *value);
		bool getInt64(Attr, int64_t *value);
		bool getDouble(Attr, double *value);
		bool getRate(Attr, int64_t count, int64_t duration, double *rate);
		// Caller owns the returned string
		bool getCString(Attr, char **value);

		// parameter indicates whether to close any existing open
		// record with same key before establishing a new record
		// caller retains ownership of 'this'.
		bool selfrecord(bool);
		bool selfrecord();

		@@ -159,7 +173,8 @@ class MediaAnalyticsItem : public RefBase {
		// merge fields from arg into this
		// with rules for first/last/add, etc
		// XXX: document semantics and how they are indicated
		bool merge(sp<MediaAnalyticsItem> );
		// caller continues to own 'incoming'
		bool merge(MediaAnalyticsItem *incoming);

		// enabled 1, disabled 0
		static const char * const EnabledProperty;
		@@ -185,31 +200,36 @@ class MediaAnalyticsItem : public RefBase {

		Key mKey;

		class Item : public RefBase {

		public:

		enum Type {
		kTypeNone = 0,
		kTypeInt32 = 1,
		kTypeInt64 = 2,
		kTypeDouble = 3,
		kTypeCString = 4,
		};

		Item();
		~Item();
		void clear();
		struct Prop {

		Type mType;
		const char *mName;
		size_t mNameLen; // the strlen(), doesn't include the null
		union {
		int32_t int32Value;
		int64_t int64Value;
		double doubleValue;
		char *CStringValue;
		struct { int64_t count, duration; } rate;
		} u;
		void setName(const char *name, size_t len);
		};

		void initProp(Prop *item);
		void clearProp(Prop *item);
		void clearPropValue(Prop *item);
		void copyProp(Prop dst, const Prop src);
		enum {
		kGrowProps = 10
		};
		KeyedVector<Attr, sp<Item>> mItems;
		void growProps(int increment = kGrowProps);
		size_t findPropIndex(const char *name, size_t len);
		Prop findProp(const char name);
		Prop allocateProp(const char name);

		size_t mPropCount;
		size_t mPropSize;
		Prop *mProps;

		};

media/libmedia/IMediaAnalyticsService.cpp

+13 −13

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ public:
		return sessionid;
		}

		virtual MediaAnalyticsItem::SessionID_t submit(sp<MediaAnalyticsItem> item, bool forcenew)
		virtual MediaAnalyticsItem::SessionID_t submit(MediaAnalyticsItem *item, bool forcenew)
		{
		// have this record submit itself
		// this will be a binder call with appropriate timing
		@@ -115,12 +115,12 @@ public:
		return sessionid;
		}

		virtual List<sp<MediaAnalyticsItem>> *getMediaAnalyticsItemList(bool finished, nsecs_t ts)
		virtual List<MediaAnalyticsItem> getMediaAnalyticsItemList(bool finished, nsecs_t ts)
		{
		return getMediaAnalyticsItemList(finished, ts, MediaAnalyticsItem::kKeyAny);
		}

		virtual List<sp<MediaAnalyticsItem>> *getMediaAnalyticsItemList(bool finished, nsecs_t ts, MediaAnalyticsItem::Key key)
		virtual List<MediaAnalyticsItem> getMediaAnalyticsItemList(bool finished, nsecs_t ts, MediaAnalyticsItem::Key key)
		{
		Parcel data, reply;
		status_t err;
		@@ -140,12 +140,12 @@ public:

		// read a count
		int32_t count = reply.readInt32();
		List<sp<MediaAnalyticsItem>> *list = NULL;
		List<MediaAnalyticsItem> list = NULL;

		if (count > 0) {
		list = new List<sp<MediaAnalyticsItem>>();
		list = new List<MediaAnalyticsItem*>();
		for (int i=0;i<count;i++) {
		sp<MediaAnalyticsItem> item = new MediaAnalyticsItem;
		MediaAnalyticsItem *item = new MediaAnalyticsItem();
		// XXX: watch for failures here
		item->readFromParcel(reply);
		list->push_back(item);
		@@ -190,14 +190,14 @@ status_t BnMediaAnalyticsService::onTransact(
		CHECK_INTERFACE(IMediaAnalyticsService, data, reply);

		bool forcenew;
		sp<MediaAnalyticsItem> item = new MediaAnalyticsItem;
		MediaAnalyticsItem *item = new MediaAnalyticsItem;

		data.readBool(&forcenew);
		item->readFromParcel(data);

		item->setPid(clientPid);

		// submit() takes ownership of / responsibility for the item
		// submit() takes over ownership of 'item'
		MediaAnalyticsItem::SessionID_t sessionid = submit(item, forcenew);
		reply->writeInt64(sessionid);

		@@ -212,11 +212,11 @@ status_t BnMediaAnalyticsService::onTransact(
		MediaAnalyticsItem::Key key = data.readCString();

		// find the (0 or more) items
		List<sp<MediaAnalyticsItem>> *list = getMediaAnalyticsItemList(finished, ts, key);
		List<MediaAnalyticsItem> list = getMediaAnalyticsItemList(finished, ts, key);
		// encapsulate/serialize them
		reply->writeInt32(list->size());
		if (list->size() > 0) {
		for (List<sp<MediaAnalyticsItem>>::iterator it = list->begin();
		for (List<MediaAnalyticsItem*>::iterator it = list->begin();
		it != list->end(); it++) {
		(*it)->writeToParcel(reply);
		}