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

Swap to mp4 container

This commit is contained in:
SteveGilvarry 2014-11-09 18:15:43 +11:00
parent dd59a05165
commit 8d71d4de03
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_ffmpeg_camera.cpp
View File

@ -374,8 +374,8 @@ int FfmpegCamera::CaptureAndRecord( Image &image, bool recording, char* event_di
if(recording && !wasRecording){ if(recording && !wasRecording){
//Instanciate the video storage module //Instanciate the video storage module
char fileName[4096]; char fileName[4096];
snprintf(fileName, sizeof(fileName), "%s/event.mkv", event_directory);//no audio support for mp4?...ffmpeg is choking when writing the header probably some unsupported audio options for the stream doesn't like it when called from shell either using ffmpeg binary snprintf(fileName, sizeof(fileName), "%s/event.mp4", event_directory);//no audio support for mp4?...ffmpeg is choking when writing the header probably some unsupported audio options for the stream doesn't like it when called from shell either using ffmpeg binary
videoStore = new VideoStore((const char *)fileName, "matroska", mFormatContext->streams[mVideoStreamId],mAudioStreamId==-1?NULL:mFormatContext->streams[mAudioStreamId],startTime); videoStore = new VideoStore((const char *)fileName, "mp4", mFormatContext->streams[mVideoStreamId],mAudioStreamId==-1?NULL:mFormatContext->streams[mAudioStreamId],startTime);
wasRecording = true; wasRecording = true;
strcpy(oldDirectory, event_directory); strcpy(oldDirectory, event_directory);

4
web/skins/classic/views/event.php
View File

@ -137,10 +137,10 @@ if ( ZM_OPT_FFMPEG )
<div id="eventStream"> <div id="eventStream">
<div id="imageFeed"> <div id="imageFeed">
<?php <?php
if(file_exists(ZM_PATH_WEB."/events/".getEventPath($event)."/event.mkv")){ if(file_exists(ZM_PATH_WEB."/events/".getEventPath($event)."/event.mp4")){
?> ?>
<video id="vid1" width="100%" controls> <!-- <?php echo $event['Width']; ?>" height="<?php echo $event['Height']; ?>" controls> --> <video id="vid1" width="100%" controls> <!-- <?php echo $event['Width']; ?>" height="<?php echo $event['Height']; ?>" controls> -->
<source src="<?php echo "/zm/events/".getEventPath($event)."/event.mkv#t=".$fid/($event['Frames']/$event['Length'])?>" type="video/mp4"> <source src="<?php echo "/zm/events/".getEventPath($event)."/event.mp4#t=".$fid/($event['Frames']/$event['Length'])?>" type="video/mp4">
Your browser does not support the video tag. Your browser does not support the video tag.
</video> </video>
<button value="FF" onClick="fastForward();"/> <button value="FF" onClick="fastForward();"/>