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

Commit 05e712d3 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

stagefright: advertise proper profiles and levels 

Advertise only the max level per profile
Advertise constrained AVC profiles

Bug: 64691241
Change-Id: I0456832564f4be6dff55f9f65351adaeabefb24d
parent 2cb58cb4

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

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



static const CodecProfileLevel kProfileLevels[] = {

    { OMX_VIDEO_AVCProfileConstrainedBaseline, OMX_VIDEO_AVCLevel52 },



    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel52 },



    { OMX_VIDEO_AVCProfileMain,     OMX_VIDEO_AVCLevel52 },



    { OMX_VIDEO_AVCProfileConstrainedHigh,     OMX_VIDEO_AVCLevel52 },



    { OMX_VIDEO_AVCProfileHigh,     OMX_VIDEO_AVCLevel52 },

};

media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp

+5 −26
Original line number Diff line number Diff line
@@ -74,33 +74,11 @@ static LevelConversion ConversionTable[] = { 
};



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_AVCProfileConstrainedBaseline, OMX_VIDEO_AVCLevel41 },



    { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel41 },

    { 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_AVCLevel41 },

};



static size_t GetCPUCoreCount() {
@@ -962,7 +940,8 @@ OMX_ERRORTYPE SoftAVC::internalGetParameter(OMX_INDEXTYPE index, OMX_PTR params) 
                return OMX_ErrorUndefined;

            }



            avcParams->eProfile = OMX_VIDEO_AVCProfileBaseline;

            // TODO: maintain profile

            avcParams->eProfile = (OMX_VIDEO_AVCPROFILETYPE)OMX_VIDEO_AVCProfileConstrainedBaseline;

            avcParams->eLevel = omxLevel;

            avcParams->nRefFrames = 1;

            avcParams->bUseHadamard = OMX_TRUE;

media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp

+0 −8
Original line number Diff line number Diff line
@@ -31,20 +31,12 @@ 
namespace android {



static const CodecProfileLevel kM4VProfileLevels[] = {

    { OMX_VIDEO_MPEG4ProfileSimple, OMX_VIDEO_MPEG4Level0 },

    { OMX_VIDEO_MPEG4ProfileSimple, OMX_VIDEO_MPEG4Level0b },

    { OMX_VIDEO_MPEG4ProfileSimple, OMX_VIDEO_MPEG4Level1 },

    { OMX_VIDEO_MPEG4ProfileSimple, OMX_VIDEO_MPEG4Level2 },

    { OMX_VIDEO_MPEG4ProfileSimple, OMX_VIDEO_MPEG4Level3 },

};



static const CodecProfileLevel kH263ProfileLevels[] = {

    { OMX_VIDEO_H263ProfileBaseline, OMX_VIDEO_H263Level10 },

    { OMX_VIDEO_H263ProfileBaseline, OMX_VIDEO_H263Level20 },

    { OMX_VIDEO_H263ProfileBaseline, OMX_VIDEO_H263Level30 },

    { OMX_VIDEO_H263ProfileBaseline, OMX_VIDEO_H263Level45 },

    { OMX_VIDEO_H263ProfileISWV2,    OMX_VIDEO_H263Level10 },

    { OMX_VIDEO_H263ProfileISWV2,    OMX_VIDEO_H263Level20 },

    { OMX_VIDEO_H263ProfileISWV2,    OMX_VIDEO_H263Level30 },

    { OMX_VIDEO_H263ProfileISWV2,    OMX_VIDEO_H263Level45 },

};