Merge "Revert "msmnile: add high speed profiles""
diff --git a/conf_files/atoll/media_codecs_performance.xml b/conf_files/atoll/media_codecs_performance.xml
index bd31f08..071ff92 100644
--- a/conf_files/atoll/media_codecs_performance.xml
+++ b/conf_files/atoll/media_codecs_performance.xml
@@ -97,7 +97,7 @@
<Limit name="measured-frame-rate-1920x1088" range="93-146" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
- <Limit name="measured-frame-rate-352x288" range="222-222" />
+ <Limit name="measured-frame-rate-352x288" range="279-401" />
<Limit name="measured-frame-rate-720x480" range="268-360" />
<Limit name="measured-frame-rate-1280x720" range="191-268" />
<Limit name="measured-frame-rate-1920x1080" range="94-147" />
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
index 829555c..0e8c326 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
@@ -7377,16 +7377,6 @@
buffer->pBuffer = (OMX_U8*)drv_ctx.ptr_inputbuffer[nBufferIndex].bufferaddr;
}
- /* Check if the input timestamp in seconds is greater than LONG_MAX
- or lesser than LONG_MIN. */
- if (buffer->nTimeStamp / 1000000 > LONG_MAX ||
- buffer->nTimeStamp / 1000000 < LONG_MIN) {
- /* This timestamp cannot be contained in driver timestamp field */
- DEBUG_PRINT_ERROR("[ETB] BHdr(%p) pBuf(%p) nTS(%lld) nFL(%u) >> Invalid timestamp",
- buffer, buffer->pBuffer, buffer->nTimeStamp, (unsigned int)buffer->nFilledLen);
- return OMX_ErrorBadParameter;
- }
-
DEBUG_PRINT_LOW("[ETB] BHdr(%p) pBuf(%p) nTS(%lld) nFL(%u)",
buffer, buffer->pBuffer, buffer->nTimeStamp, (unsigned int)buffer->nFilledLen);
if (arbitrary_bytes) {
