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

Commit 8409c069 authored by Jaesung Chung's avatar Jaesung Chung
Browse files

Enable reading a thumbnail from RAW image files in MtpDatabase 

Also introduce new supported RAW image file formats, PEF and SRW.

RAW image file formats are not defined in PTP 1.2 specification except
for DNG. They are mostly built on top of TIFF or TIFF/EP. (Fuji's RAF
is the exception).

In this CL, image file formats are classified newly as below:

DNG: dng
TIFF: cr2, nrw, arw, rw2, orf, pef, srw
TIFF/EP: nef
Unknown Image Formats(FORMAT_DEFINED): wbmap, webp, raf

I referred to the following documents for defining MTP formats of RAW
images:

* http://www.rags-int-inc.com/PhotoTechStuff/RawStandards/RawSummary.html
* https://en.wikipedia.org/wiki/Raw_image_format

Bug: 26552863, Bug: 26626825
Change-Id: Ia218f6320c4c1ff051a23ca0060ceac46134b0d7
parent 90131a91

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -22500,6 +22500,7 @@ package android.mtp { 
    field public static final int FORMAT_AUDIBLE = 47364; // 0xb904

    field public static final int FORMAT_AVI = 12298; // 0x300a

    field public static final int FORMAT_BMP = 14340; // 0x3804

    field public static final int FORMAT_DEFINED = 14336; // 0x3800

    field public static final int FORMAT_DNG = 14353; // 0x3811

    field public static final int FORMAT_DPOF = 12294; // 0x3006

    field public static final int FORMAT_EXECUTABLE = 12291; // 0x3003

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24056,6 +24056,7 @@ package android.mtp { 
    field public static final int FORMAT_AUDIBLE = 47364; // 0xb904

    field public static final int FORMAT_AVI = 12298; // 0x300a

    field public static final int FORMAT_BMP = 14340; // 0x3804

    field public static final int FORMAT_DEFINED = 14336; // 0x3800

    field public static final int FORMAT_DNG = 14353; // 0x3811

    field public static final int FORMAT_DPOF = 12294; // 0x3006

    field public static final int FORMAT_EXECUTABLE = 12291; // 0x3003

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -22508,6 +22508,7 @@ package android.mtp { 
    field public static final int FORMAT_AUDIBLE = 47364; // 0xb904

    field public static final int FORMAT_AVI = 12298; // 0x300a

    field public static final int FORMAT_BMP = 14340; // 0x3804

    field public static final int FORMAT_DEFINED = 14336; // 0x3800

    field public static final int FORMAT_DNG = 14353; // 0x3811

    field public static final int FORMAT_DPOF = 12294; // 0x3006

    field public static final int FORMAT_EXECUTABLE = 12291; // 0x3003

media/java/android/media/MediaFile.java

+14 −10
Original line number Diff line number Diff line
@@ -91,8 +91,10 @@ public class MediaFile { 
    public static final int FILE_TYPE_RW2     = 305;

    public static final int FILE_TYPE_ORF     = 306;

    public static final int FILE_TYPE_RAF     = 307;

    public static final int FILE_TYPE_PEF     = 308;

    public static final int FILE_TYPE_SRW     = 309;

    private static final int FIRST_RAW_IMAGE_FILE_TYPE = FILE_TYPE_DNG;

    private static final int LAST_RAW_IMAGE_FILE_TYPE = FILE_TYPE_RAF;

    private static final int LAST_RAW_IMAGE_FILE_TYPE = FILE_TYPE_SRW;



    // Playlist file types

    public static final int FILE_TYPE_M3U      = 41;
@@ -228,17 +230,19 @@ public class MediaFile { 
        addFileType("GIF", FILE_TYPE_GIF, "image/gif", MtpConstants.FORMAT_GIF);

        addFileType("PNG", FILE_TYPE_PNG, "image/png", MtpConstants.FORMAT_PNG);

        addFileType("BMP", FILE_TYPE_BMP, "image/x-ms-bmp", MtpConstants.FORMAT_BMP);

        addFileType("WBMP", FILE_TYPE_WBMP, "image/vnd.wap.wbmp");

        addFileType("WEBP", FILE_TYPE_WEBP, "image/webp");

        addFileType("WBMP", FILE_TYPE_WBMP, "image/vnd.wap.wbmp", MtpConstants.FORMAT_DEFINED);

        addFileType("WEBP", FILE_TYPE_WEBP, "image/webp", MtpConstants.FORMAT_DEFINED);



        addFileType("DNG", FILE_TYPE_DNG, "image/x-adobe-dng", MtpConstants.FORMAT_DNG);

        addFileType("CR2", FILE_TYPE_CR2, "image/x-canon-cr2");

        addFileType("NEF", FILE_TYPE_NEF, "image/x-nikon-nef");

        addFileType("NRW", FILE_TYPE_NRW, "image/x-nikon-nrw");

        addFileType("ARW", FILE_TYPE_ARW, "image/x-sony-arw");

        addFileType("RW2", FILE_TYPE_RW2, "image/x-panasonic-rw2");

        addFileType("ORF", FILE_TYPE_ORF, "image/x-olympus-orf");

        addFileType("RAF", FILE_TYPE_RAF, "image/x-fuji-raf");

        addFileType("CR2", FILE_TYPE_CR2, "image/x-canon-cr2", MtpConstants.FORMAT_TIFF);

        addFileType("NEF", FILE_TYPE_NEF, "image/x-nikon-nef", MtpConstants.FORMAT_TIFF_EP);

        addFileType("NRW", FILE_TYPE_NRW, "image/x-nikon-nrw", MtpConstants.FORMAT_TIFF);

        addFileType("ARW", FILE_TYPE_ARW, "image/x-sony-arw", MtpConstants.FORMAT_TIFF);

        addFileType("RW2", FILE_TYPE_RW2, "image/x-panasonic-rw2", MtpConstants.FORMAT_TIFF);

        addFileType("ORF", FILE_TYPE_ORF, "image/x-olympus-orf", MtpConstants.FORMAT_TIFF);

        addFileType("RAF", FILE_TYPE_RAF, "image/x-fuji-raf", MtpConstants.FORMAT_DEFINED);

        addFileType("PEF", FILE_TYPE_PEF, "image/x-pentax-pef", MtpConstants.FORMAT_TIFF);

        addFileType("SRW", FILE_TYPE_SRW, "image/x-samsung-srw", MtpConstants.FORMAT_TIFF);



        addFileType("M3U", FILE_TYPE_M3U, "audio/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST);

        addFileType("M3U", FILE_TYPE_M3U, "application/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST);

media/java/android/mtp/MtpConstants.java

+13 −6
Original line number Diff line number Diff line
@@ -182,6 +182,13 @@ public final class MtpConstants { 
    public static final int FORMAT_MPEG = 0x300B;

    /** Format code for ASF files */

    public static final int FORMAT_ASF = 0x300C;

    /**

     * Format code for unknown image files.

     * <p>

     * Will be used for the formats which are not specified in PTP specification.

     * For instance, WEBP and WBMP.

     */

    public static final int FORMAT_DEFINED = 0x3800;

    /** Format code for JPEG image files */

    public static final int FORMAT_EXIF_JPEG = 0x3801;

    /** Format code for TIFF EP image files */