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

Commit 7f616d3c authored by Lajos Molnar's avatar Lajos Molnar
Browse files

stagefright: created SoftVideoDecoderOMXComponent 



Created common base class for all software video decoders to make
adding new features easier.

Change-Id: Id89964e572d5cc5add02662273e6ae96c6b7eb12
Signed-off-by: default avatarLajos Molnar <lajos@google.com>
parent 50bdb73e

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

+41 −281
Original line number Diff line number Diff line
@@ -48,43 +48,32 @@ static const CodecProfileLevel kH263ProfileLevels[] = { 
    { OMX_VIDEO_H263ProfileISWV2,    OMX_VIDEO_H263Level45 },

};



template<class T>

static void InitOMXParams(T *params) {

    params->nSize = sizeof(T);

    params->nVersion.s.nVersionMajor = 1;

    params->nVersion.s.nVersionMinor = 0;

    params->nVersion.s.nRevision = 0;

    params->nVersion.s.nStep = 0;

}



SoftMPEG4::SoftMPEG4(

        const char *name,

        const char *componentRole,

        OMX_VIDEO_CODINGTYPE codingType,

        const CodecProfileLevel *profileLevels,

        size_t numProfileLevels,

        const OMX_CALLBACKTYPE *callbacks,

        OMX_PTR appData,

        OMX_COMPONENTTYPE **component)

    : SimpleSoftOMXComponent(name, callbacks, appData, component),

      mMode(MODE_MPEG4),

    : SoftVideoDecoderOMXComponent(

            name, componentRole, codingType, profileLevels, numProfileLevels,

            352 /* width */, 288 /* height */, callbacks, appData, component),

      mMode(codingType == OMX_VIDEO_CodingH263 ? MODE_H263 : MODE_MPEG4),

      mHandle(new tagvideoDecControls),

      mInputBufferCount(0),

      mWidth(352),

      mHeight(288),

      mCropLeft(0),

      mCropTop(0),

      mCropRight(mWidth - 1),

      mCropBottom(mHeight - 1),

      mSignalledError(false),

      mInitialized(false),

      mFramesConfigured(false),

      mNumSamplesOutput(0),

      mPvTime(0),

      mOutputPortSettingsChange(NONE) {

    if (!strcmp(name, "OMX.google.h263.decoder")) {

        mMode = MODE_H263;

    } else {

        CHECK(!strcmp(name, "OMX.google.mpeg4.decoder"));

    }



    initPorts();

      mPvTime(0) {

    initPorts(

            kNumInputBuffers,

            8192 /* inputBufferSize */,

            kNumOutputBuffers,

            (mMode == MODE_MPEG4)

            ? MEDIA_MIMETYPE_VIDEO_MPEG4 : MEDIA_MIMETYPE_VIDEO_H263);

    CHECK_EQ(initDecoder(), (status_t)OK);

}
@@ -97,219 +86,11 @@ SoftMPEG4::~SoftMPEG4() { 
    mHandle = NULL;

}



void SoftMPEG4::initPorts() {

    OMX_PARAM_PORTDEFINITIONTYPE def;

    InitOMXParams(&def);



    def.nPortIndex = 0;

    def.eDir = OMX_DirInput;

    def.nBufferCountMin = kNumInputBuffers;

    def.nBufferCountActual = def.nBufferCountMin;

    def.nBufferSize = 8192;

    def.bEnabled = OMX_TRUE;

    def.bPopulated = OMX_FALSE;

    def.eDomain = OMX_PortDomainVideo;

    def.bBuffersContiguous = OMX_FALSE;

    def.nBufferAlignment = 1;



    def.format.video.cMIMEType =

        (mMode == MODE_MPEG4)

            ? const_cast<char *>(MEDIA_MIMETYPE_VIDEO_MPEG4)

            : const_cast<char *>(MEDIA_MIMETYPE_VIDEO_H263);



    def.format.video.pNativeRender = NULL;

    def.format.video.nFrameWidth = mWidth;

    def.format.video.nFrameHeight = mHeight;

    def.format.video.nStride = def.format.video.nFrameWidth;

    def.format.video.nSliceHeight = def.format.video.nFrameHeight;

    def.format.video.nBitrate = 0;

    def.format.video.xFramerate = 0;

    def.format.video.bFlagErrorConcealment = OMX_FALSE;



    def.format.video.eCompressionFormat =

        mMode == MODE_MPEG4 ? OMX_VIDEO_CodingMPEG4 : OMX_VIDEO_CodingH263;



    def.format.video.eColorFormat = OMX_COLOR_FormatUnused;

    def.format.video.pNativeWindow = NULL;



    addPort(def);



    def.nPortIndex = 1;

    def.eDir = OMX_DirOutput;

    def.nBufferCountMin = kNumOutputBuffers;

    def.nBufferCountActual = def.nBufferCountMin;

    def.bEnabled = OMX_TRUE;

    def.bPopulated = OMX_FALSE;

    def.eDomain = OMX_PortDomainVideo;

    def.bBuffersContiguous = OMX_FALSE;

    def.nBufferAlignment = 2;



    def.format.video.cMIMEType = const_cast<char *>(MEDIA_MIMETYPE_VIDEO_RAW);

    def.format.video.pNativeRender = NULL;

    def.format.video.nFrameWidth = mWidth;

    def.format.video.nFrameHeight = mHeight;

    def.format.video.nStride = def.format.video.nFrameWidth;

    def.format.video.nSliceHeight = def.format.video.nFrameHeight;

    def.format.video.nBitrate = 0;

    def.format.video.xFramerate = 0;

    def.format.video.bFlagErrorConcealment = OMX_FALSE;

    def.format.video.eCompressionFormat = OMX_VIDEO_CodingUnused;

    def.format.video.eColorFormat = OMX_COLOR_FormatYUV420Planar;

    def.format.video.pNativeWindow = NULL;



    def.nBufferSize =

        (def.format.video.nFrameWidth * def.format.video.nFrameHeight * 3) / 2;



    addPort(def);

}



status_t SoftMPEG4::initDecoder() {

    memset(mHandle, 0, sizeof(tagvideoDecControls));

    return OK;

}



OMX_ERRORTYPE SoftMPEG4::internalGetParameter(

        OMX_INDEXTYPE index, OMX_PTR params) {

    switch (index) {

        case OMX_IndexParamVideoPortFormat:

        {

            OMX_VIDEO_PARAM_PORTFORMATTYPE *formatParams =

                (OMX_VIDEO_PARAM_PORTFORMATTYPE *)params;



            if (formatParams->nPortIndex > 1) {

                return OMX_ErrorUndefined;

            }



            if (formatParams->nIndex != 0) {

                return OMX_ErrorNoMore;

            }



            if (formatParams->nPortIndex == 0) {

                formatParams->eCompressionFormat =

                    (mMode == MODE_MPEG4)

                        ? OMX_VIDEO_CodingMPEG4 : OMX_VIDEO_CodingH263;



                formatParams->eColorFormat = OMX_COLOR_FormatUnused;

                formatParams->xFramerate = 0;

            } else {

                CHECK_EQ(formatParams->nPortIndex, 1u);



                formatParams->eCompressionFormat = OMX_VIDEO_CodingUnused;

                formatParams->eColorFormat = OMX_COLOR_FormatYUV420Planar;

                formatParams->xFramerate = 0;

            }



            return OMX_ErrorNone;

        }



        case OMX_IndexParamVideoProfileLevelQuerySupported:

        {

            OMX_VIDEO_PARAM_PROFILELEVELTYPE *profileLevel =

                    (OMX_VIDEO_PARAM_PROFILELEVELTYPE *) params;



            if (profileLevel->nPortIndex != 0) {  // Input port only

                ALOGE("Invalid port index: %ld", profileLevel->nPortIndex);

                return OMX_ErrorUnsupportedIndex;

            }



            size_t index = profileLevel->nProfileIndex;

            if (mMode == MODE_H263) {

                size_t nProfileLevels =

                    sizeof(kH263ProfileLevels) / sizeof(kH263ProfileLevels[0]);

                if (index >= nProfileLevels) {

                    return OMX_ErrorNoMore;

                }



                profileLevel->eProfile = kH263ProfileLevels[index].mProfile;

                profileLevel->eLevel = kH263ProfileLevels[index].mLevel;

            } else {

                size_t nProfileLevels =

                    sizeof(kM4VProfileLevels) / sizeof(kM4VProfileLevels[0]);

                if (index >= nProfileLevels) {

                    return OMX_ErrorNoMore;

                }



                profileLevel->eProfile = kM4VProfileLevels[index].mProfile;

                profileLevel->eLevel = kM4VProfileLevels[index].mLevel;

            }

            return OMX_ErrorNone;

        }



        default:

            return SimpleSoftOMXComponent::internalGetParameter(index, params);

    }

}



OMX_ERRORTYPE SoftMPEG4::internalSetParameter(

        OMX_INDEXTYPE index, const OMX_PTR params) {

    switch (index) {

        case OMX_IndexParamStandardComponentRole:

        {

            const OMX_PARAM_COMPONENTROLETYPE *roleParams =

                (const OMX_PARAM_COMPONENTROLETYPE *)params;



            if (mMode == MODE_MPEG4) {

                if (strncmp((const char *)roleParams->cRole,

                            "video_decoder.mpeg4",

                            OMX_MAX_STRINGNAME_SIZE - 1)) {

                    return OMX_ErrorUndefined;

                }

            } else {

                if (strncmp((const char *)roleParams->cRole,

                            "video_decoder.h263",

                            OMX_MAX_STRINGNAME_SIZE - 1)) {

                    return OMX_ErrorUndefined;

                }

            }



            return OMX_ErrorNone;

        }



        case OMX_IndexParamVideoPortFormat:

        {

            OMX_VIDEO_PARAM_PORTFORMATTYPE *formatParams =

                (OMX_VIDEO_PARAM_PORTFORMATTYPE *)params;



            if (formatParams->nPortIndex > 1) {

                return OMX_ErrorUndefined;

            }



            if (formatParams->nIndex != 0) {

                return OMX_ErrorNoMore;

            }



            return OMX_ErrorNone;

        }



        default:

            return SimpleSoftOMXComponent::internalSetParameter(index, params);

    }

}



OMX_ERRORTYPE SoftMPEG4::getConfig(

        OMX_INDEXTYPE index, OMX_PTR params) {

    switch (index) {

        case OMX_IndexConfigCommonOutputCrop:

        {

            OMX_CONFIG_RECTTYPE *rectParams = (OMX_CONFIG_RECTTYPE *)params;



            if (rectParams->nPortIndex != 1) {

                return OMX_ErrorUndefined;

            }



            rectParams->nLeft = mCropLeft;

            rectParams->nTop = mCropTop;

            rectParams->nWidth = mCropRight - mCropLeft + 1;

            rectParams->nHeight = mCropBottom - mCropTop + 1;



            return OMX_ErrorNone;

        }



        default:

            return OMX_ErrorUnsupportedIndex;

    }

}



void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) {

    if (mSignalledError || mOutputPortSettingsChange != NONE) {

        return;
@@ -489,11 +270,11 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) { 
}



bool SoftMPEG4::portSettingsChanged() {

    int32_t disp_width, disp_height;

    PVGetVideoDimensions(mHandle, &disp_width, &disp_height);

    uint32_t disp_width, disp_height;

    PVGetVideoDimensions(mHandle, (int32 *)&disp_width, (int32 *)&disp_height);



    int32_t buf_width, buf_height;

    PVGetBufferDimensions(mHandle, &buf_width, &buf_height);

    uint32_t buf_width, buf_height;

    PVGetBufferDimensions(mHandle, (int32 *)&buf_width, (int32 *)&buf_height);



    CHECK_LE(disp_width, buf_width);

    CHECK_LE(disp_height, buf_height);
@@ -501,12 +282,12 @@ bool SoftMPEG4::portSettingsChanged() { 
    ALOGV("disp_width = %d, disp_height = %d, buf_width = %d, buf_height = %d",

            disp_width, disp_height, buf_width, buf_height);



    if (mCropRight != disp_width - 1

            || mCropBottom != disp_height - 1) {

    if (mCropWidth != disp_width

            || mCropHeight != disp_height) {

        mCropLeft = 0;

        mCropTop = 0;

        mCropRight = disp_width - 1;

        mCropBottom = disp_height - 1;

        mCropWidth = disp_width;

        mCropHeight = disp_height;



        notify(OMX_EventPortSettingsChanged,

               1,
@@ -552,36 +333,10 @@ void SoftMPEG4::onPortFlushCompleted(OMX_U32 portIndex) { 
    }

}



void SoftMPEG4::onPortEnableCompleted(OMX_U32 portIndex, bool enabled) {

    if (portIndex != 1) {

        return;

    }



    switch (mOutputPortSettingsChange) {

        case NONE:

            break;



        case AWAITING_DISABLED:

        {

            CHECK(!enabled);

            mOutputPortSettingsChange = AWAITING_ENABLED;

            break;

        }



        default:

        {

            CHECK_EQ((int)mOutputPortSettingsChange, (int)AWAITING_ENABLED);

            CHECK(enabled);

            mOutputPortSettingsChange = NONE;

            break;

        }

    }

}



void SoftMPEG4::onReset() {

    SoftVideoDecoderOMXComponent::onReset();

    mPvToOmxTimeMap.clear();

    mSignalledError = false;

    mOutputPortSettingsChange = NONE;

    mFramesConfigured = false;

    if (mInitialized) {

        PVCleanUpVideoDecoder(mHandle);
@@ -590,18 +345,10 @@ void SoftMPEG4::onReset() { 
}



void SoftMPEG4::updatePortDefinitions() {

    OMX_PARAM_PORTDEFINITIONTYPE *def = &editPortInfo(0)->mDef;

    def->format.video.nFrameWidth = mWidth;

    def->format.video.nFrameHeight = mHeight;

    def->format.video.nStride = def->format.video.nFrameWidth;

    def->format.video.nSliceHeight = def->format.video.nFrameHeight;



    def = &editPortInfo(1)->mDef;

    def->format.video.nFrameWidth = mWidth;

    def->format.video.nFrameHeight = mHeight;

    def->format.video.nStride = def->format.video.nFrameWidth;

    def->format.video.nSliceHeight = def->format.video.nFrameHeight;

    SoftVideoDecoderOMXComponent::updatePortDefinitions();



    /* We have to align our width and height - this should affect stride! */

    OMX_PARAM_PORTDEFINITIONTYPE *def = &editPortInfo(kOutputPortIndex)->mDef;

    def->nBufferSize =

        (((def->format.video.nFrameWidth + 15) & -16)

            * ((def->format.video.nFrameHeight + 15) & -16) * 3) / 2;
@@ -612,6 +359,19 @@ void SoftMPEG4::updatePortDefinitions() { 
android::SoftOMXComponent *createSoftOMXComponent(

        const char *name, const OMX_CALLBACKTYPE *callbacks,

        OMX_PTR appData, OMX_COMPONENTTYPE **component) {

    return new android::SoftMPEG4(name, callbacks, appData, component);

    using namespace android;

    if (!strcmp(name, "OMX.google.h263.decoder")) {

        return new android::SoftMPEG4(

                name, "video_decoder.h263", OMX_VIDEO_CodingH263,

                kH263ProfileLevels, ARRAY_SIZE(kH263ProfileLevels),

                callbacks, appData, component);

    } else if (!strcmp(name, "OMX.google.mpeg4.decoder")) {

        return new android::SoftMPEG4(

                name, "video_decoder.mpeg4", OMX_VIDEO_CodingMPEG4,

                kM4VProfileLevels, ARRAY_SIZE(kM4VProfileLevels),

                callbacks, appData, component);

    } else {

        CHECK(!"Unknown component");

    }

}

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

+7 −24
Original line number Diff line number Diff line
@@ -18,15 +18,18 @@ 


#define SOFT_MPEG4_H_



#include "SimpleSoftOMXComponent.h"

#include <utils/KeyedVector.h>

#include "SoftVideoDecoderOMXComponent.h"



struct tagvideoDecControls;



namespace android {



struct SoftMPEG4 : public SimpleSoftOMXComponent {

struct SoftMPEG4 : public SoftVideoDecoderOMXComponent {

    SoftMPEG4(const char *name,

            const char *componentRole,

            OMX_VIDEO_CODINGTYPE codingType,

            const CodecProfileLevel *profileLevels,

            size_t numProfileLevels,

            const OMX_CALLBACKTYPE *callbacks,

            OMX_PTR appData,

            OMX_COMPONENTTYPE **component);
@@ -34,17 +37,8 @@ struct SoftMPEG4 : public SimpleSoftOMXComponent { 
protected:

    virtual ~SoftMPEG4();



    virtual OMX_ERRORTYPE internalGetParameter(

            OMX_INDEXTYPE index, OMX_PTR params);



    virtual OMX_ERRORTYPE internalSetParameter(

            OMX_INDEXTYPE index, const OMX_PTR params);



    virtual OMX_ERRORTYPE getConfig(OMX_INDEXTYPE index, OMX_PTR params);



    virtual void onQueueFilled(OMX_U32 portIndex);

    virtual void onPortFlushCompleted(OMX_U32 portIndex);

    virtual void onPortEnableCompleted(OMX_U32 portIndex, bool enabled);

    virtual void onReset();



private:
@@ -56,16 +50,12 @@ private: 
    enum {

        MODE_MPEG4,

        MODE_H263,



    } mMode;



    tagvideoDecControls *mHandle;



    size_t mInputBufferCount;



    int32_t mWidth, mHeight;

    int32_t mCropLeft, mCropTop, mCropRight, mCropBottom;



    bool mSignalledError;

    bool mInitialized;

    bool mFramesConfigured;
@@ -74,16 +64,9 @@ private: 
    int32_t mPvTime;

    KeyedVector<int32_t, OMX_TICKS> mPvToOmxTimeMap;



    enum {

        NONE,

        AWAITING_DISABLED,

        AWAITING_ENABLED

    } mOutputPortSettingsChange;



    void initPorts();

    status_t initDecoder();



    void updatePortDefinitions();

    virtual void updatePortDefinitions();

    bool portSettingsChanged();



    DISALLOW_EVIL_CONSTRUCTORS(SoftMPEG4);

media/libstagefright/codecs/on2/dec/SoftVPX.cpp

+10 −201
Original line number Diff line number Diff line
@@ -29,26 +29,19 @@ 


namespace android {



template<class T>

static void InitOMXParams(T *params) {

    params->nSize = sizeof(T);

    params->nVersion.s.nVersionMajor = 1;

    params->nVersion.s.nVersionMinor = 0;

    params->nVersion.s.nRevision = 0;

    params->nVersion.s.nStep = 0;

}



SoftVPX::SoftVPX(

        const char *name,

        const OMX_CALLBACKTYPE *callbacks,

        OMX_PTR appData,

        OMX_COMPONENTTYPE **component)

    : SimpleSoftOMXComponent(name, callbacks, appData, component),

      mCtx(NULL),

      mWidth(320),

      mHeight(240),

      mOutputPortSettingsChange(NONE) {

    initPorts();

    : SoftVideoDecoderOMXComponent(

            name, "video_decoder.vpx", OMX_VIDEO_CodingVPX,

            NULL /* profileLevels */, 0 /* numProfileLevels */,

            320 /* width */, 240 /* height */, callbacks, appData, component),

      mCtx(NULL) {

    initPorts(kNumBuffers, 768 * 1024 /* inputBufferSize */,

            kNumBuffers, MEDIA_MIMETYPE_VIDEO_VPX);



    CHECK_EQ(initDecoder(), (status_t)OK);

}
@@ -58,65 +51,6 @@ SoftVPX::~SoftVPX() { 
    mCtx = NULL;

}



void SoftVPX::initPorts() {

    OMX_PARAM_PORTDEFINITIONTYPE def;

    InitOMXParams(&def);



    def.nPortIndex = 0;

    def.eDir = OMX_DirInput;

    def.nBufferCountMin = kNumBuffers;

    def.nBufferCountActual = def.nBufferCountMin;

    def.nBufferSize = 768 * 1024;

    def.bEnabled = OMX_TRUE;

    def.bPopulated = OMX_FALSE;

    def.eDomain = OMX_PortDomainVideo;

    def.bBuffersContiguous = OMX_FALSE;

    def.nBufferAlignment = 1;



    def.format.video.cMIMEType = const_cast<char *>(MEDIA_MIMETYPE_VIDEO_VPX);

    def.format.video.pNativeRender = NULL;

    def.format.video.nFrameWidth = mWidth;

    def.format.video.nFrameHeight = mHeight;

    def.format.video.nStride = def.format.video.nFrameWidth;

    def.format.video.nSliceHeight = def.format.video.nFrameHeight;

    def.format.video.nBitrate = 0;

    def.format.video.xFramerate = 0;

    def.format.video.bFlagErrorConcealment = OMX_FALSE;

    def.format.video.eCompressionFormat = OMX_VIDEO_CodingVPX;

    def.format.video.eColorFormat = OMX_COLOR_FormatUnused;

    def.format.video.pNativeWindow = NULL;



    addPort(def);



    def.nPortIndex = 1;

    def.eDir = OMX_DirOutput;

    def.nBufferCountMin = kNumBuffers;

    def.nBufferCountActual = def.nBufferCountMin;

    def.bEnabled = OMX_TRUE;

    def.bPopulated = OMX_FALSE;

    def.eDomain = OMX_PortDomainVideo;

    def.bBuffersContiguous = OMX_FALSE;

    def.nBufferAlignment = 2;



    def.format.video.cMIMEType = const_cast<char *>(MEDIA_MIMETYPE_VIDEO_RAW);

    def.format.video.pNativeRender = NULL;

    def.format.video.nFrameWidth = mWidth;

    def.format.video.nFrameHeight = mHeight;

    def.format.video.nStride = def.format.video.nFrameWidth;

    def.format.video.nSliceHeight = def.format.video.nFrameHeight;

    def.format.video.nBitrate = 0;

    def.format.video.xFramerate = 0;

    def.format.video.bFlagErrorConcealment = OMX_FALSE;

    def.format.video.eCompressionFormat = OMX_VIDEO_CodingUnused;

    def.format.video.eColorFormat = OMX_COLOR_FormatYUV420Planar;

    def.format.video.pNativeWindow = NULL;



    def.nBufferSize =

        (def.format.video.nFrameWidth * def.format.video.nFrameHeight * 3) / 2;



    addPort(def);

}



static int GetCPUCoreCount() {

    int cpuCoreCount = 1;

#if defined(_SC_NPROCESSORS_ONLN)
@@ -145,80 +79,6 @@ status_t SoftVPX::initDecoder() { 
    return OK;

}



OMX_ERRORTYPE SoftVPX::internalGetParameter(

        OMX_INDEXTYPE index, OMX_PTR params) {

    switch (index) {

        case OMX_IndexParamVideoPortFormat:

        {

            OMX_VIDEO_PARAM_PORTFORMATTYPE *formatParams =

                (OMX_VIDEO_PARAM_PORTFORMATTYPE *)params;



            if (formatParams->nPortIndex > 1) {

                return OMX_ErrorUndefined;

            }



            if (formatParams->nIndex != 0) {

                return OMX_ErrorNoMore;

            }



            if (formatParams->nPortIndex == 0) {

                formatParams->eCompressionFormat = OMX_VIDEO_CodingVPX;

                formatParams->eColorFormat = OMX_COLOR_FormatUnused;

                formatParams->xFramerate = 0;

            } else {

                CHECK_EQ(formatParams->nPortIndex, 1u);



                formatParams->eCompressionFormat = OMX_VIDEO_CodingUnused;

                formatParams->eColorFormat = OMX_COLOR_FormatYUV420Planar;

                formatParams->xFramerate = 0;

            }



            return OMX_ErrorNone;

        }



        default:

            return SimpleSoftOMXComponent::internalGetParameter(index, params);

    }

}



OMX_ERRORTYPE SoftVPX::internalSetParameter(

        OMX_INDEXTYPE index, const OMX_PTR params) {

    switch (index) {

        case OMX_IndexParamStandardComponentRole:

        {

            const OMX_PARAM_COMPONENTROLETYPE *roleParams =

                (const OMX_PARAM_COMPONENTROLETYPE *)params;



            if (strncmp((const char *)roleParams->cRole,

                        "video_decoder.vpx",

                        OMX_MAX_STRINGNAME_SIZE - 1)) {

                return OMX_ErrorUndefined;

            }



            return OMX_ErrorNone;

        }



        case OMX_IndexParamVideoPortFormat:

        {

            OMX_VIDEO_PARAM_PORTFORMATTYPE *formatParams =

                (OMX_VIDEO_PARAM_PORTFORMATTYPE *)params;



            if (formatParams->nPortIndex > 1) {

                return OMX_ErrorUndefined;

            }



            if (formatParams->nIndex != 0) {

                return OMX_ErrorNoMore;

            }



            return OMX_ErrorNone;

        }



        default:

            return SimpleSoftOMXComponent::internalSetParameter(index, params);

    }

}



void SoftVPX::onQueueFilled(OMX_U32 portIndex) {

    if (mOutputPortSettingsChange != NONE) {

        return;
@@ -270,8 +130,8 @@ void SoftVPX::onQueueFilled(OMX_U32 portIndex) { 
        if (img != NULL) {

            CHECK_EQ(img->fmt, IMG_FMT_I420);



            int32_t width = img->d_w;

            int32_t height = img->d_h;

            uint32_t width = img->d_w;

            uint32_t height = img->d_h;



            if (width != mWidth || height != mHeight) {

                mWidth = width;
@@ -329,57 +189,6 @@ void SoftVPX::onQueueFilled(OMX_U32 portIndex) { 
    }

}



void SoftVPX::onPortFlushCompleted(OMX_U32 portIndex) {

}



void SoftVPX::onPortEnableCompleted(OMX_U32 portIndex, bool enabled) {

    if (portIndex != 1) {

        return;

    }



    switch (mOutputPortSettingsChange) {

        case NONE:

            break;



        case AWAITING_DISABLED:

        {

            CHECK(!enabled);

            mOutputPortSettingsChange = AWAITING_ENABLED;

            break;

        }



        default:

        {

            CHECK_EQ((int)mOutputPortSettingsChange, (int)AWAITING_ENABLED);

            CHECK(enabled);

            mOutputPortSettingsChange = NONE;

            break;

        }

    }

}



void SoftVPX::onReset() {

    mOutputPortSettingsChange = NONE;

}



void SoftVPX::updatePortDefinitions() {

    OMX_PARAM_PORTDEFINITIONTYPE *def = &editPortInfo(0)->mDef;

    def->format.video.nFrameWidth = mWidth;

    def->format.video.nFrameHeight = mHeight;

    def->format.video.nStride = def->format.video.nFrameWidth;

    def->format.video.nSliceHeight = def->format.video.nFrameHeight;



    def = &editPortInfo(1)->mDef;

    def->format.video.nFrameWidth = mWidth;

    def->format.video.nFrameHeight = mHeight;

    def->format.video.nStride = def->format.video.nFrameWidth;

    def->format.video.nSliceHeight = def->format.video.nFrameHeight;



    def->nBufferSize =

        (def->format.video.nFrameWidth

            * def->format.video.nFrameHeight * 3) / 2;

}



}  // namespace android



android::SoftOMXComponent *createSoftOMXComponent(

media/libstagefright/codecs/on2/dec/SoftVPX.h

+2 −23
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ 


#define SOFT_VPX_H_



#include "SimpleSoftOMXComponent.h"

#include "SoftVideoDecoderOMXComponent.h"



namespace android {



struct SoftVPX : public SimpleSoftOMXComponent {

struct SoftVPX : public SoftVideoDecoderOMXComponent {

    SoftVPX(const char *name,

            const OMX_CALLBACKTYPE *callbacks,

            OMX_PTR appData,
@@ -31,16 +31,7 @@ struct SoftVPX : public SimpleSoftOMXComponent { 
protected:

    virtual ~SoftVPX();



    virtual OMX_ERRORTYPE internalGetParameter(

            OMX_INDEXTYPE index, OMX_PTR params);



    virtual OMX_ERRORTYPE internalSetParameter(

            OMX_INDEXTYPE index, const OMX_PTR params);



    virtual void onQueueFilled(OMX_U32 portIndex);

    virtual void onPortFlushCompleted(OMX_U32 portIndex);

    virtual void onPortEnableCompleted(OMX_U32 portIndex, bool enabled);

    virtual void onReset();



private:

    enum {
@@ -49,20 +40,8 @@ private: 


    void *mCtx;



    int32_t mWidth;

    int32_t mHeight;



    enum {

        NONE,

        AWAITING_DISABLED,

        AWAITING_ENABLED

    } mOutputPortSettingsChange;



    void initPorts();

    status_t initDecoder();



    void updatePortDefinitions();



    DISALLOW_EVIL_CONSTRUCTORS(SoftVPX);

};

media/libstagefright/codecs/on2/h264dec/SoftAVC.cpp

+9 −240

File changed.

Preview size limit exceeded, changes collapsed.