support for 12-bit images

xbarin02 · Nov 29, 2020 · 8eb7f81 · 8eb7f81
1 parent dfb5273
commit 8eb7f81
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/imgproc.c b/imgproc.c
@@ -256,6 +256,9 @@ int frame_to_rgb(struct frame *frame)
 {
 	assert(frame != NULL);
 
+	int shift = 1 << (frame->precision - 1);
+	int denom = 1 << frame->precision;
+
 	switch (frame->components) {
 		case 4:
 			for (size_t y = 0; y < frame->Y; ++y) {
@@ -265,13 +268,13 @@ int frame_to_rgb(struct frame *frame)
 					float Cr = frame->data[y * frame->size_x * 4 + x * 4 + 2];
 					float K  = frame->data[y * frame->size_x * 4 + x * 4 + 3];
 
-					float C = Y_ + 1.402 * (Cr - 128);
-					float M = Y_ - 0.34414 * (Cb - 128) - 0.71414 * (Cr - 128);
-					float Y = Y_ + 1.772 * (Cb - 128);
+					float C = Y_ + 1.402 * (Cr - shift);
+					float M = Y_ - 0.34414 * (Cb - shift) - 0.71414 * (Cr - shift);
+					float Y = Y_ + 1.772 * (Cb - shift);
 
-					float R = K - (C * K) / 256;
-					float G = K - (M * K) / 256;
-					float B = K - (Y * K) / 256;
+					float R = K - (C * K) / denom;
+					float G = K - (M * K) / denom;
+					float B = K - (Y * K) / denom;
 
 					frame->data[y * frame->size_x * 4 + x * 4 + 0] = R;
 					frame->data[y * frame->size_x * 4 + x * 4 + 1] = G;
@@ -287,9 +290,9 @@ int frame_to_rgb(struct frame *frame)
 					float Cb = frame->data[y * frame->size_x * 3 + x * 3 + 1];
 					float Cr = frame->data[y * frame->size_x * 3 + x * 3 + 2];
 
-					float R = Y + 1.402 * (Cr - 128);
-					float G = Y - 0.34414 * (Cb - 128) - 0.71414 * (Cr - 128);
-					float B = Y + 1.772 * (Cb - 128);
+					float R = Y + 1.402 * (Cr - shift);
+					float G = Y - 0.34414 * (Cb - shift) - 0.71414 * (Cr - shift);
+					float B = Y + 1.772 * (Cb - shift);
 
 					frame->data[y * frame->size_x * 3 + x * 3 + 0] = R;
 					frame->data[y * frame->size_x * 3 + x * 3 + 1] = G;
@@ -324,7 +327,7 @@ int dump_frame(struct frame *frame)
 			for (size_t y = 0; y < frame->Y; ++y) {
 				for (size_t x = 0; x < frame->X; ++x) {
 					for (int c = 0; c < 3; ++c) {
-						fprintf(stream, "%i ", clamp(0, (int)roundf(frame->data[y * frame->size_x * 4 + x * 4 + c]), 255));
+						fprintf(stream, "%i ", clamp(0, (int)roundf(frame->data[y * frame->size_x * 4 + x * 4 + c]), (int)maxval));
 					}
 				}
 				fprintf(stream, "\n");
@@ -340,7 +343,7 @@ int dump_frame(struct frame *frame)
 			for (size_t y = 0; y < frame->Y; ++y) {
 				for (size_t x = 0; x < frame->X; ++x) {
 					for (int c = 0; c < 3; ++c) {
-						fprintf(stream, "%i ", clamp(0, (int)roundf(frame->data[y * frame->size_x * 3 + x * 3 + c]), 255));
+						fprintf(stream, "%i ", clamp(0, (int)roundf(frame->data[y * frame->size_x * 3 + x * 3 + c]), (int)maxval));
 					}
 				}
 				fprintf(stream, "\n");
@@ -355,7 +358,7 @@ int dump_frame(struct frame *frame)
 			fprintf(stream, "P2\n%zu %zu\n%zu\n", (size_t)frame->X, (size_t)frame->Y, maxval);
 			for (size_t y = 0; y < frame->Y; ++y) {
 				for (size_t x = 0; x < frame->X; ++x) {
-					fprintf(stream, "%i ", clamp(0, (int)roundf(frame->data[y * frame->size_x + x]), 255));
+					fprintf(stream, "%i ", clamp(0, (int)roundf(frame->data[y * frame->size_x + x]), (int)maxval));
 				}
 				fprintf(stream, "\n");
 			}

diff --git a/parser.c b/parser.c
@@ -111,7 +111,6 @@ int parse_frame_header(FILE *stream, struct context *context)
 	err = read_byte(stream, &Nf);
 	RETURN_IF(err);
 
-	assert(P == 8);
 	assert(X > 0);
 	assert(Nf > 0);
 
@@ -461,6 +460,14 @@ int parse_format(FILE *stream, struct context *context)
 				err = parse_frame_header(stream, context);
 				RETURN_IF(err);
 				break;
+			/* SOF1 Extended sequential DCT */
+			case 0xffc1:
+				printf("SOF1\n");
+				err = read_length(stream, &len);
+				RETURN_IF(err);
+				err = parse_frame_header(stream, context);
+				RETURN_IF(err);
+				break;
 			/* SOF2 Progressive DCT */
 			case 0xffc2:
 				printf("SOF2\n");