diff options
| author | Tianmi Chen <tianmi.chen@intel.com> | 2015-06-16 14:33:48 +0800 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2015-07-01 08:35:19 -0700 |
| commit | 82563df6bcb3f2a982b6c28b38147edba5cde22c (patch) | |
| tree | 2f38deecff6f09e32390bb13a133f13159471b32 | |
| parent | 11c1c17fed35585f9256031ee70db1c6c18d0219 (diff) | |
| download | android_hardware_intel_common_omx-components-82563df6bcb3f2a982b6c28b38147edba5cde22c.tar.gz android_hardware_intel_common_omx-components-82563df6bcb3f2a982b6c28b38147edba5cde22c.tar.bz2 android_hardware_intel_common_omx-components-82563df6bcb3f2a982b6c28b38147edba5cde22c.zip | |
Remove unused argument to suppress compilation error
BUG: 21777583
Change-Id: I7f8ed7463bbf85418aa09a1f15a326e4a68f4a10
Signed-off-by: Tianmi Chen <tianmi.chen@intel.com>
| -rw-r--r-- | videocodec/OMXVideoDecoderBase.cpp | 11 | ||||
| -rw-r--r-- | videocodec/OMXVideoDecoderBase.h | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/videocodec/OMXVideoDecoderBase.cpp b/videocodec/OMXVideoDecoderBase.cpp index 5d10668..594c734 100644 --- a/videocodec/OMXVideoDecoderBase.cpp +++ b/videocodec/OMXVideoDecoderBase.cpp @@ -497,7 +497,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::PrepareConfigBuffer(VideoConfigBuffer *p) { mOMXBufferHeaderTypePtrNum = 0; mGraphicBufferParam.graphicBufferColorFormat = def_output->format.video.eColorFormat; - mGraphicBufferParam.graphicBufferStride = getStride(def_output->format.video.eColorFormat, def_output->format.video.nFrameWidth); + mGraphicBufferParam.graphicBufferStride = getStride(def_output->format.video.nFrameWidth); mGraphicBufferParam.graphicBufferWidth = def_output->format.video.nFrameWidth; mGraphicBufferParam.graphicBufferHeight = (def_output->format.video.nFrameHeight + 0xf) & ~0xf; @@ -1200,7 +1200,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINIT return OMX_ErrorNone; } -uint32_t OMXVideoDecoderBase::getStride(uint32_t format, uint32_t width) { +uint32_t OMXVideoDecoderBase::getStride(uint32_t width) { uint32_t stride = 0; if (width <= 512) @@ -1209,13 +1209,6 @@ uint32_t OMXVideoDecoderBase::getStride(uint32_t format, uint32_t width) { stride = 1024; else if (width <= 1280) { stride = 1280; -#ifdef USE_GEN_HW - if (format == HAL_PIXEL_FORMAT_NV12_X_TILED_INTEL) { - stride = 2048; - } -#else - (void)format; -#endif } else if (width <= 2048) stride = 2048; else if (width <= 4096) diff --git a/videocodec/OMXVideoDecoderBase.h b/videocodec/OMXVideoDecoderBase.h index 5ad8d3f..27c2939 100644 --- a/videocodec/OMXVideoDecoderBase.h +++ b/videocodec/OMXVideoDecoderBase.h @@ -144,7 +144,7 @@ protected: AdaptivePlaybackMode mAPMode; uint32_t mMetaDataBuffersNum; bool mFormatChanged; - uint32_t getStride(uint32_t format, uint32_t width); + uint32_t getStride(uint32_t width); }; #endif /* OMX_VIDEO_DECODER_BASE_H_ */ |