commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=49ec922aac2a5a450210d08ba8481d20030e933c branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
some format such as Y41P, each 12 bytes is 8 pixels, can't use bytes per pixel to calculate bytesperline. Signed-off-by: Scott Jiang <[email protected]> --- drivers/media/video/blackfin/bfin_capture.c | 16 ++++++++-------- drivers/media/video/blackfin/ppi.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/media/video/blackfin/bfin_capture.c b/drivers/media/video/blackfin/bfin_capture.c index b65e997..d025e2e 100644 --- a/drivers/media/video/blackfin/bfin_capture.c +++ b/drivers/media/video/blackfin/bfin_capture.c @@ -49,7 +49,7 @@ struct bcap_format { u8 *desc; u32 pixelformat; enum v4l2_mbus_pixelcode mbus_code; - int bpp; /* bytes per pixel */ + int bpp; /* bits per pixel */ }; struct bcap_buffer { @@ -74,7 +74,7 @@ struct bcap_device { v4l2_std_id std; /* used to store pixel format */ struct v4l2_pix_format fmt; - /* bytes per pixel*/ + /* bits per pixel*/ int bpp; /* pointing to current video buffer */ struct bcap_buffer *cur_frm; @@ -112,25 +112,25 @@ static const struct bcap_format bcap_formats[] = { .desc = "YCbCr 4:2:2 Interleaved UYVY", .pixelformat = V4L2_PIX_FMT_UYVY, .mbus_code = V4L2_MBUS_FMT_UYVY8_2X8, - .bpp = 2, + .bpp = 16, }, { .desc = "YCbCr 4:2:2 Interleaved YUYV", .pixelformat = V4L2_PIX_FMT_YUYV, .mbus_code = V4L2_MBUS_FMT_YUYV8_2X8, - .bpp = 2, + .bpp = 16, }, { .desc = "RGB 565", .pixelformat = V4L2_PIX_FMT_RGB565, .mbus_code = V4L2_MBUS_FMT_RGB565_2X8_LE, - .bpp = 2, + .bpp = 16, }, { .desc = "RGB 444", .pixelformat = V4L2_PIX_FMT_RGB444, .mbus_code = V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE, - .bpp = 2, + .bpp = 16, }, }; @@ -675,7 +675,7 @@ static int bcap_try_format(struct bcap_device *bcap, if (ret < 0) return ret; v4l2_fill_pix_format(pixfmt, &mbus_fmt); - pixfmt->bytesperline = pixfmt->width * fmt->bpp; + pixfmt->bytesperline = pixfmt->width * fmt->bpp / 8; pixfmt->sizeimage = pixfmt->bytesperline * pixfmt->height; return 0; } @@ -745,7 +745,7 @@ static int bcap_g_fmt_vid_cap(struct file *file, void *priv, bcap_fmt = &bcap_formats[i]; v4l2_fill_pix_format(pixfmt, &mbus_fmt); pixfmt->pixelformat = bcap_fmt->pixelformat; - pixfmt->bytesperline = pixfmt->width * bcap_fmt->bpp; + pixfmt->bytesperline = pixfmt->width * bcap_fmt->bpp / 8; pixfmt->sizeimage = pixfmt->bytesperline * pixfmt->height; return 0; } diff --git a/drivers/media/video/blackfin/ppi.c b/drivers/media/video/blackfin/ppi.c index 801d3eb..3b5f43e 100644 --- a/drivers/media/video/blackfin/ppi.c +++ b/drivers/media/video/blackfin/ppi.c @@ -131,7 +131,7 @@ static int ppi_set_params(struct ppi_if *ppi, struct ppi_params *params) { const struct ppi_info *info = ppi->info; - ppi->bytes_per_line = params->width * params->bpp; + ppi->bytes_per_line = params->width * params->bpp / 8; ppi->lines_per_frame = params->height; /* config DMA */
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
