Merge "- Retrieve is_drm in MediaMetadataRetriever. - Add one more column in... (2da9eb71) · Commits · e / os / android_frameworks_base

core/java/android/provider/MediaStore.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -275,6 +275,14 @@ public final class MediaStore {
		* @hide
		*/
		public static final String MEDIA_SCANNER_NEW_OBJECT_ID = "media_scanner_new_object_id";

		/**
		* Non-zero if the media file is drm-protected
		* <P>Type: INTEGER (boolean)</P>
		* @hide
		*/
		public static final String IS_DRM = "is_drm";

		}

		/**
		@@ -1124,19 +1132,19 @@ public final class MediaStore {
		public static final String IS_PODCAST = "is_podcast";

		/**
		* Non-zero id the audio file may be a ringtone
		* Non-zero if the audio file may be a ringtone
		* <P>Type: INTEGER (boolean)</P>
		*/
		public static final String IS_RINGTONE = "is_ringtone";

		/**
		* Non-zero id the audio file may be an alarm
		* Non-zero if the audio file may be an alarm
		* <P>Type: INTEGER (boolean)</P>
		*/
		public static final String IS_ALARM = "is_alarm";

		/**
		* Non-zero id the audio file may be a notification sound
		* Non-zero if the audio file may be a notification sound
		* <P>Type: INTEGER (boolean)</P>
		*/
		public static final String IS_NOTIFICATION = "is_notification";

+1 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ enum {
		METADATA_KEY_VIDEO_HEIGHT = 19,
		METADATA_KEY_BITRATE = 20,
		METADATA_KEY_TIMED_TEXT_LANGUAGES = 21,
		METADATA_KEY_IS_DRM = 22,

		// Add more here...
		};

+8 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,12 @@ public:
		virtual uint32_t flags() const;

		// for DRM
		virtual void setDrmFlag(bool flag) {};
		virtual void setDrmFlag(bool flag) {
		mIsDrm = flag;
		};
		virtual bool getDrmFlag() {
		return mIsDrm;
		}
		virtual char* getDrmTrackInfo(size_t trackID, int *len) {
		return NULL;
		}
		@@ -66,6 +71,8 @@ protected:
		virtual ~MediaExtractor() {}

		private:
		bool mIsDrm;

		MediaExtractor(const MediaExtractor &);
		MediaExtractor &operator=(const MediaExtractor &);
		};

+5 −0

Original line number	Diff line number	Diff line
		@@ -453,5 +453,10 @@ public class MediaMetadataRetriever
		* @hide
		*/
		public static final int METADATA_KEY_TIMED_TEXT_LANGUAGES = 21;
		/**
		* If this key exists the media is drm-protected.
		* @hide
		*/
		public static final int METADATA_KEY_IS_DRM = 22;
		// Add more here...
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -422,6 +422,7 @@ public class MediaScanner
		private long mFileSize;
		private String mWriter;
		private int mCompilation;
		private boolean mIsDrm;
		private boolean mNoMedia; // flag to suppress file from appearing in media tables

		public FileCacheEntry beginFile(String path, String mimeType, long lastModified,
		@@ -497,6 +498,7 @@ public class MediaScanner
		mLastModified = lastModified;
		mWriter = null;
		mCompilation = 0;
		mIsDrm = false;

		return entry;
		}
		@@ -599,6 +601,8 @@ public class MediaScanner
		mWriter = value.trim();
		} else if (name.equalsIgnoreCase("compilation")) {
		mCompilation = parseSubstring(value, 0, 0);
		} else if (name.equalsIgnoreCase("isdrm")) {
		mIsDrm = (parseSubstring(value, 0, 0) == 1);
		}
		}

		@@ -671,6 +675,7 @@ public class MediaScanner
		map.put(MediaStore.MediaColumns.DATE_MODIFIED, mLastModified);
		map.put(MediaStore.MediaColumns.SIZE, mFileSize);
		map.put(MediaStore.MediaColumns.MIME_TYPE, mMimeType);
		map.put(MediaStore.MediaColumns.IS_DRM, mIsDrm);

		if (!mNoMedia) {
		if (MediaFile.isVideoFileType(mFileType)) {