Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ else()
)
pkg_search_module(gstreamer REQUIRED IMPORTED_TARGET gstreamer-1.0>=1.4)
pkg_search_module(gstreamer-app REQUIRED IMPORTED_TARGET gstreamer-app-1.0>=1.4)
pkg_search_module(gstnet REQUIRED IMPORTED_TARGET gstreamer-net-1.0>=1.4)
pkg_search_module(gio REQUIRED IMPORTED_TARGET gio-2.0)

add_executable(${PROJECT_NAME} ${SOURCE_FILES})

Expand All @@ -212,6 +214,8 @@ else()
${PNG_LIBRARIES}
PkgConfig::gstreamer
PkgConfig::gstreamer-app
PkgConfig::gstnet
PkgConfig::gio
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this also in the test build down below

)
endif()

Expand Down Expand Up @@ -257,7 +261,9 @@ if(BUILD_TESTS)
)
pkg_search_module(gstreamer REQUIRED IMPORTED_TARGET gstreamer-1.0>=1.4)
pkg_search_module(gstreamer-app REQUIRED IMPORTED_TARGET gstreamer-app-1.0>=1.4)
target_link_libraries(pixelpilot_tests PkgConfig::gstreamer PkgConfig::gstreamer-app)
pkg_search_module(gstnet REQUIRED IMPORTED_TARGET gstreamer-net-1.0>=1.4)
pkg_search_module(gio REQUIRED IMPORTED_TARGET gio-2.0)
target_link_libraries(pixelpilot_tests PkgConfig::gstreamer PkgConfig::gstreamer-app PkgConfig::gstnet PkgConfig::gio)

target_link_options(pixelpilot_tests
BEFORE PUBLIC -fsanitize=undefined PUBLIC -fsanitize=address
Expand Down
16 changes: 10 additions & 6 deletions src/dvr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,11 @@ void Dvr::loop() {
if (dvr_file != NULL) {
break;
}
start();
if (video_frm_width > 0 && video_frm_height > 0) {
init();
if (start() == 0) {
idr_request_record_start();
if (video_frm_width > 0 && video_frm_height > 0) {
init();
}
}
break;
}
Expand All @@ -153,9 +155,11 @@ void Dvr::loop() {
{
SPDLOG_DEBUG("got rpc TOGGLE");
if (dvr_file == NULL) {
start();
if (video_frm_width > 0 && video_frm_height > 0) {
init();
if (start() == 0) {
idr_request_record_start();
if (video_frm_width > 0 && video_frm_height > 0) {
init();
}
}
} else {
stop();
Expand Down
14 changes: 14 additions & 0 deletions src/gsmenu/gs_system.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include "../main.h"
#include "../gstrtpreceiver.h"
#include "gs_system.h"
#include "lvgl/lvgl.h"
#include "helper.h"
Expand All @@ -18,6 +19,7 @@ lv_obj_t * resolution;
lv_obj_t * rec_enabled;
lv_obj_t * rec_fps;
lv_obj_t * vsync_disabled;
lv_obj_t * gs_request_idr;
lv_obj_t * video_scale;

extern lv_obj_t * ap_fpv_ssid;
Expand Down Expand Up @@ -47,6 +49,8 @@ void gs_system_page_load_callback(lv_obj_t * page)
if (disable_vsync) lv_obj_add_state(lv_obj_get_child_by_type(vsync_disabled,0,&lv_switch_class), LV_STATE_CHECKED);
else lv_obj_clear_state(lv_obj_get_child_by_type(vsync_disabled,0,&lv_switch_class), LV_STATE_CHECKED);

if (idr_get_enabled()) lv_obj_add_state(lv_obj_get_child_by_type(gs_request_idr,0,&lv_switch_class), LV_STATE_CHECKED);
else lv_obj_clear_state(lv_obj_get_child_by_type(gs_request_idr,0,&lv_switch_class), LV_STATE_CHECKED);
}

void toggle_rec_enabled()
Expand Down Expand Up @@ -86,6 +90,14 @@ void disable_vsync_cb(lv_event_t *e) {
}
}

void gs_request_idr_cb(lv_event_t *e) {
lv_event_code_t event = lv_event_get_code(e);
if (event == LV_EVENT_VALUE_CHANGED) {
lv_obj_t *ta = lv_event_get_target(e);
idr_set_enabled(lv_obj_has_state(ta, LV_STATE_CHECKED));
}
}

void rec_fps_cb(lv_event_t *e) {
lv_event_code_t event = lv_event_get_code(e);
if (event == LV_EVENT_VALUE_CHANGED) {
Expand Down Expand Up @@ -146,6 +158,8 @@ void create_gs_system_menu(lv_obj_t * parent) {

vsync_disabled = create_switch(cont,LV_SYMBOL_SETTINGS,"Disable VSYNC","disable_vsync", NULL,false);
lv_obj_add_event_cb(lv_obj_get_child_by_type(vsync_disabled,0,&lv_switch_class), disable_vsync_cb, LV_EVENT_VALUE_CHANGED,NULL);
gs_request_idr = create_switch(cont,LV_SYMBOL_SETTINGS,"Request IDR","gs_request_idr", NULL,false);
lv_obj_add_event_cb(lv_obj_get_child_by_type(gs_request_idr,0,&lv_switch_class), gs_request_idr_cb, LV_EVENT_VALUE_CHANGED,NULL);

create_text(parent, NULL, "Recording", NULL, NULL, false, LV_MENU_ITEM_BUILDER_VARIANT_1);
section = lv_menu_section_create(parent);
Expand Down
Loading