Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Color aspects keys information stored database" am: e4c918ba8e

Browse Source 
am: 89c615866a

Change-Id: Ida5168cf1cea927dd79a9c2bacee0a156af60b76
This commit is contained in:
Chong Zhang
2018-10-24 20:22:18 -07:00
committed by android-build-merger
parent 12b9f89abf 89c615866a
commit e8c39f3ba0
2 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/provider/MediaStore.java
View File

@@ -2090,6 +2090,27 @@ public final class MediaStore {
* <P>Type: INTEGER</P>
*/
public static final String BOOKMARK = "bookmark";
/**
* The standard of color aspects
* <P>Type: INTEGER</P>
* @hide
*/
public static final String COLOR_STANDARD = "color_standard";
/**
* The transfer of color aspects
* <P>Type: INTEGER</P>
* @hide
*/
public static final String COLOR_TRANSFER = "color_transfer";
/**
* The range of color aspects
* <P>Type: INTEGER</P>
* @hide
*/
public static final String COLOR_RANGE = "color_range";
}
public static final class Media implements VideoColumns {

21
media/java/android/media/MediaScanner.java
View File

@@ -513,6 +513,9 @@ public class MediaScanner implements AutoCloseable {
private boolean mScanSuccess;
private int mWidth;
private int mHeight;
private int mColorStandard;
private int mColorTransfer;
private int mColorRange;
public MyMediaScannerClient() {
mDateFormatter = new SimpleDateFormat("yyyyMMdd'T'HHmmss");
@@ -592,6 +595,9 @@ public class MediaScanner implements AutoCloseable {
mCompilation = 0;
mWidth = 0;
mHeight = 0;
mColorStandard = -1;
mColorTransfer = -1;
mColorRange = -1;
return entry;
}
@@ -760,6 +766,12 @@ public class MediaScanner implements AutoCloseable {
mWidth = parseSubstring(value, 0, 0);
} else if (name.equalsIgnoreCase("height")) {
mHeight = parseSubstring(value, 0, 0);
} else if (name.equalsIgnoreCase("colorstandard")) {
mColorStandard = parseSubstring(value, 0, -1);
} else if (name.equalsIgnoreCase("colortransfer")) {
mColorTransfer = parseSubstring(value, 0, -1);
} else if (name.equalsIgnoreCase("colorrange")) {
mColorRange = parseSubstring(value, 0, -1);
} else {
//Log.v(TAG, "unknown tag: " + name + " (" + mProcessGenres + ")");
}
@@ -906,6 +918,15 @@ public class MediaScanner implements AutoCloseable {
if (resolution != null) {
map.put(Video.Media.RESOLUTION, resolution);
}
if (mColorStandard >= 0) {
map.put(Video.Media.COLOR_STANDARD, mColorStandard);
}
if (mColorTransfer >= 0) {
map.put(Video.Media.COLOR_TRANSFER, mColorTransfer);
}
if (mColorRange >= 0) {
map.put(Video.Media.COLOR_RANGE, mColorRange);
}
if (mDate > 0) {
map.put(Video.Media.DATE_TAKEN, mDate);
}