Skip to content

Commit 089d8bd

Browse files
authored
Merge pull request #388 from dpw13/fix/onvif-detection-params
Remove ONVIF motion recording (not ONVIF motion *detection*)
2 parents 037fee4 + 878d3f3 commit 089d8bd

40 files changed

Lines changed: 86 additions & 3987 deletions

.github/workflows/integration-test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ jobs:
8383
test_db_query_builder \
8484
test_logger_json \
8585
test_batch_delete_progress \
86-
test_db_motion_config \
8786
test_db_recordings_sync \
8887
test_httpd_utils \
8988
test_zone_filter \
@@ -99,7 +98,7 @@ jobs:
9998
run: |
10099
cd build
101100
ctest --output-on-failure -V \
102-
-R "test_storage_pressure$|test_storage_pressure_extended|test_detection_result_structures|test_storage_retention_sqlite|test_config|test_logger|test_strings|test_memory|test_request_response|test_shutdown_coordinator|test_detection_config|test_detection_model_motion|test_db_streams|test_db_recordings_extended|test_db_detections|test_db_zones|test_db_events|test_db_auth|test_db_transactions|test_db_maintenance|test_db_query_builder|test_logger_json|test_batch_delete_progress|test_db_motion_config|test_db_recordings_sync|test_httpd_utils|test_zone_filter|test_onvif_soap_fault|test_stream_manager|test_stream_state|test_packet_buffer|test_timestamp_manager"
101+
-R "test_storage_pressure$|test_storage_pressure_extended|test_detection_result_structures|test_storage_retention_sqlite|test_config|test_logger|test_strings|test_memory|test_request_response|test_shutdown_coordinator|test_detection_config|test_detection_model_motion|test_db_streams|test_db_recordings_extended|test_db_detections|test_db_zones|test_db_events|test_db_auth|test_db_transactions|test_db_maintenance|test_db_query_builder|test_logger_json|test_batch_delete_progress|test_db_recordings_sync|test_httpd_utils|test_zone_filter|test_onvif_soap_fault|test_stream_manager|test_stream_state|test_packet_buffer|test_timestamp_manager"
103102
104103
- name: Generate coverage report
105104
if: always()

