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

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

Merge "stagefright: report only highest levels of a profile for soft codec"

parents b4823038 792997af

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

+0 −48
Original line number Diff line number Diff line
@@ -49,58 +49,10 @@ namespace android { 
        (IVD_CONTROL_API_COMMAND_TYPE_T)IH264D_CMD_CTL_SET_NUM_CORES



static const CodecProfileLevel kProfileLevels[] = {

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel1  },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel1b },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel11 },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel12 },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel13 },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel2  },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel21 },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel22 },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel3  },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel31 },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel32 },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel4  },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel41 },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel42 },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel5  },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel51 },

    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel52 },



    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel1  },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel1b },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel11 },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel12 },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel13 },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel2  },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel21 },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel22 },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel3  },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel31 },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel32 },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel4  },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel41 },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel42 },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel5  },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel51 },

    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel52 },



    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel1  },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel1b },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel11 },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel12 },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel13 },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel2  },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel21 },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel22 },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel3  },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel31 },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel32 },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel4  },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel41 },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel42 },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel5  },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel51 },

    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel52 },

};

media/libstagefright/codecs/hevcdec/SoftHEVC.cpp

+0 −8
Original line number Diff line number Diff line
@@ -48,14 +48,6 @@ namespace android { 
        (IVD_CONTROL_API_COMMAND_TYPE_T)IHEVCD_CXA_CMD_CTL_SET_NUM_CORES



static const CodecProfileLevel kProfileLevels[] = {

    { OMX_VIDEO_HEVCProfileMain, OMX_VIDEO_HEVCMainTierLevel1  },

    { OMX_VIDEO_HEVCProfileMain, OMX_VIDEO_HEVCMainTierLevel2  },

    { OMX_VIDEO_HEVCProfileMain, OMX_VIDEO_HEVCMainTierLevel21 },

    { OMX_VIDEO_HEVCProfileMain, OMX_VIDEO_HEVCMainTierLevel3  },

    { OMX_VIDEO_HEVCProfileMain, OMX_VIDEO_HEVCMainTierLevel31 },

    { OMX_VIDEO_HEVCProfileMain, OMX_VIDEO_HEVCMainTierLevel4  },

    { OMX_VIDEO_HEVCProfileMain, OMX_VIDEO_HEVCMainTierLevel41 },

    { OMX_VIDEO_HEVCProfileMain, OMX_VIDEO_HEVCMainTierLevel5  },

    { OMX_VIDEO_HEVCProfileMain, OMX_VIDEO_HEVCMainTierLevel51 },

};

media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp

+0 −6
Original line number Diff line number Diff line
@@ -47,14 +47,8 @@ namespace android { 
        (IVD_CONTROL_API_COMMAND_TYPE_T)IMPEG2D_CMD_CTL_SET_NUM_CORES



static const CodecProfileLevel kProfileLevels[] = {

    { OMX_VIDEO_MPEG2ProfileSimple, OMX_VIDEO_MPEG2LevelLL  },

    { OMX_VIDEO_MPEG2ProfileSimple, OMX_VIDEO_MPEG2LevelML  },

    { OMX_VIDEO_MPEG2ProfileSimple, OMX_VIDEO_MPEG2LevelH14 },

    { OMX_VIDEO_MPEG2ProfileSimple, OMX_VIDEO_MPEG2LevelHL  },



    { OMX_VIDEO_MPEG2ProfileMain  , OMX_VIDEO_MPEG2LevelLL  },

    { OMX_VIDEO_MPEG2ProfileMain  , OMX_VIDEO_MPEG2LevelML  },

    { OMX_VIDEO_MPEG2ProfileMain  , OMX_VIDEO_MPEG2LevelH14 },

    { OMX_VIDEO_MPEG2ProfileMain  , OMX_VIDEO_MPEG2LevelHL  },

};