Isaac Connor
|
b53e4aa803
|
fix segfault
|
2019-04-03 14:51:10 -04:00 |
|
Isaac Connor
|
b6f35db4de
|
put back codec closing in destructure, testing with bionic
|
2019-04-03 14:25:18 -04:00 |
Isaac Connor
|
aece64049f
|
We cannot avcodec_open2 a context that has been duped. This code currently works without crashes and leaks on ffmpeg 2.8
|
2019-04-03 13:23:00 -04:00 |
|
Isaac Connor
|
bd412fa9ca
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-04-02 14:25:50 -04:00 |
|
Isaac Connor
|
cd28559c03
|
when encoding audio, pts and dts have to come from the encoder.
|
2019-04-02 14:08:46 -04:00 |
|
Isaac Connor
|
87cb716500
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-04-01 14:02:46 -04:00 |
|
Isaac Connor
|
cb33318c4a
|
fix invalid memory access due to incorrect opening/closing/copying of contexts
|
2019-04-01 14:02:39 -04:00 |
|
Isaac Connor
|
ed5a448a1d
|
Correct pts on audio frame before sending it to the encoder so that when we flush the encoder the resulting packets have the right pts.
|
2019-04-01 11:13:14 -04:00 |
|
Isaac Connor
|
e6547953b0
|
fix segfault using old ffmpeg
|
2019-03-28 09:24:32 -04:00 |
|
Isaac Connor
|
5615cafc19
|
fix compile on old ffmpeg
|
2019-03-21 17:50:17 -04:00 |
|
Isaac Connor
|
c159dd8d10
|
cleanup and fix code that assumed H264
|
2019-03-21 14:13:56 -04:00 |
|
Isaac Connor
|
fcb9f76561
|
Fix out_frame->pts being nothing because we freed in_frame
|
2019-03-20 16:06:55 -04:00 |
|
Isaac Connor
|
3931baa2b6
|
fix build on old ffmpeg
|
2019-03-20 10:21:43 -04:00 |
|
Isaac Connor
|
a437c407a7
|
fix video_out_ctx init so that ffmpeg doesn't complain
|
2019-03-19 13:17:26 -04:00 |
|
Isaac Connor
|
9b713a489d
|
fix sleep time by using a comparison between the frame display time and the distance between now and when we started playing.
handle infinite fps
|
2019-03-06 14:50:36 -05:00 |
|
Isaac Connor
|
6c8eac1ac8
|
Merge branch 'storageareas' into h265
|
2019-03-06 11:10:01 -05:00 |
|
Isaac Connor
|
73ae3f49ed
|
Merge branch 'master' into storageareas
|
2019-03-05 11:35:55 -05:00 |
|
Isaac Connor
|
b1838de701
|
test turning off frag_custom
|
2019-03-05 11:35:16 -05:00 |
|
Isaac Connor
|
4b3519c84a
|
Merge branch 'storageareas' into zma_to_thread
|
2019-02-18 17:04:42 -05:00 |
|
Isaac Connor
|
5029d7214a
|
Merge branch 'master' into storageareas
|
2019-02-18 17:00:45 -05:00 |
|
Isaac Connor
|
7d6286d517
|
Merge branch 'storageareas' into zma_to_thread
|
2019-02-18 16:23:17 -05:00 |
|
Isaac Connor
|
9996b3e718
|
Merge branch 'master' into break_videostorage
|
2019-02-17 12:10:32 -05:00 |
|
Isaac Connor
|
9656032906
|
spacing
|
2019-02-15 17:52:51 -05:00 |
|
Isaac Connor
|
96906734b8
|
add an audio_fifo to handle input audio < 1024 samples per frame
|
2019-02-15 17:26:30 -05:00 |
|
Isaac Connor
|
4e463c9354
|
use swr_convert_frame instead of swr_convert
|
2019-02-14 17:48:58 -05:00 |
|
Isaac Connor
|
281775cc80
|
try setting out_frame pts from in_frame
|
2019-02-14 15:54:47 -05:00 |
|
Isaac Connor
|
9e07d5cd17
|
try setting out_frame pts from in_frame
|
2019-02-14 15:54:00 -05:00 |
|
Isaac Connor
|
a9e2011727
|
Merge branch 'storageareas' into zma_to_thread
|
2019-02-13 12:24:38 -05:00 |
|
Isaac Connor
|
060751602b
|
fix missing ;
|
2019-02-13 10:34:09 -05:00 |
|
Isaac Connor
|
d1b3b23c09
|
Merge branch 'master' into storageareas
|
2019-02-13 09:42:03 -05:00 |
|
Isaac Connor
|
0bfaf87d27
|
Mostly code style and whitespacing. However, I do setup more values in the output frame when doing audio resampling
|
2019-02-12 16:40:27 -05:00 |
|
Isaac Connor
|
3177764db4
|
spacing
|
2019-02-12 14:20:33 -05:00 |
|
Isaac Connor
|
ed6b22ac06
|
spacing
|
2019-02-11 16:29:36 -05:00 |
|
Isaac Connor
|
a39b92154c
|
wip
|
2019-01-17 08:49:48 -05:00 |
|
Isaac Connor
|
87d1390fed
|
Merge branch 'storageareas' into h265
|
2019-01-16 15:20:17 -05:00 |
|
Isaac Connor
|
5f6bcec4ca
|
Use start_pts instead of start_dts when calculating output pkt.dts. Because start_dts is often lower than start_pts, we can get into a situation where we calculate a dts that is > pts.
|
2019-01-15 11:35:37 -05:00 |
|
Isaac Connor
|
f726666f54
|
Merge branch 'master' into h265
|
2019-01-14 12:36:11 -05:00 |
|
Isaac Connor
|
9f8be169f9
|
set channels and sample rate in output frame. Use new zm_dump_frame()
|
2019-01-14 10:48:29 -05:00 |
|
Isaac Connor
|
c4c6d5b642
|
switch to swr_convert_frame as a test
|
2019-01-05 10:15:22 -05:00 |
|
Isaac Connor
|
28dafd5931
|
Merge branch 'storageareas' into zma_to_thread
|
2018-12-26 12:02:00 -05:00 |
|
Isaac Connor
|
55e0d82f20
|
spacing
|
2018-12-24 11:30:22 -05:00 |
Andrew Bauer
|
6eb7892fc7
|
Merge pull request #2357 from connortechnology/libswresample
Implement libswresample support as an alternative to libavresample, w…
|
2018-12-20 16:44:06 -06:00 |
|
Isaac Connor
|
7a8beffdcc
|
Merge branch 'master' into storageareas
|
2018-12-20 15:10:52 -05:00 |
|
Isaac Connor
|
48865f124b
|
cap AAC bitrate at 96000 to prevent the aac encoder from complaining
|
2018-12-20 15:10:04 -05:00 |
|
Isaac Connor
|
6ee72aa2d9
|
Implement libswresample support as an alternative to libavresample, which is deprecated
|
2018-12-20 14:06:56 -05:00 |
|
Isaac Connor
|
62ce3c1f65
|
Implement libswresample in place of libavresample which is deprecated
|
2018-12-20 13:38:11 -05:00 |
|
Isaac Connor
|
bc5f8d0d8d
|
rework pts/dts of audio stream. Spacing. Fix crash
|
2018-12-04 18:23:08 -05:00 |
|
Isaac Connor
|
d837b42836
|
fix ffmpeg warnings. We have to copy parameters from the context to the stream AFTER we open the codec
|
2018-12-03 10:33:53 -05:00 |
|
Isaac Connor
|
36f7e9abb1
|
Merge h265 and begin work on swsresample
|
2018-11-21 09:46:14 -05:00 |
|
Isaac Connor
|
b16cd7ec84
|
Merge branch 'h265' into zma_to_thread
|
2018-11-20 12:38:17 -05:00 |
|
Isaac Connor
|
b291c06035
|
Working zms h265 playing.
|
2018-11-19 16:45:56 -05:00 |
|
Isaac Connor
|
e24a308481
|
Merge branch 'master' into h265
|
2018-11-14 17:15:37 -05:00 |
|
Isaac Connor
|
bca2b30518
|
Add a test for channel layout and correct it if not set
|
2018-10-24 13:45:33 -04:00 |
|
Isaac Connor
|
a8329465fb
|
Merge branch 'master' into h265
|
2018-10-22 10:30:01 -04:00 |
|
Isaac Connor
|
5ab1126260
|
Merge branch 'storageareas' into zma_to_thread
|
2018-10-20 17:31:14 -04:00 |
|
Isaac Connor
|
51f0e7e5c8
|
Add a default timebase if the codec timebase is invalid. Also fix crash when we can't open the .mp4
|
2018-09-26 15:34:01 -04:00 |
|
Isaac Connor
|
45056c3602
|
fix deprecation warning
|
2018-09-23 16:51:54 -04:00 |
|
Isaac Connor
|
0ec391354c
|
Merge branch 'fix_zms_from_mp4' into h265
|
2018-09-13 16:18:28 -04:00 |
|
Isaac Connor
|
0bb672b86b
|
dick around reverting ffmpeg 3.4 deprecations to try to get fps correct
|
2018-09-10 17:10:39 -04:00 |
|
Isaac Connor
|
bf1fbd169c
|
return uninformative debug statement
|
2018-09-10 15:12:19 -04:00 |
|
Isaac Connor
|
5eec7e00c5
|
Merge branch 'master' into storageareas
|
2018-09-09 14:09:52 -04:00 |
|
Isaac Connor
|
a296b2b777
|
fix crash when savind audio on ffmpeg 2.8
|
2018-09-09 14:01:03 -04:00 |
|
Isaac Connor
|
e4c87ce256
|
Merge branch 'master' into storageareas
|
2018-09-09 11:36:52 -04:00 |
|
Isaac Connor
|
d945e2ba54
|
Fix context allocation on ffmpeg 2.8. Fixes #41 on connorTechnology fork.
|
2018-09-09 11:34:12 -04:00 |
|
Isaac Connor
|
5b1f8fbd71
|
initialize more vars in constructor
|
2018-08-13 10:01:39 -04:00 |
|
Isaac Connor
|
979b31ffc3
|
Merge branch 'storageareas' into zma_to_thread
|
2018-08-11 10:08:30 -04:00 |
|
Isaac Connor
|
84db1be31d
|
add version test to get rid of deprecation warning for refcounted_frames
|
2018-05-26 13:01:51 -04:00 |
|
Isaac Connor
|
f6139d33ed
|
Merge branch 'storageareas' into zma_to_thread
|
2018-05-05 12:25:11 -04:00 |
|
Isaac Connor
|
cae2c9e237
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-30 15:11:32 -04:00 |
|
Isaac Connor
|
8a80cf686b
|
Merge branch 'master' into storageareas
|
2018-04-26 21:58:34 -04:00 |
|
Isaac Connor
|
371f5dbc00
|
a zero duration will lead to a non-monotonic non-incrementing pts, so we have to use 1 instead.
|
2018-04-25 09:37:04 -04:00 |
|
Isaac Connor
|
f04bccceb2
|
handle out of order pts better
|
2018-04-25 04:59:08 -04:00 |
Andy Bauer
|
678503b992
|
fix ftbs on el7
|
2018-04-24 12:16:19 -05:00 |
|
Isaac Connor
|
cad5696b8e
|
it's flush_codecs
|
2018-04-14 17:06:02 -04:00 |
|
Isaac Connor
|
c7deb91319
|
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
|
2018-04-14 14:58:25 -04:00 |
|
Isaac Connor
|
cd3046abb3
|
Merge branch 'storageareas' into zma_to_thread
|
2018-04-14 11:03:08 -04:00 |
|
Isaac Connor
|
8518278476
|
coverity scan fixes/cleanups
|
2018-04-12 11:29:35 -04:00 |
|
Isaac Connor
|
2291816f4e
|
fix memleak
|
2018-03-10 10:12:12 -05:00 |
|
Isaac Connor
|
a419906361
|
Merge branch 'storageareas' into zma_to_thread
|
2018-03-09 09:03:19 -05:00 |
Isaac Connor
|
9af6dc02bc
|
better debug of packet pts/dts/duration
|
2018-03-01 19:22:47 -08:00 |
|
Isaac Connor
|
c443168389
|
split out codec and encoder, allowing one to specify which encoder to use
|
2018-02-28 07:17:16 -08:00 |
Isaac Connor
|
84b42ef4d7
|
workarouns for omx
|
2018-02-22 11:43:04 -05:00 |
|
Isaac Connor
|
65f3a9b916
|
try crf instead of preset ultrafast
|
2018-02-22 09:34:50 -05:00 |
|
Isaac Connor
|
6942aaed15
|
whitespace
|
2018-01-31 14:36:01 -05:00 |
|
Isaac Connor
|
215660a817
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_packetqueue.cpp
src/zm_videostore.cpp
src/zm_videostore.h
web/includes/Event.php
web/skins/classic/views/events.php
|
2018-01-24 11:06:19 -05:00 |
Isaac
|
66fd02a29e
|
Use dumpPacket
|
2018-01-23 18:15:29 +01:00 |
|
Isaac
|
414930cb90
|
simplify logic, improve debugging
|
2018-01-22 03:26:33 +01:00 |
|
Isaac Connor
|
8a85694b1c
|
spacing
|
2018-01-10 14:19:47 -05:00 |
|
Isaac Connor
|
36ef0f5011
|
Merge branch 'storageareas' into zma_to_thread
|
2018-01-05 10:06:18 -05:00 |
|
Isaac Connor
|
2ec25a20ec
|
Don't crash if we fail to open the video output stream
|
2018-01-04 10:07:51 -05:00 |
|
Isaac Connor
|
0ea6fd9807
|
Merge branch 'storageareas' into zma_to_thread
|
2017-12-19 14:06:58 -05:00 |
|
Isaac Connor
|
887235c746
|
move dumpPacket to zm_ffmpeg
|
2017-12-19 09:59:04 -05:00 |
|
Isaac Connor
|
7e9d740343
|
add npeg1 & 2 support and fix the first keyframe being ignored thing
|
2017-12-16 17:08:21 -05:00 |
|
Isaac Connor
|
49214a8902
|
Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread
|
2017-12-15 10:47:53 -05:00 |
|
Isaac Connor
|
ebcd63f280
|
fixes to compile using avconv
|
2017-12-15 10:47:44 -05:00 |
|
Isaac Connor
|
212cd7e6c4
|
tidy ups
|
2017-12-15 10:46:43 -05:00 |
|
Isaac Connor
|
4e32a002e6
|
Fix timestamps on passthrough video.
|
2017-12-14 15:56:22 -05:00 |
|
Isaac Connor
|
a0532cd84a
|
fix merge
|
2017-12-12 15:30:47 -05:00 |
|
Isaac Connor
|
bcdadc67bf
|
Merge branch 'storageareas' into zma_to_thread
|
2017-12-12 15:29:19 -05:00 |
|
Isaac Connor
|
40e4d909c3
|
turn Fatal into Error
|
2017-12-12 12:41:11 -05:00 |
|
Isaac Connor
|
31189bdb11
|
make an error not fatal and check return to quiet coverity
|
2017-12-12 12:38:30 -05:00 |
|
Isaac Connor
|
af37eeeeed
|
fix int64 = int*int multiply
|
2017-12-08 15:17:45 -05:00 |
|
Isaac Connor
|
011c7e1540
|
revert to /1000000 tb
|
2017-12-08 14:22:38 -05:00 |
|
Isaac Connor
|
aff08358f4
|
more debug
|
2017-12-08 13:46:02 -05:00 |
|
Isaac Connor
|
d5b927c986
|
use xh264rgb is available
|
2017-12-08 10:38:16 -05:00 |
|
Isaac Connor
|
2a3683c072
|
add some more debug
|
2017-12-07 09:27:28 -05:00 |
APHW2 MFGENG
|
0cfc42b9fd
|
some cleanups/fixes
|
2017-12-05 13:16:52 -08:00 |
|
Isaac Connor
|
61dd84de82
|
move most of the codec init out of the constructor into open so that we can fail gracefully
|
2017-12-04 18:06:42 -05:00 |
|
Isaac Connor
|
4d73ce4109
|
rework locking to have a per-packet mutex
|
2017-12-03 11:09:01 -05:00 |
|
Isaac Connor
|
b1019267d8
|
try moving codec selection up above ctx allocation so that it allocates a priv_data
|
2017-12-02 08:12:04 -05:00 |
|
APHW2 MFGENG
|
4a9c31a15d
|
wip
|
2017-12-01 15:42:19 -08:00 |
|
Isaac Connor
|
b87e459125
|
still corrupting memory
|
2017-12-01 14:48:30 -05:00 |
|
Isaac Connor
|
2e3fda488e
|
more debug
|
2017-12-01 14:33:51 -05:00 |
|
Isaac Connor
|
6e17bfefdd
|
fix printouts on 32bit
|
2017-12-01 10:30:58 -05:00 |
|
Isaac Connor
|
0865201e1e
|
seems to work
|
2017-12-01 07:26:34 -05:00 |
|
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 |