nam/esp32-camera-driver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into ov3660-support

Browse Source
This commit is contained in:
me-no-dev
2019-03-10 15:30:15 +01:00
parent ab9fe91133 113629b1cf
commit 9fd0b54fa4
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
driver/camera.c
View File

@@ -238,9 +238,7 @@ static esp_err_t camera_fb_init(size_t count)
}
memset(_fb2, 0, sizeof(camera_fb_int_t));
_fb2->size = s_state->fb_size;
if(s_state->config.pixel_format == PIXFORMAT_JPEG) {
_fb2->buf = (uint8_t*) calloc(_fb2->size, 1);
}
_fb2->buf = (uint8_t*) calloc(_fb2->size, 1);
if(!_fb2->buf) {
ESP_LOGI(TAG, "Allocating %d KB frame buffer in PSRAM", s_state->fb_size/1024);
_fb2->buf = (uint8_t*) heap_caps_calloc(_fb2->size, 1, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);