Commit Graph

131 Commits

Author SHA1 Message Date
Isaac Connor 967368ce07 testing 2017-11-30 22:18:33 -05:00
Isaac Connor 4e26bde140 merge fix 2017-11-30 22:18:02 -05:00
Isaac Connor 4130c73943 Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread 2017-11-30 19:26:58 -05:00
Isaac Connor 4cc5838c66 whitespace & cleanup 2017-11-30 19:26:51 -05:00
Isaac Connor 84c901a01b don't write non-frames 2017-11-30 15:01:48 -05:00
Isaac Connor f2efc80f22 works? 2017-11-30 14:37:36 -05:00
Isaac Connor d73f9e8a73 wip, crashes 2017-11-28 11:11:41 -05:00
Isaac Connor 1e50df741f fix some memleaks 2017-11-28 09:50:09 -05:00
Isaac Connor d1886b5536 wip 2017-11-27 14:57:24 -05:00
Isaac Connor 99968dfa2a Merge branch 'storageareas' into zma_to_thread 2017-11-27 11:28:36 -05:00
Isaac Connor 03c9f88d55 fix build on trusty 2017-11-27 08:24:14 -05:00
Isaac Connor 7c491bf62e make compile on trusty 2017-11-26 18:06:12 -05:00
Isaac Connor 24a0d717c5 wip 2017-11-21 19:55:40 -05:00
Isaac Connor 74650ebc70 simplify Analysis 2017-11-20 11:48:56 -05:00
Isaac Connor 882563c06e rename frame to out_frame. Fix problem where we weren't copying from in_frame to out_frame 2017-11-17 18:19:37 -05:00
Isaac Connor cd596d49e3 fix local camera inputstream 2017-11-17 16:49:01 -05:00
Isaac Connor 6702b10dee remove redundant code and memory leaks 2017-11-17 15:37:26 -05:00
Isaac Connor ef5e296144 some fixes 2017-11-17 14:30:38 -05:00
Isaac Connor 7bff9a8083 fix to compile 2017-11-16 20:37:40 -05:00
APHW2 MFGENG 028aa9f161 fix segfault 2017-11-14 15:32:37 -08:00
APHW2 MFGENG 82b30ef9d0 Merge branch 'zma_to_thread' of http://github.com/connortechnology/ZoneMinder into zma_to_thread 2017-11-14 13:16:58 -08:00
APHW2 MFGENG 93c79efc72 test out more options 2017-11-14 13:16:56 -08:00
Isaac Connor 3129afa5d6 fixup decoding when recording from a non-ffmpeg suorce 2017-11-14 13:16:07 -08:00
APHW2 MFGENG 9563c534a9 play around with presets 2017-11-14 12:41:25 -08:00
Isaac Connor bac3fbfce9 fix compile on old ffmpeg 2017-11-14 08:55:00 -08:00
APHW2 MFGENG b839151cbc only set orientation if doing pssthrough 2017-11-14 08:53:29 -08:00
Isaac Connor 2b09658f88 fixes, set tune to lowlatency 2017-11-14 08:41:45 -05:00
Isaac Connor ecc68da0fd Merge branch 'zma_to_thread' into put_ffmpeg_into_event_wip 2017-11-14 02:39:58 -05:00
Isaac Connor 56bb2205d8 add mjpeg support 2017-11-14 01:59:15 -05:00
Isaac Connor 39b12057f2 add saveJPEGs to Events 2017-11-13 21:34:39 -05:00
APHW2 MFGENG 043e44d273 fix, must clear the frame 2017-11-13 14:24:28 -08:00
Isaac Connor ed72017684 add a mutex 2017-11-13 14:35:47 -05:00
Isaac Connor e325f5435c too much refactoring 2017-11-13 10:17:46 -05:00
Isaac Connor eee312a2d4 free contexts 2017-11-12 17:14:21 -05:00
Isaac Connor 75743d63b6 fixes 2017-11-12 17:02:11 -05:00
Isaac Connor ef0f01d498 more debug, try to get pts/dts right 2017-11-12 13:16:40 -05:00
Isaac Connor 0e7f475ce8 merge work from zma_to_thread, but not the zma_to_thread part 2017-11-12 11:42:34 -05:00
Isaac Connor 3dd8fe072d add omx 2017-11-10 18:59:58 -05:00
APHW2 MFGENG 626af8d2fb wip 2017-11-10 10:10:51 -08:00
Isaac Connor bb116cebd7 wip 2017-11-09 13:37:02 -08:00
APHW2 MFGENG d15d36f389 rework, compiles, won't open h264 2017-11-09 11:50:20 -08:00
APHW2 MFGENG 476ed4c9e0 add a quick test to load omx 2017-11-09 06:16:41 -08:00
Isaac Connor 5efaed0ef4 Merge branch 'storageareas' into ffmpeg_output 2017-11-08 17:22:07 -05:00
APHW2 MFGENG 4e080b8a36 Merge branch 'storageareas' into ffmpeg_output
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
	scripts/ZoneMinder/lib/ZoneMinder/Object.pm
