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

Commit 9ff5cefd authored by Jin Park's avatar Jin Park
Browse files

ExifInterface: Add PEF, RW2 files parse support 

PEF, RW2 files have unique ways of storing their data. This CL adds code
that checks whether a file is one of these formats and parses the data
according to specifications.

Bug: 29409358
Change-Id: I6c368b4865414062f9f535bf180d7d7bf6984a7d
parent 1c1b2b18

api/current.txt

+10 −4
Original line number Diff line number Diff line
@@ -20141,7 +20141,6 @@ 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";
@@ -20223,18 +20222,26 @@ package android.media { 
    field public static final java.lang.String TAG_MODEL = "Model";

    field public static final java.lang.String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";

    field public static final java.lang.String TAG_OECF = "OECF";

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

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

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

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

    field public static final java.lang.String TAG_ORIENTATION = "Orientation";

    field public static final java.lang.String TAG_PHOTOMETRIC_INTERPRETATION = "PhotometricInterpretation";

    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";

    field public static final java.lang.String TAG_RESOLUTION_UNIT = "ResolutionUnit";

    field public static final java.lang.String TAG_ROWS_PER_STRIP = "RowsPerStrip";

    field public static final java.lang.String TAG_RW2_ISO = "ISO";

    field public static final java.lang.String TAG_RW2_JPG_FROM_RAW = "JpgFromRaw";

    field public static final java.lang.String TAG_RW2_SENSOR_BOTTOM_BORDER = "SensorBottomBorder";

    field public static final java.lang.String TAG_RW2_SENSOR_LEFT_BORDER = "SensorLeftBorder";

    field public static final java.lang.String TAG_RW2_SENSOR_RIGHT_BORDER = "SensorRightBorder";

    field public static final java.lang.String TAG_RW2_SENSOR_TOP_BORDER = "SensorTopBorder";

    field public static final java.lang.String TAG_SAMPLES_PER_PIXEL = "SamplesPerPixel";

    field public static final java.lang.String TAG_SATURATION = "Saturation";

    field public static final java.lang.String TAG_SCENE_CAPTURE_TYPE = "SceneCaptureType";
@@ -20257,7 +20264,6 @@ 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

+10 −4
Original line number Diff line number Diff line
@@ -21651,7 +21651,6 @@ 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";
@@ -21733,18 +21732,26 @@ package android.media { 
    field public static final java.lang.String TAG_MODEL = "Model";

    field public static final java.lang.String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";

    field public static final java.lang.String TAG_OECF = "OECF";

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

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

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

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

    field public static final java.lang.String TAG_ORIENTATION = "Orientation";

    field public static final java.lang.String TAG_PHOTOMETRIC_INTERPRETATION = "PhotometricInterpretation";

    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";

    field public static final java.lang.String TAG_RESOLUTION_UNIT = "ResolutionUnit";

    field public static final java.lang.String TAG_ROWS_PER_STRIP = "RowsPerStrip";

    field public static final java.lang.String TAG_RW2_ISO = "ISO";

    field public static final java.lang.String TAG_RW2_JPG_FROM_RAW = "JpgFromRaw";

    field public static final java.lang.String TAG_RW2_SENSOR_BOTTOM_BORDER = "SensorBottomBorder";

    field public static final java.lang.String TAG_RW2_SENSOR_LEFT_BORDER = "SensorLeftBorder";

    field public static final java.lang.String TAG_RW2_SENSOR_RIGHT_BORDER = "SensorRightBorder";

    field public static final java.lang.String TAG_RW2_SENSOR_TOP_BORDER = "SensorTopBorder";

    field public static final java.lang.String TAG_SAMPLES_PER_PIXEL = "SamplesPerPixel";

    field public static final java.lang.String TAG_SATURATION = "Saturation";

    field public static final java.lang.String TAG_SCENE_CAPTURE_TYPE = "SceneCaptureType";
@@ -21767,7 +21774,6 @@ 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

+10 −4
Original line number Diff line number Diff line
@@ -20211,7 +20211,6 @@ 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";
@@ -20293,18 +20292,26 @@ package android.media { 
    field public static final java.lang.String TAG_MODEL = "Model";

    field public static final java.lang.String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";

    field public static final java.lang.String TAG_OECF = "OECF";

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

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

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

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

    field public static final java.lang.String TAG_ORIENTATION = "Orientation";

    field public static final java.lang.String TAG_PHOTOMETRIC_INTERPRETATION = "PhotometricInterpretation";

    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";

    field public static final java.lang.String TAG_RESOLUTION_UNIT = "ResolutionUnit";

    field public static final java.lang.String TAG_ROWS_PER_STRIP = "RowsPerStrip";

    field public static final java.lang.String TAG_RW2_ISO = "ISO";

    field public static final java.lang.String TAG_RW2_JPG_FROM_RAW = "JpgFromRaw";

    field public static final java.lang.String TAG_RW2_SENSOR_BOTTOM_BORDER = "SensorBottomBorder";

    field public static final java.lang.String TAG_RW2_SENSOR_LEFT_BORDER = "SensorLeftBorder";

    field public static final java.lang.String TAG_RW2_SENSOR_RIGHT_BORDER = "SensorRightBorder";

    field public static final java.lang.String TAG_RW2_SENSOR_TOP_BORDER = "SensorTopBorder";

    field public static final java.lang.String TAG_SAMPLES_PER_PIXEL = "SamplesPerPixel";

    field public static final java.lang.String TAG_SATURATION = "Saturation";

    field public static final java.lang.String TAG_SCENE_CAPTURE_TYPE = "SceneCaptureType";
@@ -20327,7 +20334,6 @@ 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

+310 −82

File changed.

Preview size limit exceeded, changes collapsed.