blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

fix(jpeg_decoder): Fix jpeg decoder get picture information

Browse Source
This commit is contained in:
C.S.M 2024-11-19 11:46:55 +08:00
parent fe3bb073f9
commit 65ce617a8d
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
components/esp_driver_jpeg/jpeg_decode.c
View File

@ -145,6 +145,7 @@ esp_err_t jpeg_decoder_get_info(const uint8_t *in_buf, uint32_t inbuf_len, jpeg_
uint8_t thischar = 0; uint8_t thischar = 0;
uint8_t lastchar = 0; uint8_t lastchar = 0;
uint8_t hivi = 0; uint8_t hivi = 0;
uint8_t nf = 0;
while (header_info->buffer_left) { while (header_info->buffer_left) {
lastchar = thischar; lastchar = thischar;
@ -157,7 +158,8 @@ esp_err_t jpeg_decoder_get_info(const uint8_t *in_buf, uint32_t inbuf_len, jpeg_
height = jpeg_get_bytes(header_info, 2); height = jpeg_get_bytes(header_info, 2);
width = jpeg_get_bytes(header_info, 2); width = jpeg_get_bytes(header_info, 2);
jpeg_get_bytes(header_info, 1); nf = jpeg_get_bytes(header_info, 1);
jpeg_get_bytes(header_info, 1); jpeg_get_bytes(header_info, 1);
hivi = jpeg_get_bytes(header_info, 1); hivi = jpeg_get_bytes(header_info, 1);
break; break;
@ -172,19 +174,24 @@ esp_err_t jpeg_decoder_get_info(const uint8_t *in_buf, uint32_t inbuf_len, jpeg_
picture_info->height = height; picture_info->height = height;
picture_info->width = width; picture_info->width = width;
switch (hivi) { if (nf == 3) {
case 0x11: switch (hivi) {
picture_info->sample_method = JPEG_DOWN_SAMPLING_YUV444; case 0x11:
break; picture_info->sample_method = JPEG_DOWN_SAMPLING_YUV444;
case 0x21: break;
picture_info->sample_method = JPEG_DOWN_SAMPLING_YUV422; case 0x21:
break; picture_info->sample_method = JPEG_DOWN_SAMPLING_YUV422;
case 0x22: break;
picture_info->sample_method = JPEG_DOWN_SAMPLING_YUV420; case 0x22:
break; picture_info->sample_method = JPEG_DOWN_SAMPLING_YUV420;
default: break;
ESP_LOGE(TAG, "Sampling factor cannot be recognized"); default:
return ESP_ERR_INVALID_STATE; ESP_LOGE(TAG, "Sampling factor cannot be recognized");
return ESP_ERR_INVALID_STATE;
}
}
if (nf == 1) {
picture_info->sample_method = JPEG_DOWN_SAMPLING_GRAY;
} }
free(header_info); free(header_info);