2017-11-07 18:25:33 -08:00
APHW2 MFGENG e17bcb9178 updates for mast ffmpeg 2017-11-07 18:21:51 -08:00
Isaac Connor fdbd344d74 whitespace 2017-11-03 09:23:08 -04:00
Isaac Connor 0265a48a30 fix seg fault, fix pkt pts dts/duration. Stil wrong framerate 2017-10-26 10:12:56 -07:00
Isaac Connor b58c9d87c3 wip 2017-10-23 09:51:41 -04:00
Isaac Connor 8c1cfb28a5 use c-style casts because they work 2017-09-26 16:13:26 -04:00
Isaac Connor 94fd113b63 use c-style casts because they work 2017-09-26 16:12:20 -04:00
Isaac Connor e277456682 put parenthesis back in 2017-09-26 09:15:54 -04:00
Isaac Connor 1791d3d5b7 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-09-25 16:23:33 -04:00
Isaac Connor 74bb2da668 remove extra parenthesis 2017-09-25 16:23:15 -04:00
Isaac Connor 2a39cf2bcd split videostore opening out of the constructor so that we can test for failure 2017-09-25 15:28:14 -04:00
Isaac Connor 789de37d33 fix builds on older ffmpeg 2017-08-24 09:53:40 -04:00
Isaac Connor a81ff85fbb add ffmpeg decoding of a .mp4 to get the frames 2017-08-23 15:05:44 -04:00
Isaac Connor 732ebf6df4 shorted some variable names and correct spacing 2017-08-23 10:37:32 -04:00
Isaac Connor eb5cee7f3e use ifdef around uses of AV_CODEC_ID_H265 and fix google code style 2017-08-23 10:14:06 -04:00
Isaac Connor cf8560b648 fix duration if it's negative 2017-08-21 10:15:56 -04:00
Isaac Connor da5438a6ff detect hardware accel capabilities 2017-08-16 12:16:15 -04:00
Isaac Connor 9e2aa941fc rough in vaapi and qsv decoders. More debugging 2017-08-16 11:31:47 -04:00
Isaac Connor e24a2935d2 remove unneeded error message 2017-08-15 13:49:11 -04:00
Isaac Connor 38111e80a5 use AVERROR_EOF instead of EOF 2017-08-15 13:17:51 -04:00
Isaac Connor ae579c9649 potentially fix a crash when camera sends aac 2017-08-15 12:16:29 -04:00
Isaac Connor adab628af9 fix video speed, various other 2017-08-14 18:22:52 -04:00
Isaac Connor daee5b4450 experiment with no ffmpeg thread 2017-08-11 12:03:37 -04:00
Isaac Connor 536ccc0cec maybe fix memleak, maybe fix crash 2017-08-10 15:44:20 -04:00
Isaac Connor cc28af8ed2 rework things to always start the recording on a video keyframe. Also fix pts/dts of remaining audio frames 2017-08-09 12:50:46 -04:00
Isaac Connor b203e10c65 remove some newlines that shouldn't be there. Fix some logic when flushing audio encoder 2017-08-04 14:14:25 -04:00
Isaac Connor 00533fc624 potentially fix memleaks 2017-08-03 12:41:26 -04:00
Isaac Connor 3467b29a0c fix setting of packet stream index 2017-08-02 16:15:38 -04:00
Isaac Connor 259b7f7655 fix memleak 2017-07-31 15:49:27 -04:00
Isaac Connor 1849b1e69b fix code spacing, add codecpar dumping when failed to write frame 2017-07-05 13:09:00 -04:00
Isaac Connor 119f8fc86c Fix version checks to fix build on yaketty 2017-06-15 13:02:54 -04:00
Isaac Connor dd70eb3e5f more deprecation fixes 2017-06-13 17:06:50 -04:00
Isaac Connor 7d97267dd2 fix compile on old ffmpeg 2017-06-06 15:35:17 -04:00
Isaac Connor 7ae0b4a546 handle older versions of ffmpeg 2017-06-03 10:13:39 -04:00
Isaac Connor 0ac26277e3 debug, fix deprecations, fix audio 2017-06-02 16:52:52 -04:00
Isaac Connor a6421a9126 handle deprecations 2017-05-31 20:44:23 -04:00
Isaac Connor b1f8485969 Fix videostorage (#1885)
* merge relevant c bits to make h264 recording work

* h264 code requires libavresample and boost

* Need libavresample
2017-05-16 12:04:56 -04:00
Isaac Connor c859f7291c Feature h264 videostorage (#1882)
* Moved writing of configure options from Controller to Model.  Fixes #191.

* Initial commit for saving events as videos :)

* Add zm_video.cpp to autotools

* Add zm_video.h to autotools

* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h

* Fix serve memory leak

* Few minor code improvements

* Added the ability to override preset, tune, profile and few other improvements

* Correctly write SPS & PPS from x264 encoder headers

* Remove unnessecary SPS & PPS writing code

* Imported missing files from master to feature-h264-videostorage

* Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem)

