diff options
| author | Zhao Liang <leo.zhao@intel.com> | 2013-10-16 17:17:54 +0800 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:02:55 -0700 |
| commit | 5e797fded8842fa4aaa87812311397b04bf46d54 (patch) | |
| tree | 283818da712b28fb2391bfcc3ac58a15ab505884 /videocodec/OMXVideoEncoderAVC.cpp | |
| parent | 73cebb604e43c066d2d31eb145f82fc3080db532 (diff) | |
| download | android_hardware_intel_common_omx-components-5e797fded8842fa4aaa87812311397b04bf46d54.tar.gz android_hardware_intel_common_omx-components-5e797fded8842fa4aaa87812311397b04bf46d54.tar.bz2 android_hardware_intel_common_omx-components-5e797fded8842fa4aaa87812311397b04bf46d54.zip | |
[PDK KK ABSP] omx-component: rename MetadataBufferType
BZ: 141313
Rename MetadataBufferType as IntelMetadataBufferType to avoid data type redefinition.
Change-Id: Icba60fbc8a51f7567a67611569ba926c40f8f385
Signed-off-by: Zhao Liang <leo.zhao@intel.com>
Signed-off-by: Dan Liang <dan.liang@intel.com>
Diffstat (limited to 'videocodec/OMXVideoEncoderAVC.cpp')
| -rwxr-xr-x | videocodec/OMXVideoEncoderAVC.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/videocodec/OMXVideoEncoderAVC.cpp b/videocodec/OMXVideoEncoderAVC.cpp index 028d3d9..91b68e4 100755 --- a/videocodec/OMXVideoEncoderAVC.cpp +++ b/videocodec/OMXVideoEncoderAVC.cpp @@ -113,7 +113,7 @@ OMXVideoEncoderAVC::OMXVideoEncoderAVC() { } } - mSourceType = MetadataBufferTypeCameraSource; + mSourceType = IntelMetadataBufferTypeCameraSource; } OMXVideoEncoderAVC::~OMXVideoEncoderAVC() { @@ -426,7 +426,7 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::ProcessDataRetrieve( // NaluFormat not set, setting default if (NaluFormat == 0) { if (mStoreMetaDataInBuffers) { - if(mSourceType == MetadataBufferTypeCameraSource) + if(mSourceType == IntelMetadataBufferTypeCameraSource) NaluFormat = (OMX_NALUFORMATSTYPE)OMX_NaluFormatLengthPrefixedSeparateFirstHeader; else NaluFormat = (OMX_NALUFORMATSTYPE)OMX_NaluFormatStartCodesSeparateFirstHeader; |