diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-01-23 02:48:11 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-01-23 02:48:11 -0800 |
| commit | e8a02eef3e98f3afc60489420aae90611e2b70a0 (patch) | |
| tree | 457a958759280d88a5341203e12544c3e5f38f69 | |
| parent | a860362f3119a7a02954c75e9ab859a092bb2ea0 (diff) | |
| parent | 8e661462084f50d50d10ed74cc0c94119b19fec7 (diff) | |
| download | android_hardware_qcom_media-e8a02eef3e98f3afc60489420aae90611e2b70a0.tar.gz android_hardware_qcom_media-e8a02eef3e98f3afc60489420aae90611e2b70a0.tar.bz2 android_hardware_qcom_media-e8a02eef3e98f3afc60489420aae90611e2b70a0.zip | |
Merge "mm-video-v4l2: Add support for prefer adaptive playback extension"
| -rw-r--r-- | mm-core/inc/OMX_QCOMExtns.h | 5 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/mm-core/inc/OMX_QCOMExtns.h b/mm-core/inc/OMX_QCOMExtns.h index 8a46ce21..e3d8e369 100644 --- a/mm-core/inc/OMX_QCOMExtns.h +++ b/mm-core/inc/OMX_QCOMExtns.h @@ -533,6 +533,9 @@ enum OMX_QCOM_EXTN_INDEXTYPE /* Encoder Low Latency mode */ OMX_QcomIndexConfigVideoVencLowLatencyMode = 0x7F000054, + /* Set Prefer-adaptive playback*/ + /* "OMX.QTI.index.param.video.PreferAdaptivePlayback" */ + OMX_QTIIndexParamVideoPreferAdaptivePlayback = 0x7F000055, }; /** @@ -1549,6 +1552,8 @@ typedef struct QOMX_VIDEO_CUSTOM_BUFFERSIZE { #define OMX_QCOM_INDEX_CONFIG_VIDEO_QP "OMX.QCOM.index.config.video.qp" #define OMX_QCOM_INDEX_PARAM_VIDEO_SAR "OMX.QCOM.index.param.video.sar" +#define OMX_QTI_INDEX_PARAM_VIDEO_PREFER_ADAPTIVE_PLAYBACK "OMX.QTI.index.param.video.PreferAdaptivePlayback" + typedef enum { QOMX_VIDEO_FRAME_PACKING_CHECKERBOARD = 0, QOMX_VIDEO_FRAME_PACKING_COLUMN_INTERLEAVE = 1, diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp index b1ef1dbf..fce7097c 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -4191,7 +4191,7 @@ OMX_ERRORTYPE omx_vdec::set_parameter(OMX_IN OMX_HANDLETYPE hComp, break; } if (m_disable_dynamic_buf_mode) { - DEBUG_PRINT_HIGH("Dynamic buffer mode disabled by setprop"); + DEBUG_PRINT_HIGH("Dynamic buffer mode is disabled"); eRet = OMX_ErrorUnsupportedSetting; break; } @@ -4278,6 +4278,15 @@ OMX_ERRORTYPE omx_vdec::set_parameter(OMX_IN OMX_HANDLETYPE hComp, break; } + case OMX_QTIIndexParamVideoPreferAdaptivePlayback: + { + DEBUG_PRINT_LOW("set_parameter: OMX_QTIIndexParamVideoPreferAdaptivePlayback"); + m_disable_dynamic_buf_mode = ((QOMX_ENABLETYPE *)paramData)->bEnable; + if (m_disable_dynamic_buf_mode) { + DEBUG_PRINT_HIGH("Prefer Adaptive Playback is set"); + } + break; + } #endif case OMX_QcomIndexParamVideoCustomBufferSize: { @@ -4773,6 +4782,8 @@ OMX_ERRORTYPE omx_vdec::get_extension_index(OMX_IN OMX_HANDLETYPE hComp, #ifdef ADAPTIVE_PLAYBACK_SUPPORTED else if (extn_equals(paramName, "OMX.google.android.index.prepareForAdaptivePlayback")) { *indexType = (OMX_INDEXTYPE)OMX_QcomIndexParamVideoAdaptivePlaybackMode; + } else if (extn_equals(paramName, OMX_QTI_INDEX_PARAM_VIDEO_PREFER_ADAPTIVE_PLAYBACK)) { + *indexType = (OMX_INDEXTYPE)OMX_QTIIndexParamVideoPreferAdaptivePlayback; } #endif #ifdef FLEXYUV_SUPPORTED |