* Updates to make gcc happy

* Add html5 video control to timeline and event to support mkv playback

* Add zm_videostore.cpp to CMakeLists.txt

* Remove Modern Branch for now

* Fix minor bug

* Option handled added in master, removing duplicate declaration

* Add CaptureandRecord from zm_camera.h

* Putting placeholder in for CaptureAndRecord function

* Removed duplicate code and brackets

* add digest auth file for cmake

Conflicts:
	src/CMakeLists.txt

* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"

This reverts commit d9bbcdf3a9.

* Add CaptureAndRecord to vlc, still need to make it record

* Resolve SegFault on videostore

* Swap to mp4 container

* mp4 changes

* spaces to tabs, hide video stuff if video writer is turned off

* Make timeline open event.mp4 instead of mkv

* Missed mkv in timeline.js

* Fix some issues from the merge conflict

* Resolve post merge build issues with braces

* Fix whitespace

* Update Jpeg and Video options for passthrough options

* Whitespace fix zm_camera.h

* Fix array mkssing comma

* Add support for Jpeg save options for h264 branch snapshot. Might remove altogether if snapshots not needed

* Update VideoStoreData memory size comment

* Change from config.use_mkv_storage to per monitor option VideoWriter from video branch

* Fix bracket issues post merge

* Clean up comments and add av_free_packet

* Convert from event_directory to event file as per Video branch

* Testing videojs for video playback

* Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors

* bring recent improvements in ffmpeg capture function into captureandrecord

* Remove pict from writeAudioFramePacket as not used

