diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-12-29 09:19:28 -0800 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2020-12-29 09:19:28 -0800 |
| commit | baa5a05285a9c47a2d7d3284bd91569a0583e319 (patch) | |
| tree | 7d9e3d54a68ed632658a75460ada3305dae3837f | |
| parent | c3e37ddaa14ae3ad0be6a84c1a586c972d91940e (diff) | |
| parent | c0681dd10927a429e58f9162d6a09f6446920c06 (diff) | |
Merge c0681dd10927a429e58f9162d6a09f6446920c06 on remote branch
Change-Id: I15d75d763a365b85b95c4e8750c682f0fe3e0dc7
| -rw-r--r-- | conf_files/sm6150/media_codecs_performance_sdmmagpie_v1.xml | 12 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/conf_files/sm6150/media_codecs_performance_sdmmagpie_v1.xml b/conf_files/sm6150/media_codecs_performance_sdmmagpie_v1.xml index 44c6e22c..16ccc5eb 100644 --- a/conf_files/sm6150/media_codecs_performance_sdmmagpie_v1.xml +++ b/conf_files/sm6150/media_codecs_performance_sdmmagpie_v1.xml @@ -50,6 +50,12 @@ limitations under the License. <Limit name="measured-frame-rate-1280x720" range="57-83" /> <Limit name="measured-frame-rate-1920x1080" range="16-40" /> </MediaCodec> + <MediaCodec name="c2.qti.avc.encoder" type="video/avc" update="true"> + <Limit name="measured-frame-rate-320x240" range="106-234" /> + <Limit name="measured-frame-rate-720x480" range="64-140" /> + <Limit name="measured-frame-rate-1280x720" range="26-56" /> + <Limit name="measured-frame-rate-1920x1080" range="20-44" /> + </MediaCodec> <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true"> <Limit name="measured-frame-rate-320x240" range="215-215" /> <Limit name="measured-frame-rate-720x480" range="100-100" /> @@ -126,6 +132,12 @@ limitations under the License. <Limit name="measured-frame-rate-1920x1080" range="220-220" /> <Limit name="measured-frame-rate-3840x2160" range="51-51" /> </MediaCodec> + <MediaCodec name="c2.qti.avc.decoder" type="video/avc" update="true"> + <Limit name="measured-frame-rate-320x240" range="220-630" /> + <Limit name="measured-frame-rate-720x480" range="250-513" /> + <Limit name="measured-frame-rate-1280x720" range="200-420" /> + <Limit name="measured-frame-rate-1920x1088" range="189-301" /> + </MediaCodec> <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true"> <Limit name="measured-frame-rate-320x240" range="270-310" /> <Limit name="measured-frame-rate-720x480" range="68-68" /> diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp index 5c6c8db9..67fbff3c 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -3696,6 +3696,8 @@ OMX_ERRORTYPE omx_video::allocate_output_buffer( m_pOutput_pmem[i].buffer = malloc(sizeof(output_metabuffer)); if (m_pOutput_pmem[i].buffer == NULL) { DEBUG_PRINT_ERROR("%s: Failed to allocate meta buffer", __func__); + native_handle_close(handle); + native_handle_delete(handle); return OMX_ErrorInsufficientResources; } (*bufferHdr)->nAllocLen = sizeof(output_metabuffer); |