summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2017-11-23 19:11:15 +0100
committerSylwester Nawrocki <s.nawrocki@samsung.com>2017-11-23 19:11:15 +0100
commit4b6c03b788c3ee0ca39f6078a3d1c404cce792ff (patch)
tree4d9dd7388e6d13aed79de58d73f87061c4a60789
parent08247be6f1b73624777bbeeead2c9f3f311a641c (diff)
downloadgst-plugins-camera-n4-4b6c03b788c3ee0ca39f6078a3d1c404cce792ff.tar.gz
gst-plugins-camera-n4-4b6c03b788c3ee0ca39f6078a3d1c404cce792ff.tar.bz2
gst-plugins-camera-n4-4b6c03b788c3ee0ca39f6078a3d1c404cce792ff.zip
Reduce number of conditional operators
This fixes SVACE warning: Line 2390: if (!(p->format_scp.pix_format == CAMERASRC_PIX_YUV422P || (CODE_SMELL/Warning) Reduce the number of conditional operators (8 Change-Id: I28e530831224916af6ba983c54973b9b16b8c216 Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
-rw-r--r--camerasrc/src/camerasrc.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/camerasrc/src/camerasrc.c b/camerasrc/src/camerasrc.c
index c3ba5c6..0c76eca 100644
--- a/camerasrc/src/camerasrc.c
+++ b/camerasrc/src/camerasrc.c
@@ -2386,12 +2386,19 @@ int camerasrc_start_preview_stream(camsrc_handle_t handle)
camsrc_warning("Invalid state transition");
}
- /* P R E V I E W F O R M A T S E T T I N G */
- if (!(p->format_scp.pix_format == CAMERASRC_PIX_YUV422P ||
- p->format_scp.pix_format == CAMERASRC_PIX_YUV420P || p->format_scp.pix_format == CAMERASRC_PIX_YV12 ||
- p->format_scp.pix_format == CAMERASRC_PIX_SN12 || p->format_scp.pix_format == CAMERASRC_PIX_NV12 ||
- p->format_scp.pix_format == CAMERASRC_PIX_SN21 || p->format_scp.pix_format == CAMERASRC_PIX_NV21 ||
- p->format_scp.pix_format == CAMERASRC_PIX_UYVY || p->format_scp.pix_format == CAMERASRC_PIX_YUY2)) {
+ /* Check for valid preview image format */
+ switch (p->format_scp.pix_format) {
+ case CAMERASRC_PIX_YUV422P:
+ case CAMERASRC_PIX_YUV420P:
+ case CAMERASRC_PIX_YV12:
+ case CAMERASRC_PIX_SN12:
+ case CAMERASRC_PIX_NV12:
+ case CAMERASRC_PIX_SN21:
+ case CAMERASRC_PIX_NV21:
+ case CAMERASRC_PIX_UYVY:
+ case CAMERASRC_PIX_YUY2:
+ break;
+ default:
camsrc_error("Invalid output format %d", p->format_scp.pix_format);
return CAMERASRC_ERR_INVALID_FORMAT;
}