* Add translate options for h264 Storage options in Monitor and update en_gb file

* Cherry-Pick from iconnor - make it compile on ubuntu 15.04.  Which is libav 56.1.0

Conflicts:
	src/zm_ffmpeg.cpp
	src/zm_remote_camera_rtsp.cpp

Conflicts:
	distros/ubuntu1204/changelog

* Clean up videostore code and remove lots of unused code

* proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate

Conflicts:
	web/skins/classic/views/event.php

* removed redundant field in sql query

Conflicts:
	web/skins/classic/views/event.php

* local storage of video js plugin

* Beautify!

Make the code somewhat readable.

* added missing videojs.zoomrotate.js file

added missing videojs.zoomrotate.js file

* Typo

added missing "

* Added missing brackets

* fix to display thumbnails when only storing snapshot.jpg

* added control for video playback rate

Conflicts:
	web/skins/classic/views/event.php

* dynamically create jpegs from video file for viewing in browser

* fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)

* only expose monitor info which are being used in client

* fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8)

when libx264 is not installed

* better way of detecting showing image or video in timeline and event view

instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view

this also fixes loading videos in timeline view

* Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22).  Prefilters common packet issues. Add metadata title to generated video file

* Remove syslog.h

* fixed SaveJPEGs are not working

which is caused in errors introduced when merging with master

* Update README.md

* Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues

* Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here

* Fix PRId64 issue in travis, another try

* Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3

* Revert space removal around PRId64

* video branch ffmpeg 2.9 fixes

ffmpeg 2.9 patched removed SSE2 CPU

* Add FFMPEGInit back

* use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event

also fixed bug which prevented seeking in timeline video preview

* ffmpeg 3.0 API build failure fixes

* Update README.md

* merge all the commits from the messed up iconnor_video branch

* fix whitespace

* revert

* whitespace fixes

* spelling fix

* put back some text

* add these back

* fix spelling mistake

* Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines

* add a test and error message if the codec is not h264

* these have been removed in master

* add a view to check auth and just send the video

* add some comments, and dump filename and AVFormatContext on failure to write header

* add the toggle for RecordAudio so that the checkbox works to turn off Audio

* Must init videoStore in constuctor

* more debug and comments, return checking

* Fix dropped part of sql query.

* fix extra else and some whitespace

* Fix missing } from merge that was preventing building.

* fix tabs

* get rid of use of separator, just use \n

* Restore lost fixes for deprecation

* Why are these failing

* Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio

* Forgot that I was trying to solve case of stream is true and record_audio
is false.

* Pass swscale_ctx back in to getCachedContext or it will create new
context every frame and leak memory like a mofo.

* Add libx264-dev and libmp4v2-dev to build requires to save hassle of
ensuring they are installed before build.

* Merge my Rotation/Orientation work and fixes for bad h264 streams

* need arpa/inet for reverse lookups

* pull in the new byte range code for viewing videos

* Move our recording flag deeper into closeevent

* add braces and only call closeEvent if there is an event

* deprecate the z_frame_rate stuff which is deprecated in ffmpeg

* remark out some debugging

* fix for video on stream 1

* fix audio_stream to audio_st

* Ignore bad decodes

* fix problems with content-length causing viewing to not work in chrome/android

* change logic of sending file contents to handle an off by one and be more readable

* Some fixes pointed out by Maxim Romanov.  Also simply the loading of events to not join the Monitors table

* fix to sql for timeline

* added RecordAudio to sql in README

* Use sub queries instead of joins to fix errors when using new mysql defaults.

* fix sql queries

* Dockerfile to build feature-h264-videostorage

* Must cast codec

* add php-acpu as a dependency

* require php5-acpu

* fix typo

* remove extra /

* Add a line for out-of-tree builds to do api/lib/Cake/bootstrap.php

* delete merge conflict files

* delete merge conflict files
2017-05-15 22:02:48 -04:00