Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c1b2b18 authored by Jin Park's avatar Jin Park
Browse files

ExifInterface: Add ORF file parse support 

A ORF file has a unique way of storing its data. This CL adds code
that checks whether a file is a ORF file format and parses the data
according to specifications.

Bug: 29409358
Change-Id: I498408a9e02dfe567c2d427b037c30b06af74d7e
parent ad993a17

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -20141,6 +20141,7 @@ package android.media { 
    field public static final deprecated java.lang.String TAG_APERTURE = "FNumber";

    field public static final java.lang.String TAG_APERTURE_VALUE = "ApertureValue";

    field public static final java.lang.String TAG_ARTIST = "Artist";

    field public static final java.lang.String TAG_ASPECT_FRAME = "AspectFrame";

    field public static final java.lang.String TAG_BITS_PER_SAMPLE = "BitsPerSample";

    field public static final java.lang.String TAG_BRIGHTNESS_VALUE = "BrightnessValue";

    field public static final java.lang.String TAG_CFA_PATTERN = "CFAPattern";
@@ -20227,6 +20228,8 @@ package android.media { 
    field public static final java.lang.String TAG_PIXEL_X_DIMENSION = "PixelXDimension";

    field public static final java.lang.String TAG_PIXEL_Y_DIMENSION = "PixelYDimension";

    field public static final java.lang.String TAG_PLANAR_CONFIGURATION = "PlanarConfiguration";

    field public static final java.lang.String TAG_PREVIEW_IMAGE_LENGTH = "PreviewImageLength";

    field public static final java.lang.String TAG_PREVIEW_IMAGE_START = "PreviewImageStart";

    field public static final java.lang.String TAG_PRIMARY_CHROMATICITIES = "PrimaryChromaticities";

    field public static final java.lang.String TAG_REFERENCE_BLACK_WHITE = "ReferenceBlackWhite";

    field public static final java.lang.String TAG_RELATED_SOUND_FILE = "RelatedSoundFile";
@@ -20254,6 +20257,7 @@ package android.media { 
    field public static final java.lang.String TAG_SUBSEC_TIME_DIGITIZED = "SubSecTimeDigitized";

    field public static final deprecated java.lang.String TAG_SUBSEC_TIME_ORIG = "SubSecTimeOriginal";

    field public static final java.lang.String TAG_SUBSEC_TIME_ORIGINAL = "SubSecTimeOriginal";

    field public static final java.lang.String TAG_THUMBNAIL_IMAGE = "ThumbnailImage";

    field public static final java.lang.String TAG_THUMBNAIL_IMAGE_LENGTH = "ThumbnailImageLength";

    field public static final java.lang.String TAG_THUMBNAIL_IMAGE_WIDTH = "ThumbnailImageWidth";

    field public static final java.lang.String TAG_TRANSFER_FUNCTION = "TransferFunction";

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -21651,6 +21651,7 @@ package android.media { 
    field public static final deprecated java.lang.String TAG_APERTURE = "FNumber";

    field public static final java.lang.String TAG_APERTURE_VALUE = "ApertureValue";

    field public static final java.lang.String TAG_ARTIST = "Artist";

    field public static final java.lang.String TAG_ASPECT_FRAME = "AspectFrame";

    field public static final java.lang.String TAG_BITS_PER_SAMPLE = "BitsPerSample";

    field public static final java.lang.String TAG_BRIGHTNESS_VALUE = "BrightnessValue";

    field public static final java.lang.String TAG_CFA_PATTERN = "CFAPattern";
@@ -21737,6 +21738,8 @@ package android.media { 
    field public static final java.lang.String TAG_PIXEL_X_DIMENSION = "PixelXDimension";

    field public static final java.lang.String TAG_PIXEL_Y_DIMENSION = "PixelYDimension";

    field public static final java.lang.String TAG_PLANAR_CONFIGURATION = "PlanarConfiguration";

    field public static final java.lang.String TAG_PREVIEW_IMAGE_LENGTH = "PreviewImageLength";

    field public static final java.lang.String TAG_PREVIEW_IMAGE_START = "PreviewImageStart";

    field public static final java.lang.String TAG_PRIMARY_CHROMATICITIES = "PrimaryChromaticities";

    field public static final java.lang.String TAG_REFERENCE_BLACK_WHITE = "ReferenceBlackWhite";

    field public static final java.lang.String TAG_RELATED_SOUND_FILE = "RelatedSoundFile";
@@ -21764,6 +21767,7 @@ package android.media { 
    field public static final java.lang.String TAG_SUBSEC_TIME_DIGITIZED = "SubSecTimeDigitized";

    field public static final deprecated java.lang.String TAG_SUBSEC_TIME_ORIG = "SubSecTimeOriginal";

    field public static final java.lang.String TAG_SUBSEC_TIME_ORIGINAL = "SubSecTimeOriginal";

    field public static final java.lang.String TAG_THUMBNAIL_IMAGE = "ThumbnailImage";

    field public static final java.lang.String TAG_THUMBNAIL_IMAGE_LENGTH = "ThumbnailImageLength";

    field public static final java.lang.String TAG_THUMBNAIL_IMAGE_WIDTH = "ThumbnailImageWidth";

    field public static final java.lang.String TAG_TRANSFER_FUNCTION = "TransferFunction";

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -20211,6 +20211,7 @@ package android.media { 
    field public static final deprecated java.lang.String TAG_APERTURE = "FNumber";

    field public static final java.lang.String TAG_APERTURE_VALUE = "ApertureValue";

    field public static final java.lang.String TAG_ARTIST = "Artist";

    field public static final java.lang.String TAG_ASPECT_FRAME = "AspectFrame";

    field public static final java.lang.String TAG_BITS_PER_SAMPLE = "BitsPerSample";

    field public static final java.lang.String TAG_BRIGHTNESS_VALUE = "BrightnessValue";

    field public static final java.lang.String TAG_CFA_PATTERN = "CFAPattern";
@@ -20297,6 +20298,8 @@ package android.media { 
    field public static final java.lang.String TAG_PIXEL_X_DIMENSION = "PixelXDimension";

    field public static final java.lang.String TAG_PIXEL_Y_DIMENSION = "PixelYDimension";

    field public static final java.lang.String TAG_PLANAR_CONFIGURATION = "PlanarConfiguration";

    field public static final java.lang.String TAG_PREVIEW_IMAGE_LENGTH = "PreviewImageLength";

    field public static final java.lang.String TAG_PREVIEW_IMAGE_START = "PreviewImageStart";

    field public static final java.lang.String TAG_PRIMARY_CHROMATICITIES = "PrimaryChromaticities";

    field public static final java.lang.String TAG_REFERENCE_BLACK_WHITE = "ReferenceBlackWhite";

    field public static final java.lang.String TAG_RELATED_SOUND_FILE = "RelatedSoundFile";
@@ -20324,6 +20327,7 @@ package android.media { 
    field public static final java.lang.String TAG_SUBSEC_TIME_DIGITIZED = "SubSecTimeDigitized";

    field public static final deprecated java.lang.String TAG_SUBSEC_TIME_ORIG = "SubSecTimeOriginal";

    field public static final java.lang.String TAG_SUBSEC_TIME_ORIGINAL = "SubSecTimeOriginal";

    field public static final java.lang.String TAG_THUMBNAIL_IMAGE = "ThumbnailImage";

    field public static final java.lang.String TAG_THUMBNAIL_IMAGE_LENGTH = "ThumbnailImageLength";

    field public static final java.lang.String TAG_THUMBNAIL_IMAGE_WIDTH = "ThumbnailImageWidth";

    field public static final java.lang.String TAG_TRANSFER_FUNCTION = "TransferFunction";

media/java/android/media/ExifInterface.java

+337 −126

File changed.

Preview size limit exceeded, changes collapsed.