Skip to content

Commit 7ff5cee

Browse files
authored
Fix for #280
1 parent 74d0d0b commit 7ff5cee

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

appSpecific.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,23 @@ bool updateAppStatus(const char* variable, const char* value) {
101101

102102
// camera settings
103103
else if(!strcmp(variable, "xclkMhz")) xclkMhz = intVal;
104-
else if (s) {
105-
if (!strcmp(variable, "framesize")) {
106-
fsizePtr = intVal;
104+
else if (!strcmp(variable, "framesize")) {
105+
fsizePtr = intVal;
106+
if (s) {
107107
if (s->set_framesize(s, (framesize_t)fsizePtr) != ESP_OK) res = false;
108108
// update default FPS for this frame size
109109
if (playbackHandle != NULL) {
110110
setFPSlookup(fsizePtr);
111111
updateConfigVect("fps", String(FPS).c_str());
112112
}
113113
}
114-
else if (!strcmp(variable, "fps")) {
115-
FPS = intVal;
116-
if (playbackHandle != NULL) setFPS(intVal);
117-
}
118-
else if(!strcmp(variable, "quality")) res = s->set_quality(s, intVal);
114+
}
115+
else if (!strcmp(variable, "fps")) {
116+
FPS = intVal;
117+
if (playbackHandle != NULL) setFPS(FPS);
118+
}
119+
else if (s) {
120+
if (!strcmp(variable, "quality")) res = s->set_quality(s, intVal);
119121
else if(!strcmp(variable, "contrast")) res = s->set_contrast(s, intVal);
120122
else if(!strcmp(variable, "brightness")) res = s->set_brightness(s, intVal);
121123
else if(!strcmp(variable, "saturation")) res = s->set_saturation(s, intVal);

mjpeg2sd.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -643,9 +643,10 @@ static void startSDtasks() {
643643
// tasks to manage SD card operation
644644
xTaskCreate(&captureTask, "captureTask", 1024 * 4, NULL, 5, &captureHandle);
645645
xTaskCreate(&playbackTask, "playbackTask", 1024 * 4, NULL, 4, &playbackHandle);
646+
// set initial camera framesize and FPS from configs
646647
sensor_t * s = esp_camera_sensor_get();
647-
fsizePtr = s->status.framesize;
648-
setFPS(frameData[fsizePtr].defaultFPS); // initial frames per second
648+
s->set_framesize(s, (framesize_t)fsizePtr);
649+
setFPS(FPS);
649650
debugMemory("startSDtasks");
650651
}
651652

0 commit comments

Comments
 (0)