diff options
| author | Yuanjun Huang <yuanjun.huang@intel.com> | 2015-07-01 02:41:11 +0800 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2015-07-01 08:34:37 -0700 |
| commit | 11c1c17fed35585f9256031ee70db1c6c18d0219 (patch) | |
| tree | 03775ce24bfe08f6aad7a476f9e1efa6e6271228 /videocodec/OMXVideoEncoderAVC.cpp | |
| parent | 94dc18063f6f0f60d99feaa0ffb1fc103d49c2c8 (diff) | |
| download | android_hardware_intel_common_omx-components-11c1c17fed35585f9256031ee70db1c6c18d0219.tar.gz android_hardware_intel_common_omx-components-11c1c17fed35585f9256031ee70db1c6c18d0219.tar.bz2 android_hardware_intel_common_omx-components-11c1c17fed35585f9256031ee70db1c6c18d0219.zip | |
Revert "omx-component: Adding media resource management support"
Bug: 20165724
A more comprehensive codec level resource manager is
implemented.
This reverts commit f832fbe64172f3dcde2bf8d7f960375efd8a30d9.
Change-Id: Ia45655873c9b7e9d57bed6c8d5dad29e219a2e3c
Diffstat (limited to 'videocodec/OMXVideoEncoderAVC.cpp')
| -rw-r--r-- | videocodec/OMXVideoEncoderAVC.cpp | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/videocodec/OMXVideoEncoderAVC.cpp b/videocodec/OMXVideoEncoderAVC.cpp index 220ca26..36390e2 100644 --- a/videocodec/OMXVideoEncoderAVC.cpp +++ b/videocodec/OMXVideoEncoderAVC.cpp @@ -20,10 +20,6 @@ static const char *AVC_MIME_TYPE = "video/h264"; -// AVC encoder instance limitation -#define INSTANCE_LIMITATION 3 -static int gInstanceNumber = 0; - struct ProfileMap { OMX_VIDEO_AVCPROFILETYPE key; VAProfile value; @@ -123,7 +119,6 @@ OMXVideoEncoderAVC::~OMXVideoEncoderAVC() { delete mAVCParams; mAVCParams = NULL; } - gInstanceNumber --; } OMX_ERRORTYPE OMXVideoEncoderAVC::InitOutputPortFormatSpecific(OMX_PARAM_PORTDEFINITIONTYPE *paramPortDefinitionOutput) { @@ -1065,25 +1060,4 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::SetParamVideoBytestream(OMX_PTR pStructure) { } -#define DECLARE_OMX_COMPONENT_AVC(NAME, ROLE, CLASS) \ - static const char *gName = (const char *)(NAME);\ - static const char *gRole = (const char *)(ROLE);\ - OMX_ERRORTYPE CreateInstance(OMX_PTR *instance) {\ - *instance = NULL;\ - if (gInstanceNumber + 1 > INSTANCE_LIMITATION) {\ - return OMX_ErrorInsufficientResources;\ - } else {\ - gInstanceNumber ++;\ - }\ - ComponentBase *inst = new CLASS;\ - if (!inst) {\ - return OMX_ErrorInsufficientResources;\ - }\ - *instance = inst;\ - return OMX_ErrorNone;\ - }\ - struct wrs_omxil_cmodule_ops_s gOps = {CreateInstance};\ - struct wrs_omxil_cmodule_s WRS_OMXIL_CMODULE_SYMBOL = {gName, &gRole, 1, &gOps}; - - -DECLARE_OMX_COMPONENT_AVC("OMX.Intel.VideoEncoder.AVC", "video_encoder.avc", OMXVideoEncoderAVC); +DECLARE_OMX_COMPONENT("OMX.Intel.VideoEncoder.AVC", "video_encoder.avc", OMXVideoEncoderAVC); |