ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable record support for non-h.264 camera's

This commit is contained in:
Chetan Chauhan 2013-09-25 13:58:53 +00:00
parent 26e75df32e
commit 9e7cd026eb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/zm_monitor.cpp
View File

@ -1609,8 +1609,8 @@ bool Monitor::Analyse()
} }
else if ( state == TAPE ) else if ( state == TAPE )
{ {
//Video Storage patch //Video Storage patch , Activate only for ffmpeg cameras
if(config.use_mkv_storage){ if(config.use_mkv_storage && camera->IsFfmpeg()){
//Info("ZMA: Setting to 10"); //Info("ZMA: Setting to 10");
video_store_data->recording = true; video_store_data->recording = true;
//if(video_store_data->frameNumber > lastVideoEventFrame){ //if(video_store_data->frameNumber > lastVideoEventFrame){
@ -2699,8 +2699,8 @@ int Monitor::Capture()
/* Capture a new next image */ /* Capture a new next image */
//TODO: Check if FFMPEG camera //Check if FFMPEG camera
if(config.use_mkv_storage){ if(config.use_mkv_storage && camera->IsFfmpeg()){
captureResult = camera->CaptureAndRecord(*(next_buffer.image), video_store_data->recording, video_store_data->event_directory); captureResult = camera->CaptureAndRecord(*(next_buffer.image), video_store_data->recording, video_store_data->event_directory);
}else{ }else{
captureResult = camera->Capture(*(next_buffer.image)); captureResult = camera->Capture(*(next_buffer.image));
@ -2713,8 +2713,8 @@ int Monitor::Capture()
} }
} else { } else {
//TODO: Check if FFMPEG camera //Check if FFMPEG camera
if(config.use_mkv_storage){ if(config.use_mkv_storage && camera->IsFfmpeg()){
//Warning("ZMC: Recording: %d", video_store_data->recording); //Warning("ZMC: Recording: %d", video_store_data->recording);
captureResult = camera->CaptureAndRecord(*capture_image, video_store_data->recording, video_store_data->event_directory); captureResult = camera->CaptureAndRecord(*capture_image, video_store_data->recording, video_store_data->event_directory);
}else{ }else{