From 8a0ce3f00055556d0cb1071f78d97587e6b78ba5 Mon Sep 17 00:00:00 2001 From: SPRESENSE <41312067+SPRESENSE@users.noreply.github.com> Date: Mon, 24 Oct 2022 22:41:17 +0900 Subject: [PATCH] drivers/video/isx019: Fix incorrect JPEG DQT table --- drivers/video/isx019.c | 154 ++++++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/drivers/video/isx019.c b/drivers/video/isx019.c index f128ae5ce3..d188f7235d 100644 --- a/drivers/video/isx019.c +++ b/drivers/video/isx019.c @@ -314,7 +314,7 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = { 10, { - 21, 15, 15, 26, 18, 26, 43, 21, + 21, 16, 16, 26, 18, 26, 43, 21, 21, 43, 43, 43, 32, 43, 43, 43, 43, 43, 43, 43, 43, 64, 43, 43, 43, 43, 43, 64, 64, 64, 64, 64, @@ -357,8 +357,8 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = { 20, { - 18, 14, 14, 14, 15, 14, 21, 15, - 15, 21, 32, 21, 18, 21, 32, 32, + 18, 14, 14, 14, 16, 14, 21, 16, + 16, 21, 32, 21, 16, 21, 32, 32, 26, 21, 21, 26, 32, 32, 26, 26, 26, 26, 26, 32, 43, 32, 32, 32, 32, 32, 32, 43, 43, 43, 43, 43, @@ -369,7 +369,7 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = { 135, 137, 137, 3, 2, 2, 2, 131, 137, 4, 4, 3, 133, 133, 2, 131, - 137, 4, 135, 3, 133, 2, 131, 1, + 137, 4, 4, 3, 133, 2, 131, 1, 3, 3, 3, 133, 2, 131, 1, 1, 2, 133, 133, 2, 131, 1, 1, 1, 2, 133, 2, 131, 1, 1, 1, 1, @@ -400,9 +400,9 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = { 30, { - 15, 11, 11, 11, 12, 11, 15, 12, - 12, 15, 21, 15, 13, 15, 21, 26, - 21, 15, 15, 21, 26, 32, 21, 21, + 16, 11, 11, 11, 12, 11, 16, 12, + 12, 16, 21, 14, 13, 14, 21, 26, + 21, 16, 16, 21, 26, 32, 21, 21, 21, 21, 21, 32, 32, 21, 26, 26, 26, 26, 21, 32, 32, 32, 32, 43, 32, 32, 32, 43, 43, 43, 43, 43, @@ -410,18 +410,18 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = 64, 64, 64, 64, 64, 64, 64, 64, }, { - 4, 12, 12, 4, 3, 133, 2, 2, - 12, 139, 139, 4, 3, 3, 3, 2, - 12, 139, 5, 4, 3, 133, 2, 131, - 4, 4, 4, 3, 133, 2, 131, 1, + 4, 6, 6, 4, 3, 133, 2, 2, + 6, 139, 139, 137, 3, 3, 3, 2, + 6, 139, 5, 4, 3, 133, 2, 131, + 4, 137, 4, 3, 133, 2, 131, 1, 3, 3, 3, 133, 131, 131, 1, 1, 133, 3, 133, 2, 131, 1, 1, 1, 2, 3, 2, 131, 1, 1, 1, 1, 2, 2, 131, 1, 1, 1, 1, 1, }, { - 18, 15, 15, 18, 18, 18, 21, 18, - 18, 21, 21, 18, 21, 18, 21, 26, + 16, 14, 14, 16, 18, 16, 21, 18, + 18, 21, 21, 16, 21, 16, 21, 26, 21, 21, 21, 21, 26, 43, 26, 26, 26, 26, 26, 43, 43, 32, 32, 32, 32, 32, 32, 43, 43, 43, 43, 43, @@ -430,10 +430,10 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = 64, 64, 64, 64, 64, 64, 64, 64, }, { - 135, 4, 135, 3, 3, 133, 131, 131, - 4, 135, 135, 135, 3, 133, 2, 131, - 135, 135, 3, 3, 133, 2, 131, 131, - 3, 135, 3, 133, 2, 131, 131, 1, + 4, 137, 4, 3, 3, 133, 131, 131, + 137, 135, 135, 4, 3, 133, 2, 131, + 4, 135, 3, 3, 133, 2, 131, 131, + 3, 4, 3, 133, 2, 131, 131, 1, 3, 3, 133, 2, 131, 131, 1, 1, 133, 133, 2, 131, 131, 1, 1, 1, 131, 2, 131, 131, 1, 1, 1, 1, @@ -444,8 +444,8 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = 40, { 12, 8, 8, 8, 9, 8, 12, 9, - 9, 12, 18, 11, 10, 11, 18, 21, - 15, 12, 12, 15, 21, 26, 18, 18, + 9, 12, 16, 11, 10, 11, 16, 21, + 14, 12, 12, 14, 21, 26, 18, 18, 21, 18, 18, 26, 21, 18, 21, 21, 21, 21, 18, 21, 21, 26, 26, 32, 26, 26, 21, 32, 32, 43, 43, 32, @@ -453,19 +453,19 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = 64, 64, 64, 64, 64, 64, 64, 64, }, { - 139, 8, 8, 139, 135, 3, 133, 3, - 8, 7, 7, 12, 4, 135, 135, 3, + 139, 8, 8, 139, 4, 3, 133, 3, + 8, 7, 7, 6, 137, 135, 135, 3, 8, 7, 141, 139, 135, 3, 133, 2, - 139, 12, 139, 3, 3, 133, 2, 131, - 135, 4, 135, 3, 2, 131, 131, 1, + 139, 6, 139, 3, 3, 133, 2, 131, + 4, 137, 135, 3, 2, 131, 131, 1, 3, 135, 3, 133, 131, 131, 1, 1, 133, 135, 133, 2, 131, 1, 1, 1, 3, 3, 2, 131, 1, 1, 1, 1, }, { - 13, 11, 11, 13, 14, 13, 15, 14, - 14, 15, 21, 14, 15, 14, 21, 21, - 15, 18, 18, 15, 21, 26, 21, 21, + 13, 11, 11, 13, 14, 13, 16, 14, + 14, 16, 21, 14, 14, 14, 21, 21, + 16, 16, 16, 16, 21, 26, 21, 21, 21, 21, 21, 26, 32, 26, 21, 21, 21, 21, 26, 32, 32, 32, 32, 32, 32, 32, 32, 43, 43, 32, 32, 43, @@ -473,10 +473,10 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = 64, 64, 64, 64, 64, 64, 64, 64, }, { - 5, 12, 5, 4, 3, 3, 133, 2, - 12, 137, 137, 137, 4, 3, 133, 2, - 5, 137, 4, 135, 3, 3, 2, 131, - 4, 137, 135, 3, 3, 2, 131, 131, + 5, 6, 5, 4, 3, 3, 133, 2, + 6, 137, 137, 137, 4, 3, 133, 2, + 5, 137, 137, 4, 3, 3, 2, 131, + 4, 137, 4, 3, 3, 2, 131, 131, 3, 4, 3, 3, 2, 2, 131, 1, 3, 3, 3, 2, 2, 131, 1, 1, 133, 133, 2, 131, 131, 1, 1, 1, @@ -488,41 +488,41 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = { 8, 6, 6, 6, 6, 6, 8, 6, 6, 8, 12, 8, 7, 8, 12, 14, - 10, 8, 8, 10, 14, 15, 13, 13, - 14, 13, 13, 15, 18, 12, 14, 13, - 13, 14, 12, 18, 15, 18, 18, 21, - 18, 18, 15, 26, 26, 26, 26, 26, + 10, 8, 8, 10, 14, 16, 13, 13, + 14, 13, 13, 16, 16, 12, 14, 13, + 13, 14, 12, 16, 14, 18, 18, 21, + 18, 18, 14, 26, 26, 26, 26, 26, 26, 32, 32, 32, 32, 32, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, }, { - 8, 11, 11, 8, 139, 137, 4, 135, - 11, 11, 11, 8, 141, 5, 139, 4, + 8, 11, 11, 8, 139, 137, 4, 4, + 11, 11, 11, 8, 141, 5, 139, 137, 11, 11, 9, 8, 5, 137, 135, 133, 8, 8, 8, 137, 5, 135, 133, 2, 139, 141, 5, 5, 3, 133, 2, 131, 137, 5, 137, 135, 133, 2, 131, 131, 4, 139, 135, 133, 2, 131, 131, 131, - 135, 4, 133, 2, 131, 131, 131, 131, + 4, 137, 133, 2, 131, 131, 131, 131, }, { 9, 8, 8, 9, 10, 9, 11, 9, - 9, 11, 14, 11, 13, 11, 14, 18, - 14, 14, 14, 14, 18, 18, 13, 13, - 14, 13, 13, 18, 26, 18, 15, 15, - 15, 15, 18, 26, 21, 21, 21, 21, + 9, 11, 14, 11, 13, 11, 14, 16, + 14, 14, 14, 14, 16, 18, 13, 13, + 14, 13, 13, 18, 26, 16, 14, 14, + 14, 14, 16, 26, 21, 21, 21, 21, 21, 21, 21, 26, 26, 26, 26, 26, 26, 32, 32, 32, 32, 32, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, }, { - 7, 8, 7, 12, 137, 135, 135, 133, - 8, 141, 7, 12, 137, 5, 135, 3, - 7, 7, 5, 137, 5, 4, 3, 133, - 12, 12, 137, 137, 4, 3, 133, 2, - 137, 137, 5, 4, 3, 133, 2, 131, - 135, 5, 4, 3, 133, 2, 131, 131, - 135, 135, 3, 133, 2, 131, 131, 131, + 7, 8, 7, 6, 137, 4, 135, 133, + 8, 141, 7, 6, 137, 5, 4, 3, + 7, 7, 5, 137, 5, 137, 3, 133, + 6, 6, 137, 137, 137, 3, 133, 2, + 137, 137, 5, 137, 3, 133, 2, 131, + 4, 5, 137, 3, 133, 2, 131, 131, + 135, 4, 3, 133, 2, 131, 131, 131, 133, 3, 133, 2, 131, 131, 131, 131, } }, @@ -532,25 +532,25 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = 6, 4, 4, 4, 5, 4, 6, 5, 5, 6, 9, 6, 5, 6, 9, 11, 8, 6, 6, 8, 11, 12, 10, 10, - 11, 10, 10, 12, 15, 12, 12, 12, - 12, 12, 12, 15, 12, 14, 15, 15, - 15, 14, 12, 18, 18, 21, 21, 18, + 11, 10, 10, 12, 16, 12, 12, 12, + 12, 12, 12, 16, 12, 14, 14, 16, + 14, 14, 12, 18, 18, 21, 21, 18, 18, 26, 26, 26, 26, 26, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, }, { - 11, 16, 16, 11, 7, 12, 139, 4, + 11, 16, 16, 11, 7, 6, 139, 4, 16, 13, 13, 11, 8, 141, 139, 139, 16, 13, 13, 11, 141, 139, 137, 135, - 11, 11, 11, 12, 139, 4, 135, 133, + 11, 11, 11, 6, 139, 137, 135, 133, 7, 8, 141, 139, 4, 3, 133, 2, - 12, 141, 139, 4, 3, 133, 2, 2, + 6, 141, 139, 137, 3, 133, 2, 2, 139, 139, 137, 135, 133, 2, 2, 2, 4, 139, 135, 133, 2, 2, 2, 2, }, { - 7, 7, 7, 13, 12, 13, 26, 15, - 15, 26, 26, 21, 18, 21, 26, 32, + 7, 7, 7, 13, 12, 13, 26, 16, + 16, 26, 26, 21, 16, 21, 26, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, @@ -561,7 +561,7 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = { 9, 9, 5, 133, 133, 2, 2, 2, 9, 139, 4, 3, 2, 2, 2, 2, - 5, 4, 135, 2, 2, 2, 2, 2, + 5, 4, 4, 2, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 2, 2, 133, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -578,22 +578,22 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = 7, 6, 6, 8, 10, 8, 9, 9, 9, 9, 8, 10, 10, 12, 12, 12, 12, 12, 10, 12, 12, 13, 13, 12, - 12, 18, 18, 18, 18, 18, 21, 21, + 12, 16, 16, 16, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, }, { 16, 21, 21, 16, 11, 9, 8, 141, 21, 21, 21, 16, 13, 11, 8, 141, 21, 21, 21, 16, 11, 7, 139, 139, - 16, 16, 16, 9, 7, 139, 139, 135, - 11, 13, 11, 7, 139, 5, 135, 3, - 9, 11, 7, 139, 5, 135, 3, 3, - 8, 8, 139, 139, 135, 3, 3, 3, - 141, 141, 139, 135, 3, 3, 3, 3, + 16, 16, 16, 9, 7, 139, 139, 4, + 11, 13, 11, 7, 139, 5, 4, 3, + 9, 11, 7, 139, 5, 4, 3, 3, + 8, 8, 139, 139, 4, 3, 3, 3, + 141, 141, 139, 4, 3, 3, 3, 3, }, { - 4, 5, 5, 8, 7, 8, 15, 10, - 10, 15, 21, 14, 14, 14, 21, 21, + 4, 5, 5, 8, 7, 8, 14, 10, + 10, 14, 21, 14, 14, 14, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, @@ -602,10 +602,10 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = 21, 21, 21, 21, 21, 21, 21, 21, }, { - 16, 13, 8, 4, 3, 3, 3, 3, + 16, 13, 8, 137, 3, 3, 3, 3, 13, 9, 141, 137, 3, 3, 3, 3, 8, 141, 137, 3, 3, 3, 3, 3, - 4, 137, 3, 3, 3, 3, 3, 3, + 137, 137, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, @@ -636,23 +636,23 @@ static isx019_fpga_jpg_quality_t g_isx019_jpg_quality[] = }, { 3, 3, 3, 5, 4, 5, 9, 6, - 6, 9, 13, 11, 9, 11, 13, 15, - 14, 14, 14, 14, 15, 15, 12, 12, - 12, 12, 12, 15, 15, 12, 12, 12, - 12, 12, 12, 15, 12, 12, 12, 12, + 6, 9, 13, 11, 9, 11, 13, 14, + 14, 14, 14, 14, 14, 14, 12, 12, + 12, 12, 12, 14, 14, 12, 12, 12, + 12, 12, 12, 14, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, }, { - 21, 21, 13, 7, 5, 4, 4, 4, - 21, 16, 11, 12, 137, 139, 139, 139, + 21, 21, 13, 7, 5, 137, 137, 137, + 21, 16, 11, 6, 137, 139, 139, 139, 13, 11, 7, 137, 139, 139, 139, 139, - 7, 12, 137, 139, 139, 139, 139, 139, + 7, 6, 137, 139, 139, 139, 139, 139, 5, 137, 139, 139, 139, 139, 139, 139, - 4, 139, 139, 139, 139, 139, 139, 139, - 4, 139, 139, 139, 139, 139, 139, 139, - 4, 139, 139, 139, 139, 139, 139, 139, + 137, 139, 139, 139, 139, 139, 139, 139, + 137, 139, 139, 139, 139, 139, 139, 139, + 137, 139, 139, 139, 139, 139, 139, 139, } }, {