diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-03 13:53:15 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-03 13:53:15 -0700 |
| commit | e8273f7654530bc3c6a24239eb0027f52cb36c67 (patch) | |
| tree | 2bc065c1fe329e8dcee3d654ece1f9ffec1a2d0f /mm-video-v4l2 | |
| parent | d3700845582796b07b4b9c32e5e8b0921c0febce (diff) | |
| parent | 90aae19d53fa3e690a70d2facc45cfa25921eee6 (diff) | |
| download | media-e8273f7654530bc3c6a24239eb0027f52cb36c67.tar.gz | |
Merge "mm-video-v4l2: vidc: venc: Fix typo in resolution check"
Diffstat (limited to 'mm-video-v4l2')
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp | 8 |
1 files changed, 4 insertions, 4 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 60cb3d16..7cb7084c 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 @@ -82,8 +82,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define VENC_BFRAME_MAX_COUNT 1 #define VENC_BFRAME_MAX_FPS 60 -#define VENC_BFRAME_MAX_HEIGHT 1920 -#define VENC_BFRAME_MAX_WIDTH 1088 +#define VENC_BFRAME_MAX_WIDTH 1920 +#define VENC_BFRAME_MAX_HEIGHT 1088 //constructor venc_dev::venc_dev(class omx_venc *venc_class) @@ -4793,8 +4793,8 @@ bool venc_dev::venc_reconfigure_intra_period() DEBUG_PRINT_LOW("venc_reconfigure_intra_period"); - if ((m_sVenc_cfg.input_width <= VENC_BFRAME_MAX_WIDTH && m_sVenc_cfg.input_width <= VENC_BFRAME_MAX_HEIGHT) || - (m_sVenc_cfg.input_width <= VENC_BFRAME_MAX_HEIGHT && m_sVenc_cfg.input_width <= VENC_BFRAME_MAX_WIDTH)) { + if ((m_sVenc_cfg.input_width <= VENC_BFRAME_MAX_WIDTH && m_sVenc_cfg.input_height <= VENC_BFRAME_MAX_HEIGHT) || + (m_sVenc_cfg.input_width <= VENC_BFRAME_MAX_HEIGHT && m_sVenc_cfg.input_height <= VENC_BFRAME_MAX_WIDTH)) { isValidResolution = true; } |