Revert bits-per-pixel change, fix bits-per-pixel for new bayer formats

src/mode.c

@@ -86,7 +86,7 @@ static struct libmegapixels_modename mode_lut[] = {
 		.v4l_pixel_format = V4L2_PIX_FMT_SBGGR10,
 		.media_bus_format = MEDIA_BUS_FMT_SBGGR10_1X10,
 		.bpc = 10,
-		.bpp = 16,
+		.bpp = 10,
 		.cfa = LIBMEGAPIXELS_CFA_BGGR,
 	},
 	{
@@ -94,7 +94,7 @@ static struct libmegapixels_modename mode_lut[] = {
 		.v4l_pixel_format = V4L2_PIX_FMT_SGBRG10,
 		.media_bus_format = MEDIA_BUS_FMT_SGBRG10_1X10,
 		.bpc = 10,
-		.bpp = 16,
+		.bpp = 10,
 		.cfa = LIBMEGAPIXELS_CFA_GBRG,
 	},
 	{
@@ -102,15 +102,15 @@ static struct libmegapixels_modename mode_lut[] = {
 		.v4l_pixel_format = V4L2_PIX_FMT_SGRBG10,
 		.media_bus_format = MEDIA_BUS_FMT_SGRBG10_1X10,
 		.bpc = 10,
-		.bpp = 16,
+		.bpp = 10,
 		.cfa = LIBMEGAPIXELS_CFA_GRBG,
 	},
 	{
 		.name = "RGGB10",
 		.v4l_pixel_format = V4L2_PIX_FMT_SRGGB10,
 		.media_bus_format = MEDIA_BUS_FMT_SRGGB10_1X10,
-		.bpc = 10, // Bits per color
-		.bpp = 16, // Bit per pixel
+		.bpc = 10,
+		.bpp = 10,
 		.cfa = LIBMEGAPIXELS_CFA_RGGB,
 	},
 	{
@@ -118,7 +118,7 @@ static struct libmegapixels_modename mode_lut[] = {
 		.v4l_pixel_format = V4L2_PIX_FMT_SBGGR12,
 		.media_bus_format = MEDIA_BUS_FMT_SBGGR12_1X12,
 		.bpc = 12,
-		.bpp = 16,
+		.bpp = 12,
 		.cfa = LIBMEGAPIXELS_CFA_BGGR,
 	},
 	{
@@ -126,7 +126,7 @@ static struct libmegapixels_modename mode_lut[] = {
 		.v4l_pixel_format = V4L2_PIX_FMT_SGBRG12,
 		.media_bus_format = MEDIA_BUS_FMT_SGBRG12_1X12,
 		.bpc = 12,
-		.bpp = 16,
+		.bpp = 12,
 		.cfa = LIBMEGAPIXELS_CFA_GBRG,
 	},
 	{
@@ -134,7 +134,7 @@ static struct libmegapixels_modename mode_lut[] = {
 		.v4l_pixel_format = V4L2_PIX_FMT_SGRBG12,
 		.media_bus_format = MEDIA_BUS_FMT_SGRBG12_1X12,
 		.bpc = 12,
-		.bpp = 16,
+		.bpp = 12,
 		.cfa = LIBMEGAPIXELS_CFA_GRBG,
 	},
 	{
@@ -142,7 +142,7 @@ static struct libmegapixels_modename mode_lut[] = {
 		.v4l_pixel_format = V4L2_PIX_FMT_SRGGB12,
 		.media_bus_format = MEDIA_BUS_FMT_SRGGB12_1X12,
 		.bpc = 12,
-		.bpp = 16,
+		.bpp = 12,
 		.cfa = LIBMEGAPIXELS_CFA_RGGB,
 	},
 	{

src/mode.h

@@ -7,8 +7,8 @@ struct libmegapixels_modename {
 		char *name;
 		uint32_t v4l_pixel_format;
 		uint32_t media_bus_format;
-		int bpp;
-		int bpc;
+		int bpp; /* Bits per pixel */
+		int bpc; /* Bits per color - not currently used */
 		int cfa;
 };