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

Merge "Extract exif data from mp4 extractor if available" into pi-dev

Browse Source 
am: 0c42369361

Change-Id: I13e1140d0f70d0046dcd02175cc8940f6fb15ef2
This commit is contained in:
Chong Zhang
2018-04-05 22:28:58 -07:00
committed by android-build-merger
parent b198f1a43f 0c42369361
commit 5f15f4734c
2 changed files with 68 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
media/java/android/media/ExifInterface.java
View File

@@ -66,7 +66,7 @@ import libcore.io.Streams;
/**
* This is a class for reading and writing Exif tags in a JPEG file or a RAW image file.
* <p>
* Supported formats are: JPEG, DNG, CR2, NEF, NRW, ARW, RW2, ORF, PEF, SRW and RAF.
* Supported formats are: JPEG, DNG, CR2, NEF, NRW, ARW, RW2, ORF, PEF, SRW, RAF and HEIF.
* <p>
* Attribute mutation is supported for JPEG image files.
*/
@@ -2524,46 +2524,46 @@ public class ExifInterface {
private void getHeifAttributes(ByteOrderedDataInputStream in) throws IOException {
MediaMetadataRetriever retriever = new MediaMetadataRetriever();
try {
if (mSeekableFileDescriptor != null) {
retriever.setDataSource(mSeekableFileDescriptor);
} else {
retriever.setDataSource(new MediaDataSource() {
long mPosition;
retriever.setDataSource(new MediaDataSource() {
long mPosition;
@Override
public void close() throws IOException {}
@Override
public void close() throws IOException {}
@Override
public int readAt(long position, byte[] buffer, int offset, int size)
throws IOException {
if (size == 0) {
return 0;
}
if (position < 0) {
return -1;
}
if (mPosition != position) {
in.seek(position);
mPosition = position;
}
int bytesRead = in.read(buffer, offset, size);
if (bytesRead < 0) {
mPosition = -1; // need to seek on next read
return -1;
}
mPosition += bytesRead;
return bytesRead;
@Override
public int readAt(long position, byte[] buffer, int offset, int size)
throws IOException {
if (size == 0) {
return 0;
}
@Override
public long getSize() throws IOException {
if (position < 0) {
return -1;
}
});
}
if (mPosition != position) {
in.seek(position);
mPosition = position;
}
int bytesRead = in.read(buffer, offset, size);
if (bytesRead < 0) {
mPosition = -1; // need to seek on next read
return -1;
}
mPosition += bytesRead;
return bytesRead;
}
@Override
public long getSize() throws IOException {
return -1;
}
});
String exifOffsetStr = retriever.extractMetadata(
MediaMetadataRetriever.METADATA_KEY_EXIF_OFFSET);
String exifLengthStr = retriever.extractMetadata(
MediaMetadataRetriever.METADATA_KEY_EXIF_LENGTH);
String hasImage = retriever.extractMetadata(
MediaMetadataRetriever.METADATA_KEY_HAS_IMAGE);
String hasVideo = retriever.extractMetadata(
@@ -2622,6 +2622,30 @@ public class ExifInterface {
ExifAttribute.createUShort(orientation, mExifByteOrder));
}
if (exifOffsetStr != null && exifLengthStr != null) {
int offset = Integer.parseInt(exifOffsetStr);
int length = Integer.parseInt(exifLengthStr);
if (length <= 6) {
throw new IOException("Invalid exif length");
}
in.seek(offset);
byte[] identifier = new byte[6];
if (in.read(identifier) != 6) {
throw new IOException("Can't read identifier");
}
offset += 6;
length -= 6;
if (!Arrays.equals(identifier, IDENTIFIER_EXIF_APP1)) {
throw new IOException("Invalid identifier");
}
byte[] bytes = new byte[length];
if (in.read(bytes) != length) {
throw new IOException("Can't read exif");
}
readExifSegment(bytes, IFD_TYPE_PRIMARY);
}
if (DEBUG) {
Log.d(TAG, "Heif meta: " + width + "x" + height + ", rotation " + rotation);
}

9
media/java/android/media/MediaMetadataRetriever.java
View File

@@ -890,5 +890,14 @@ public class MediaMetadataRetriever
*/
public static final int METADATA_KEY_VIDEO_FRAME_COUNT = 32;
/**
* @hide
*/
public static final int METADATA_KEY_EXIF_OFFSET = 33;
/**
* @hide
*/
public static final int METADATA_KEY_EXIF_LENGTH = 34;
// Add more here...
}