diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-03-30 12:54:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-03-30 12:54:29 -0700 |
| commit | ccce87dee6d412f25e209478b9c47d62197cbcac (patch) | |
| tree | 16489f60b809ef94f9aa5a9cacca42ac67370a7d | |
| parent | 538225bd4b8ceac011a27bf1a5fed3edf50080e7 (diff) | |
| parent | 2a3c3fc282dfb883ff53f06c4a746e7a91ff725a (diff) | |
| download | android_hardware_qcom_media-ccce87dee6d412f25e209478b9c47d62197cbcac.tar.gz android_hardware_qcom_media-ccce87dee6d412f25e209478b9c47d62197cbcac.tar.bz2 android_hardware_qcom_media-ccce87dee6d412f25e209478b9c47d62197cbcac.zip | |
Merge "mm-video-v4l2: vidc: venc: Fix rotation issue"
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp index 88dc6d96..e0f979cc 100644 --- a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp +++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp @@ -274,6 +274,7 @@ venc_dev::venc_dev(class omx_venc *venc_class) color_format = 0; hw_overload = false; mBatchSize = 0; + deinterlace_enabled = false; pthread_mutex_init(&pause_resume_mlock, NULL); pthread_cond_init(&pause_resume_cond, NULL); memset(&input_extradata_info, 0, sizeof(input_extradata_info)); @@ -2467,11 +2468,12 @@ bool venc_dev::venc_set_config(void *configData, OMX_INDEXTYPE index) DEBUG_PRINT_ERROR("ERROR: Rotation is not supported with deinterlacing"); return false; } - DEBUG_PRINT_HIGH("venc_set_config: updating the new Dims"); - nFrameWidth = m_sVenc_cfg.dvs_width; - m_sVenc_cfg.dvs_width = m_sVenc_cfg.dvs_height; - m_sVenc_cfg.dvs_height = nFrameWidth; - + if (config_rotation->nRotation == 90 || config_rotation->nRotation == 270) { + DEBUG_PRINT_HIGH("venc_set_config: updating the new Dims"); + nFrameWidth = m_sVenc_cfg.dvs_width; + m_sVenc_cfg.dvs_width = m_sVenc_cfg.dvs_height; + m_sVenc_cfg.dvs_height = nFrameWidth; + } if(venc_set_vpe_rotation(config_rotation->nRotation) == false) { DEBUG_PRINT_ERROR("ERROR: Dimension Change for Rotation failed"); return false; |