mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-03 21:52:04 -04:00
Code Issues Packages Projects Releases Wiki Activity
18,212 Commits 80 Branches 104 Tags
e5f9654e504028cf3eaeca6cbb300c3ce603c3fa
Commit Graph

51 Commits

Author SHA1 Message Date
Isaac Connor
b87d859f72 Set the packet's stream_index to the packetqueue stream. Rename get_ functions to get 2021-03-03 12:06:34 -05:00
Isaac Connor
64c601fc7b Must fix_deprecations on both values 2021-02-22 20:40:30 -05:00
Isaac Connor
730cd815d3 Add frame format to debug logging. Use fix_deprecated_fmt to fix when ctx->fmt is yuvj420p instead of yuv420p 2021-02-22 15:48:16 -05:00
Isaac Connor
e562888ed0 Fix crash when decoder returns 0 and when are using hwaccel 2021-02-19 21:03:10 -05:00
Isaac Connor
ed6fc9fca6 use av_frame_copy_props to copy frame members instead of doing it manually 2021-02-19 12:44:24 -05:00
Peter Keresztes Schmidt
938676b129 ffmpeg: exit dumpPacket early if debug logging is not enabled 2021-02-07 11:58:17 +01:00
Peter Keresztes Schmidt
0dbc39ee25 Cleanup and reorganize includes 
With this commit a unified structure for includes is introduced.
The general rules:
 * Only include what you need
 * Include wherever possible in the cpp and forward-declare in the header

 The includes are sorted in a local to global fashion. This means for the include order:
  0. If cpp file: The corresponding h file and an empty line
  1. Includes from the project sorted alphabetically
  2. System/library includes sorted alphabetically
  3. Conditional includes
 2021-02-04 18:02:01 +01:00
Isaac Connor
fdadacac6c set packet.size and data because av_init_packet don't do that 2021-01-31 21:31:33 -05:00
Isaac Connor
b93aab6a11 turn off hwtransfer direct to image. Too compliated for now with not enough benefit 2021-01-30 12:34:29 -05:00
Isaac Connor
4bd813d980 Don't try to transfer image when there is no image available 2021-01-28 10:22:14 -05:00
Isaac Connor
2baa22dc85 Fix case when hwaccel not compiled in 2021-01-28 10:16:58 -05:00
Isaac Connor
608afcbbd2 return bytes consumed by decode 2021-01-27 16:12:49 -05:00
Isaac Connor
5b7fc210fe Only use direct to rgb0 when image colours are 4 2021-01-12 14:12:09 -05:00
Isaac Connor
f7be54fe11 Add detecting target pixfmt and if rgb0 is supported, use it to do the transfer direct to the Image. 2021-01-11 13:46:50 -05:00
Isaac Connor
09264a52ff use zm_av_send_packet_receive_frame and fixup hwaccel support 2021-01-11 13:46:50 -05:00
Isaac Connor
b3ca0ac2d9 add missing and mix order of Packet initializers 2021-01-11 13:46:50 -05:00
Isaac Connor
284b9f963f Merge branch 'master' into zma_to_thread 2020-12-29 12:18:26 -05:00
Isaac Connor
3f2d088f8c Delete image if image_index == -1 2020-12-27 12:00:45 -05:00
Isaac Connor
aaf4b37439 spacing, don't need to set packet.size=0 2020-12-07 15:53:09 -05:00
Isaac Connor
a39a656373 Merge branch 'master' into zma_to_thread 2020-09-29 11:02:40 -04:00
Peter Keresztes Schmidt
8f980a1168 Convert NULL/0 to nullptr 
The 0 -> nullptr changes should definitely improve readability.
 2020-08-26 22:03:40 +02:00
Isaac Connor
448294f593 wip 2019-02-25 10:21:43 -05:00
Isaac Connor
28dafd5931 Merge branch 'storageareas' into zma_to_thread 2018-12-26 12:02:00 -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
cd3046abb3 Merge branch 'storageareas' into zma_to_thread 2018-04-14 11:03:08 -04: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
0865201e1e seems to work 2017-12-01 07:26:34 -05:00
Isaac Connor
f2efc80f22 works? 2017-11-30 14:37:36 -05:00
Isaac Connor
8e494ef431 Merge branch 'storageareas' into zma_to_thread 2017-11-23 08:40:49 -05:00
Isaac Connor
24a0d717c5 wip 2017-11-21 19:55:40 -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
ef5e296144 some fixes 2017-11-17 14:30:38 -05:00
Isaac Connor
159c0a7165 moer cppcheck fixes 2017-11-17 07:52:26 -05:00
Isaac Connor
3129afa5d6 fixup decoding when recording from a non-ffmpeg suorce 2017-11-14 13:16:07 -08: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
aee2b148f0 wip 2017-11-13 12:14:57 -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
3dafb5c225 don't delete image when destroying zmpacket 2017-11-11 09:25:13 -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
Isaac Connor
3be40bcc99 blah 2017-10-25 13:25:44 -07:00
Isaac Connor
0fbb473dd4 refactoring 2017-10-25 13:06:15 -07:00
Isaac Connor
b58c9d87c3 wip 2017-10-23 09:51:41 -04:00
Isaac Connor
b30e8953dd starting to rough in adding a frame to zmpacket 2017-09-04 16:36:34 -04:00
Isaac Connor
a81ff85fbb add ffmpeg decoding of a .mp4 to get the frames 2017-08-23 15:05:44 -04:00