ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add audio_frequency and audio_channels to shared mem and set them in PrimeCapture

pull/3186/head
Isaac Connor 2021-03-01 16:43:38 -05:00
parent a62d446f14
commit 9302c9506e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_monitor.cpp
View File

@ -1015,6 +1015,8 @@ bool Monitor::connect() {
shared_data->video_fifo_path[0] = 0; shared_data->video_fifo_path[0] = 0;
shared_data->audio_fifo_path[0] = 0; shared_data->audio_fifo_path[0] = 0;
shared_data->last_frame_score = 0; shared_data->last_frame_score = 0;
shared_data->audio_frequency = -1;
shared_data->audio_channels = -1;
trigger_data->size = sizeof(TriggerData); trigger_data->size = sizeof(TriggerData);
trigger_data->trigger_state = TriggerState::TRIGGER_CANCEL; trigger_data->trigger_state = TriggerState::TRIGGER_CANCEL;
trigger_data->trigger_score = 0; trigger_data->trigger_score = 0;
@ -2968,8 +2970,11 @@ int Monitor::PrimeCapture() {
packetqueue.addStreamId(video_stream_id); packetqueue.addStreamId(video_stream_id);
audio_stream_id = camera->get_AudioStreamId(); audio_stream_id = camera->get_AudioStreamId();
if ( audio_stream_id >= 0 ) if ( audio_stream_id >= 0 ) {
packetqueue.addStreamId(audio_stream_id); packetqueue.addStreamId(audio_stream_id);
shared_data->audio_frequency = camera->getFrequency();
shared_data->audio_channels = camera->getChannels();
}
Debug(2, "Video stream id is %d, audio is %d, minimum_packets to keep in buffer %d", Debug(2, "Video stream id is %d, audio is %d, minimum_packets to keep in buffer %d",
video_stream_id, audio_stream_id, pre_event_buffer_count); video_stream_id, audio_stream_id, pre_event_buffer_count);