diff options
| author | Juan Antonio Gozalvez Herrero <jgozalvx> | 2013-01-15 11:17:57 +0100 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:02:49 -0700 |
| commit | e4876b874be60356322ca55b467fd0ee096ee7ab (patch) | |
| tree | 49909fa7c449bd300c7a11c2a06fc970cccf4115 /videocodec/OMXVideoEncoderMPEG4.cpp | |
| parent | 0d275ff362298b443c828f09f593bfb674112bbd (diff) | |
| download | android_hardware_intel_common_omx-components-e4876b874be60356322ca55b467fd0ee096ee7ab.tar.gz android_hardware_intel_common_omx-components-e4876b874be60356322ca55b467fd0ee096ee7ab.tar.bz2 android_hardware_intel_common_omx-components-e4876b874be60356322ca55b467fd0ee096ee7ab.zip | |
Revert "MRFLD highprofile encoding support"
BZ: 76824
This reverts commit fbf1cd362697bbb3b12162408e03f87f9b122ab1.
This reverts patch http://android.intel.com:8080/#/c/67485/
Change-Id: Id1b04d3ad21f5b340b04daac24a8e8ec548a779d
Orig-Change-Id: I8cc469dd7ea37b1c9989a55adec3b1834c4aa905
Reviewed-on: http://android.intel.com:8080/86741
Reviewed-by: Gozalvez Herrero, Juan AntonioX <juan.antoniox.gozalvez.herrero@intel.com>
Tested-by: Gozalvez Herrero, Juan AntonioX <juan.antoniox.gozalvez.herrero@intel.com>
Reviewed-by: cactus <cactus@intel.com>
Tested-by: cactus <cactus@intel.com>
Diffstat (limited to 'videocodec/OMXVideoEncoderMPEG4.cpp')
| -rw-r--r-- | videocodec/OMXVideoEncoderMPEG4.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/videocodec/OMXVideoEncoderMPEG4.cpp b/videocodec/OMXVideoEncoderMPEG4.cpp index c2df1fd..918b391 100644 --- a/videocodec/OMXVideoEncoderMPEG4.cpp +++ b/videocodec/OMXVideoEncoderMPEG4.cpp @@ -104,9 +104,6 @@ OMX_ERRORTYPE OMXVideoEncoderMPEG4::ProcessorProcess( inBuf.data = buffers[INPORT_INDEX]->pBuffer + buffers[INPORT_INDEX]->nOffset; inBuf.size = buffers[INPORT_INDEX]->nFilledLen; - inBuf.type = FTYPE_UNKNOWN; - inBuf.flag = 0; - inBuf.timeStamp = buffers[INPORT_INDEX]->nTimeStamp; if (bAndroidOpaqueFormat) { mCurHandle = rgba2nv12conversion(buffers[INPORT_INDEX]); @@ -163,7 +160,7 @@ OMX_ERRORTYPE OMXVideoEncoderMPEG4::ProcessorProcess( outfilledlen = outBuf.dataSize; - outtimestamp = outBuf.timeStamp; + outtimestamp = buffers[INPORT_INDEX]->nTimeStamp; if (outBuf.flag & ENCODE_BUFFERFLAG_SYNCFRAME) { outflags |= OMX_BUFFERFLAG_SYNCFRAME; |