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

Commit 80225208 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "heif: add new format type" into oc-mr1-dev

parents 2fe99719 e6710641

media/mtp/MtpDebug.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -102,6 +102,7 @@ static const CodeEntry sFormatCodes[] = { 
    { "MTP_FORMAT_JP2",                             0x380F },

    { "MTP_FORMAT_JP2",                             0x380F },

    { "MTP_FORMAT_JPX",                             0x3810 },

    { "MTP_FORMAT_JPX",                             0x3810 },

    { "MTP_FORMAT_DNG",                             0x3811 },

    { "MTP_FORMAT_DNG",                             0x3811 },

    { "MTP_FORMAT_HEIF",                            0x3812 },

    { "MTP_FORMAT_UNDEFINED_FIRMWARE",              0xB802 },

    { "MTP_FORMAT_UNDEFINED_FIRMWARE",              0xB802 },

    { "MTP_FORMAT_WINDOWS_IMAGE_FORMAT",            0xB881 },

    { "MTP_FORMAT_WINDOWS_IMAGE_FORMAT",            0xB881 },

    { "MTP_FORMAT_UNDEFINED_AUDIO",                 0xB900 },

    { "MTP_FORMAT_UNDEFINED_AUDIO",                 0xB900 },

media/mtp/mtp.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,7 @@ 
#define MTP_FORMAT_JP2                                  0x380F   // JPEG2000 Baseline File Format

#define MTP_FORMAT_JP2                                  0x380F   // JPEG2000 Baseline File Format

#define MTP_FORMAT_JPX                                  0x3810   // JPEG2000 Extended File Format

#define MTP_FORMAT_JPX                                  0x3810   // JPEG2000 Extended File Format

#define MTP_FORMAT_DNG                                  0x3811   // Digital Negative

#define MTP_FORMAT_DNG                                  0x3811   // Digital Negative

#define MTP_FORMAT_HEIF                                 0x3812   // HEIF images

#define MTP_FORMAT_UNDEFINED_FIRMWARE                   0xB802

#define MTP_FORMAT_UNDEFINED_FIRMWARE                   0xB802

#define MTP_FORMAT_WINDOWS_IMAGE_FORMAT                 0xB881

#define MTP_FORMAT_WINDOWS_IMAGE_FORMAT                 0xB881

#define MTP_FORMAT_UNDEFINED_AUDIO                      0xB900

#define MTP_FORMAT_UNDEFINED_AUDIO                      0xB900