diff options
| author | Ji Guoliang <guoliangx.ji@gmail.com> | 2011-12-28 14:27:06 -0500 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:02:45 -0700 |
| commit | e2cc802b1588648ff0a8b45a102d3d2663209c77 (patch) | |
| tree | e2012165b264c96902eb347a9719ac9a2010d38b /videocodec/OMXVideoEncoderAVC.cpp | |
| parent | b2257cdcf3ffd7a4a7dedbe4842185689bcf7fb7 (diff) | |
| download | android_hardware_intel_common_omx-components-e2cc802b1588648ff0a8b45a102d3d2663209c77.tar.gz android_hardware_intel_common_omx-components-e2cc802b1588648ff0a8b45a102d3d2663209c77.tar.bz2 android_hardware_intel_common_omx-components-e2cc802b1588648ff0a8b45a102d3d2663209c77.zip | |
VideoEncode: port omx-components from R2 to R3
BZ: 18528
merge/port the changes of R2 to R3
Change-Id: I2d770dbca9531ef0ed36c4b5cc6299db1f632bb3
Signed-off-by: Ji Guoliang <guoliangx.ji@gmail.com>
Reviewed-on: http://android.intel.com:8080/30063
Reviewed-by: Ji, GuoliangX <guoliangx.ji@intel.com>
Reviewed-by: Yuan, Shengquan <shengquan.yuan@intel.com>
Reviewed-by: Chang, Ying <ying.chang@intel.com>
Reviewed-by: Ding, Haitao <haitao.ding@intel.com>
Tested-by: Ding, Haitao <haitao.ding@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'videocodec/OMXVideoEncoderAVC.cpp')
| -rw-r--r-- | videocodec/OMXVideoEncoderAVC.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/videocodec/OMXVideoEncoderAVC.cpp b/videocodec/OMXVideoEncoderAVC.cpp index dddbb44..2981d1f 100644 --- a/videocodec/OMXVideoEncoderAVC.cpp +++ b/videocodec/OMXVideoEncoderAVC.cpp @@ -51,8 +51,8 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::InitOutputPortFormatSpecific(OMX_PARAM_PORTDEF SetTypeHeader(&mNalStreamFormat, sizeof(mNalStreamFormat)); mNalStreamFormat.nPortIndex = OUTPORT_INDEX; // TODO: check if this is desired Nalu Format - mNalStreamFormat.eNaluFormat = OMX_NaluFormatStartCodesSeparateFirstHeader; - //mNalStreamFormat.eNaluFormat = OMX_NaluFormatLengthPrefixedSeparateFirstHeader; + // mNalStreamFormat.eNaluFormat = OMX_NaluFormatStartCodesSeparateFirstHeader; + mNalStreamFormat.eNaluFormat = OMX_NaluFormatLengthPrefixedSeparateFirstHeader; // OMX_VIDEO_CONFIG_AVCINTRAPERIOD memset(&mConfigAvcIntraPeriod, 0, sizeof(mConfigAvcIntraPeriod)); SetTypeHeader(&mConfigAvcIntraPeriod, sizeof(mConfigAvcIntraPeriod)); @@ -166,7 +166,7 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::ProcessorProcess( goto out; } - if (mBsState != BS_STATE_INVALID) { + if (mBsState != BS_STATE_INVALID && mBsState != BS_STATE_FAILD) { LOGV(" Share buffer mode\n"); inBuf.size = mSharedBufArray[0].dataSize; inBuf.data = |