author | jiyu.yang <jiyu.yang@amlogic.com> | 2013-09-02 13:53:50 (GMT) |
---|---|---|
committer | brian.zhu <brian.zhu@amlogic.com> | 2013-09-26 12:17:44 (GMT) |
commit | 1fd225699330322f35e78ea065ef7a9efc90de0b (patch) | |
tree | ccd4ecdeebb219d6ca212e599811c119af8eb753 | |
parent | 68b3bc584daa558d48c1b1061ac8b62a5e5a24c3 (diff) | |
download | camera-1fd225699330322f35e78ea065ef7a9efc90de0b.zip camera-1fd225699330322f35e78ea065ef7a9efc90de0b.tar.gz camera-1fd225699330322f35e78ea065ef7a9efc90de0b.tar.bz2 |
PD#78891: return false when not support mjpeg
ret is bool ,when not support mjpeg, return -1 != 0,
that is true by implicit conversion.
-rwxr-xr-x | V4LCameraAdapter/V4LCameraAdapter.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/V4LCameraAdapter/V4LCameraAdapter.cpp b/V4LCameraAdapter/V4LCameraAdapter.cpp index 4b95230..ff15314 100755 --- a/V4LCameraAdapter/V4LCameraAdapter.cpp +++ b/V4LCameraAdapter/V4LCameraAdapter.cpp @@ -2187,20 +2187,19 @@ static int getCameraOrientation(bool frontcamera, char* property) static bool is_mjpeg_supported(int camera_fd) { - bool ret = false; struct v4l2_fmtdesc fmt; + int ret; memset(&fmt,0,sizeof(fmt)); fmt.index = 0; fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; while((ret = ioctl(camera_fd,VIDIOC_ENUM_FMT,&fmt)) == 0){ if(fmt.pixelformat == V4L2_PIX_FMT_MJPEG){ - ret = true; - break; + return true; } fmt.index++; } - return ret; + return false; } static void ParserLimitedRateInfo(LimitedRate_t* rate) |