.github/workflows/sanitizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
cd build
5353
echo "Running tests with ASan + UBSan enabled..."
5454
ctest --output-on-failure -V \
55-
-R "test_config|test_logger|test_strings|test_memory|test_request_response|test_shutdown_coordinator|test_detection_config|test_detection_model_motion|test_db_streams|test_db_recordings_extended|test_db_detections|test_db_zones|test_db_events|test_db_auth|test_db_transactions|test_db_maintenance|test_db_query_builder|test_logger_json|test_batch_delete_progress|test_db_motion_config|test_db_recordings_sync|test_httpd_utils|test_zone_filter|test_stream_manager|test_stream_state|test_packet_buffer|test_timestamp_manager|test_storage_pressure$|test_storage_pressure_extended|test_detection_result_structures|test_storage_retention_sqlite"
55+
-R "test_config|test_logger|test_strings|test_memory|test_request_response|test_shutdown_coordinator|test_detection_config|test_detection_model_motion|test_db_streams|test_db_recordings_extended|test_db_detections|test_db_zones|test_db_events|test_db_auth|test_db_transactions|test_db_maintenance|test_db_query_builder|test_logger_json|test_batch_delete_progress|test_db_recordings_sync|test_httpd_utils|test_zone_filter|test_stream_manager|test_stream_state|test_packet_buffer|test_timestamp_manager|test_storage_pressure$|test_storage_pressure_extended|test_detection_result_structures|test_storage_retention_sqlite"
5656
5757
- name: Smoke test - start and stop service
5858
run: |

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ LightNVR provides a lightweight yet powerful solution for recording and managing
2323
#### 🎯 Smart Detection & Recording
2424
- **Detection Zones**: Visual polygon-based zone editor for targeted object detection - define multiple zones per camera with custom class filters and confidence thresholds
2525
- **light-object-detect Integration**: Seamless integration with [light-object-detect](https://github.com/opensensor/light-object-detect) API for ONNX/TFLite-based object detection with zone filtering
26-
- **ONVIF Motion Recording**: Automated recording triggered by ONVIF motion detection events
26+
- **ONVIF Motion Events**: Automated recording triggered by ONVIF motion detection events
2727
- **Object Detection**: Optional SOD integration for motion and object detection (supports both RealNet and CNN models)
2828

2929
#### 📺 Streaming & Playback
@@ -451,7 +451,6 @@ The configuration files will persist across container restarts and updates.
451451
- [go2rtc Integration](docs/GO2RTC_INTEGRATION.md)
452452
- [MQTT Integration](docs/MQTT_INTEGRATION.md)
453453
- [ONVIF Detection](docs/ONVIF_DETECTION.md)
454-
- [ONVIF Motion Recording](docs/ONVIF_MOTION_RECORDING.md)
455454
- [Motion Buffer System](docs/MOTION_BUFFER.md)
456455
- [SOD Integration](docs/SOD_INTEGRATION.md)
457456

docs/API.md

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -716,30 +716,6 @@ Returns available detection models.
716716

717717
### Motion Recording
718718

719-
#### Get Motion Config
720-
721-
```
722-
GET /api/motion/config/{stream_name}
723-
```
724-
725-
Returns motion recording configuration for a stream.
726-
727-
#### Set Motion Config
728-
729-
```
730-
POST /api/motion/config/{stream_name}
731-
```
732-
733-
Creates or updates motion recording configuration.
734-
735-
#### Delete Motion Config
736-
737-
```
738-
DELETE /api/motion/config/{stream_name}
739-
```
740-
741-
Deletes motion recording configuration for a stream.
742-
743719
#### Test Motion Event
744720

745721
```
@@ -748,46 +724,6 @@ POST /api/motion/test/{stream_name}
748724

749725
Triggers a test motion event for debugging.
750726

751-
#### Get Motion Stats
752-
753-
```
754-
GET /api/motion/stats/{stream_name}
755-
```
756-
757-
Returns motion recording statistics.
758-
759-
#### List Motion Recordings
760-
761-
```
762-
GET /api/motion/recordings/{stream_name}
763-
```
764-
765-
Returns motion-triggered recordings.
766-
767-
#### Delete Motion Recording
768-
769-
```
770-
DELETE /api/motion/recordings/{recording_id}
771-
```
772-
773-
Deletes a motion recording.
774-
775-
#### Motion Cleanup
776-
777-
```
778-
POST /api/motion/cleanup
779-
```
780-
781-
Triggers cleanup of expired motion recordings.
782-
783-
#### Motion Storage
784-
785-
```
786-
GET /api/motion/storage
787-
```
788-
789-
Returns motion recording storage usage.
790-
791727
### HLS Streaming
792728

793729
#### Direct HLS Request

docs/ARCHITECTURE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ Key files:
168168
- `src/video/sod_integration.c`: SOD library integration
169169
- `src/video/sod_realnet.c`: SOD RealNet face detection
170170
- `src/video/onvif_detection.c`: ONVIF event-based detection
171-
- `src/video/onvif_detection_integration.c`: ONVIF detection integration layer
172171
- `src/video/onvif_motion_recording.c`: ONVIF motion-triggered recording
173172
- `src/video/motion_detection.c`: Motion detection processing
174173
- `src/video/motion_storage_manager.c`: Motion recording storage management

docs/MOTION_BUFFER.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,20 +175,6 @@ The system handles overlapping motion events intelligently:
175175

176176
## Configuration
177177

178-
### Per-Stream Configuration
179-
180-
```c
181-
motion_recording_config_t config = {
182-
.enabled = true,
183-
.pre_buffer_seconds = 10, // 10 seconds of pre-event video
184-
.post_buffer_seconds = 15, // 15 seconds after motion ends
185-
.max_file_duration = 600, // Max 10 minutes per file
186-
.retention_days = 30
187-
};
188-
189-
enable_motion_recording("camera_name", &config);
190-
```
191-
192178
### Buffer Modes
193179

194180
- **BUFFER_MODE_MEMORY**: Store packets in RAM (default)

docs/ONVIF_DETECTION.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ Some cameras don't require authentication for ONVIF events. For these cameras, y
6666
The ONVIF detection feature is implemented in the following files:
6767

6868
- `include/video/onvif_detection.h`: Header file for ONVIF detection
69-
- `include/video/onvif_detection_integration.h`: Header file for ONVIF detection integration
7069
- `src/video/onvif_detection.c`: Implementation of ONVIF detection
71-
- `src/video/onvif_detection_integration.c`: Integration with the detection system
7270

7371
The implementation uses the following components:
7472

0 commit comments

Comments
 (0)