UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

vc04_services: bcm2835-camera: Use bool values for mmal_fmt.remove_padding 

mmal_fmt.remove_padding is defined as a boolean type hence, use boolean
values for it instead of 0/1 integers. This enhances code readability.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Link: https://lore.kernel.org/r/20221118084244.199909-4-umang.jain@ideasonboard.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Umang Jain 2022-11-18 14:12:44 +05:30 committed by Greg Kroah-Hartman
parent c0012a39cf
commit f198d34759
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
View File

@ -87,21 +87,21 @@ static struct mmal_fmt formats[] = {
.depth = 12, .depth = 12,
.mmal_component = COMP_CAMERA, .mmal_component = COMP_CAMERA,
.ybbp = 1, .ybbp = 1,
.remove_padding = 1, .remove_padding = true,
}, { }, {
.fourcc = V4L2_PIX_FMT_YUYV, .fourcc = V4L2_PIX_FMT_YUYV,
.mmal = MMAL_ENCODING_YUYV, .mmal = MMAL_ENCODING_YUYV,
.depth = 16, .depth = 16,
.mmal_component = COMP_CAMERA, .mmal_component = COMP_CAMERA,
.ybbp = 2, .ybbp = 2,
.remove_padding = 0, .remove_padding = false,
}, { }, {
.fourcc = V4L2_PIX_FMT_RGB24, .fourcc = V4L2_PIX_FMT_RGB24,
.mmal = MMAL_ENCODING_RGB24, .mmal = MMAL_ENCODING_RGB24,
.depth = 24, .depth = 24,
.mmal_component = COMP_CAMERA, .mmal_component = COMP_CAMERA,
.ybbp = 3, .ybbp = 3,
.remove_padding = 0, .remove_padding = false,
}, { }, {
.fourcc = V4L2_PIX_FMT_JPEG, .fourcc = V4L2_PIX_FMT_JPEG,
.flags = V4L2_FMT_FLAG_COMPRESSED, .flags = V4L2_FMT_FLAG_COMPRESSED,
@ -109,7 +109,7 @@ static struct mmal_fmt formats[] = {
.depth = 8, .depth = 8,
.mmal_component = COMP_IMAGE_ENCODE, .mmal_component = COMP_IMAGE_ENCODE,
.ybbp = 0, .ybbp = 0,
.remove_padding = 0, .remove_padding = false,
}, { }, {
.fourcc = V4L2_PIX_FMT_H264, .fourcc = V4L2_PIX_FMT_H264,
.flags = V4L2_FMT_FLAG_COMPRESSED, .flags = V4L2_FMT_FLAG_COMPRESSED,
@ -117,7 +117,7 @@ static struct mmal_fmt formats[] = {
.depth = 8, .depth = 8,
.mmal_component = COMP_VIDEO_ENCODE, .mmal_component = COMP_VIDEO_ENCODE,
.ybbp = 0, .ybbp = 0,
.remove_padding = 0, .remove_padding = false,
}, { }, {
.fourcc = V4L2_PIX_FMT_MJPEG, .fourcc = V4L2_PIX_FMT_MJPEG,
.flags = V4L2_FMT_FLAG_COMPRESSED, .flags = V4L2_FMT_FLAG_COMPRESSED,
@ -125,63 +125,63 @@ static struct mmal_fmt formats[] = {
.depth = 8, .depth = 8,
.mmal_component = COMP_VIDEO_ENCODE, .mmal_component = COMP_VIDEO_ENCODE,
.ybbp = 0, .ybbp = 0,
.remove_padding = 0, .remove_padding = false,
}, { }, {
.fourcc = V4L2_PIX_FMT_YVYU, .fourcc = V4L2_PIX_FMT_YVYU,
.mmal = MMAL_ENCODING_YVYU, .mmal = MMAL_ENCODING_YVYU,
.depth = 16, .depth = 16,
.mmal_component = COMP_CAMERA, .mmal_component = COMP_CAMERA,
.ybbp = 2, .ybbp = 2,
.remove_padding = 0, .remove_padding = false,
}, { }, {
.fourcc = V4L2_PIX_FMT_VYUY, .fourcc = V4L2_PIX_FMT_VYUY,
.mmal = MMAL_ENCODING_VYUY, .mmal = MMAL_ENCODING_VYUY,
.depth = 16, .depth = 16,
.mmal_component = COMP_CAMERA, .mmal_component = COMP_CAMERA,
.ybbp = 2, .ybbp = 2,
.remove_padding = 0, .remove_padding = false,
}, { }, {
.fourcc = V4L2_PIX_FMT_UYVY, .fourcc = V4L2_PIX_FMT_UYVY,
.mmal = MMAL_ENCODING_UYVY, .mmal = MMAL_ENCODING_UYVY,
.depth = 16, .depth = 16,
.mmal_component = COMP_CAMERA, .mmal_component = COMP_CAMERA,
.ybbp = 2, .ybbp = 2,
.remove_padding = 0, .remove_padding = false,
}, { }, {
.fourcc = V4L2_PIX_FMT_NV12, .fourcc = V4L2_PIX_FMT_NV12,
.mmal = MMAL_ENCODING_NV12, .mmal = MMAL_ENCODING_NV12,
.depth = 12, .depth = 12,
.mmal_component = COMP_CAMERA, .mmal_component = COMP_CAMERA,
.ybbp = 1, .ybbp = 1,
.remove_padding = 1, .remove_padding = true,
}, { }, {
.fourcc = V4L2_PIX_FMT_BGR24, .fourcc = V4L2_PIX_FMT_BGR24,
.mmal = MMAL_ENCODING_BGR24, .mmal = MMAL_ENCODING_BGR24,
.depth = 24, .depth = 24,
.mmal_component = COMP_CAMERA, .mmal_component = COMP_CAMERA,
.ybbp = 3, .ybbp = 3,
.remove_padding = 0, .remove_padding = false,
}, { }, {
.fourcc = V4L2_PIX_FMT_YVU420, .fourcc = V4L2_PIX_FMT_YVU420,
.mmal = MMAL_ENCODING_YV12, .mmal = MMAL_ENCODING_YV12,
.depth = 12, .depth = 12,
.mmal_component = COMP_CAMERA, .mmal_component = COMP_CAMERA,
.ybbp = 1, .ybbp = 1,
.remove_padding = 1, .remove_padding = true,
}, { }, {
.fourcc = V4L2_PIX_FMT_NV21, .fourcc = V4L2_PIX_FMT_NV21,
.mmal = MMAL_ENCODING_NV21, .mmal = MMAL_ENCODING_NV21,
.depth = 12, .depth = 12,
.mmal_component = COMP_CAMERA, .mmal_component = COMP_CAMERA,
.ybbp = 1, .ybbp = 1,
.remove_padding = 1, .remove_padding = true,
}, { }, {
.fourcc = V4L2_PIX_FMT_BGR32, .fourcc = V4L2_PIX_FMT_BGR32,
.mmal = MMAL_ENCODING_BGRA, .mmal = MMAL_ENCODING_BGRA,
.depth = 32, .depth = 32,
.mmal_component = COMP_CAMERA, .mmal_component = COMP_CAMERA,
.ybbp = 4, .ybbp = 4,
.remove_padding = 0, .remove_padding = false,
}, },
}; };
@ -1147,7 +1147,7 @@ static int mmal_setup_components(struct bcm2835_mmal_dev *dev,
struct vchiq_mmal_port *port = NULL, *camera_port = NULL; struct vchiq_mmal_port *port = NULL, *camera_port = NULL;
struct vchiq_mmal_component *encode_component = NULL; struct vchiq_mmal_component *encode_component = NULL;
struct mmal_fmt *mfmt = get_format(f); struct mmal_fmt *mfmt = get_format(f);
u32 remove_padding; bool remove_padding;
if (!mfmt) if (!mfmt)
return -EINVAL; return -EINVAL;