Commit Graph

  • d309ead6a9
    Merge 6acbe4c5d0 into 501d6a6d01 Zach Bloomquist 2025-01-20 07:08:20 -0600
  • bc060e1711
    Merge bc228b8240 into 501d6a6d01 IgorA100 2025-01-20 15:46:59 +0800
  • 501d6a6d01
    Merge pull request #4206 from un-clouded/master master Isaac Connor 2025-01-19 14:30:09 -0500
  • 8dae3e2135
    Merge 0159850a40 into 8e5a9e462c IgorA100 2025-01-19 16:31:15 +0300
  • 400ecb98c2 Small fix for Apache virtual server configuration instructions. Neil 2025-01-19 17:21:31 +1300
  • 9d9b9e6c83 Merge branch 'master' into ni_quadra ni_quadra Isaac Connor 2025-01-16 17:30:18 -0500
  • 53b169d72c Merge branch 'master' into speed_ai speed_ai Isaac Connor 2025-01-16 17:30:06 -0500
  • 8e5a9e462c Don't loop forever ignoring sigterm on initial connect Isaac Connor 2025-01-16 17:29:10 -0500
  • b0b3612968 Add speed ai Isaac Connor 2025-01-16 17:28:40 -0500
  • d114c69156 Rough in speed ai code. Currently crashes on model load Isaac Connor 2025-01-16 17:28:23 -0500
  • 909cafecff Quick add untether includes Isaac Connor 2025-01-16 17:27:42 -0500
  • c5fe0edd59
    Merge 9daa54bb45 into b5ee966d90 VikingGer 2025-01-15 13:19:33 +0100
  • 65559bbfb7 Merge branch 'ni_quadra' of github.com:ZoneMinder/zoneminder into ni_quadra Isaac Connor 2025-01-14 17:14:46 -0500
  • ea831c0f83 populate video_codec Isaac Connor 2025-01-14 17:14:28 -0500
  • 25cc664147 Add more info to ESC debug Isaac Connor 2025-01-14 16:49:17 -0500
  • 687648bf1e Cleanup constructor and add the new codec_data stuff to try out multiple codecs Isaac Connor 2025-01-14 16:49:00 -0500
  • 7ed95395e8 Move codec_data from videostore to ffmpeg. Add dec_codecs and add a function to return relevant codec_data and setup hw_ctx. Isaac Connor 2025-01-14 16:48:27 -0500
  • 0159850a40
    Merge branch 'ZoneMinder:master' into patch-474778 IgorA100 2025-01-10 20:29:30 +0300
  • 779a578373
    Fix: Calculation "Scale" (montage_class.php) IgorA100 2025-01-10 20:28:13 +0300
  • d7d823a1ed Fix setting video_last-pts from in_frame which may not exist and hence cause a crash Isaac Connor 2025-01-10 09:46:49 -0500
  • 5c6c7a60bd Add EncoderHWAccel fields Isaac Connor 2025-01-09 17:19:20 -0500
  • 5669ae74ea We have to use video_in_stream->time_base as codeccontext->time_base is not used in decoding Isaac Connor 2025-01-09 14:03:19 -0500
  • 407f868203 Bump version to pick up update sql Isaac Connor 2025-01-09 12:05:35 -0500
  • 243588a7d1 Remove conversion to mono, force codec_tag to 0. Remove ifdef QUADRA as it isn't working Isaac Connor 2025-01-09 09:15:31 -0500
  • 463be4addd Use QUADRA instead of AV_HWDEVICE_TYPE_NI_QUADRA which is an enum. Isaac Connor 2025-01-08 19:22:10 -0500
  • a1f9be017b Use QUADRA instead of AV_HWDEVICE_TYPE_NI_QUADRA which is an enum. Implement non WallClockTimestamps for encoding Isaac Connor 2025-01-08 19:21:50 -0500
  • 41ec9f7d96 WallClockTImestamps now works for encode as well Isaac Connor 2025-01-08 19:21:10 -0500
  • b8ed82afb9 Need to receive as many packets as possible after sending frame. Can't just do 1/1 Isaac Connor 2025-01-08 17:22:37 -0500
  • d0c3041477 Add hwaccelname and hwacceldevice Isaac Connor 2025-01-08 16:55:34 -0500
  • 19975d7085 Add quadra encoders, decoders and add hwaccelname and hwacceldevice Isaac Connor 2025-01-08 16:55:18 -0500
  • 3ee1b986bf Add hwdevice_default to CodecData struct and set QUADRA's to -1. Rework Encoding to handle as many packets as the encoder will return. Isaac Connor 2025-01-08 16:47:06 -0500
  • 893fdf201b Fix when zm_send_packet_receive_frame returns 0 Isaac Connor 2025-01-08 16:45:05 -0500
  • 69641c975f Add EncoderHWACCelName and Device Isaac Connor 2025-01-08 16:43:58 -0500
  • dce6ab9770 Add ifdef around AV_HWDEVICE_TYPE_NI_QUADRA quadra Isaac Connor 2025-01-08 13:47:22 -0500
  • 32c50df8f8 Add Help for audio recording to streamline label Isaac Connor 2025-01-08 12:35:08 -0500
  • 4682e874e9 Add QUADRA codecs Isaac Connor 2025-01-08 12:34:38 -0500
  • f9db732a8e Add QUADRA fix fmt Isaac Connor 2025-01-08 12:34:24 -0500
  • f813fab364 Change codec_id of av1 to what is in ffmpeg 6.1 Isaac Connor 2025-01-08 12:07:54 -0500
  • 936dbc4246 Show output container Isaac Connor 2025-01-08 12:07:29 -0500
  • 4f6f8872a7 Dump audio codecpars set codec_tag to 0 for aac Isaac Connor 2025-01-08 12:07:17 -0500
  • 37f334dc58 Remove code that converts to mono Isaac Connor 2025-01-07 17:33:58 -0500
  • d8b7727b0f WHen encoding use AV_TIME_BASE_Q for output stream as well. Always calculate duration from pts instead of from potential input frame duration. Isaac Connor 2025-01-07 17:31:51 -0500
  • 15db7168ca
    Merge ed65892efe into 31b9fd0c5e rajeevrk 2025-01-08 06:47:54 +0530
  • ed65892efe Adding support for NetInt Hardware Encoders, built on the ni_quadra hwaccel support in NetInt patched FFMpeg 5/6/7 - RajeevRK Rajeev RK 2025-01-08 06:44:08 +0530
  • 3307c9ea90 Don't log cant edit Isaac Connor 2025-01-07 16:55:02 -0500
  • 31b9fd0c5e Fix build for new av_packet_guard code release-1.36 Isaac Connor 2025-01-06 11:58:38 -0500
  • 511e7f3c1e
    Merge pull request #4202 from XLNC-Enterprises/release-1.36 Isaac Connor 2025-01-06 11:48:01 -0500
  • 723a50f77e Adding Support for the AV1 Codec via the FFMpeg libAOM Software encoder -- RajeevRK Rajeev RK 2025-01-06 20:19:19 +0530
  • b5ee966d90 Add some -> and test for ControlDevice so as not to give a warning Isaac Connor 2025-01-05 13:12:40 -0500
  • 833cc41b0b If self{address} exists, use that instead of concatenating host + port Isaac Connor 2025-01-05 13:11:19 -0500
  • 0cfd860856 Handle Users no longer having MOnitorIds column Isaac Connor 2025-01-04 12:51:53 -0500
  • 7c180887c7 Add missing } Isaac Connor 2025-01-04 12:12:57 -0500
  • bc228b8240
    Avoid overlapping the central button block with the zoom buttons (skin.css) IgorA100 2025-01-04 11:23:28 +0300
  • 067362382a Fixed funding.json Isaac Connor 2025-01-03 14:45:53 -0500
  • 2187c9b3f0 Add funding-manifest-urls Isaac Connor 2025-01-03 14:00:57 -0500
  • ef3055e638 Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2025-01-03 13:54:47 -0500
  • 5105629fe5 Add funding.json Isaac Connor 2025-01-03 13:54:39 -0500
  • 780e6062be
    Use "grid-area" for buttons block zoom (montage.css) IgorA100 2025-01-03 13:57:15 +0300
  • d6c4de7b84
    Use "grid-area" for buttons block zoom (event.css) IgorA100 2025-01-03 13:37:19 +0300
  • 0bb06461ba
    Changed the method for controlling the visibility of the "#button_zoom" button bar (event.js) IgorA100 2025-01-03 13:32:55 +0300
  • 3cdbae20cf
    Changed the method for controlling the visibility of the "#button_zoom" button bar (watch.js) IgorA100 2025-01-03 13:23:20 +0300
  • 08e9fa6548
    Update watch.css IgorA100 2025-01-03 00:30:48 +0300
  • 2940cbe090
    For ".block-button-center" change position from absolute to relative (skin.css) IgorA100 2025-01-03 00:24:13 +0300
  • c3fa5bc15a Fix adding rotation when not needed. Isaac Connor 2025-01-02 14:15:01 -0500
  • 4e70c36cfa Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2025-01-01 12:05:50 -0500
  • 4b34efa1cd DO like we do in 1.36 and only update the db monitor_status table every 10 seconds instead of every second. Isaac Connor 2025-01-01 12:05:43 -0500
  • 6acbe4c5d0
    docs: remove bountysource from README Zach Bloomquist 2024-12-30 23:15:39 -0500
  • b5cfea6df6
    Merge a97dbc03c3 into 24ad12fa22 sletteland 2024-12-30 23:14:27 -0500
  • 603c6d0f59
    Merge 88227105b8 into 24ad12fa22 Steve Gilvarry 2024-12-30 23:14:27 -0500
  • 08ab99e897
    Merge branch 'ZoneMinder:master' into patch-474778 IgorA100 2024-12-22 21:57:54 +0300
  • 4a23cfe6f6 If ffmpeg can't figure out the sie of the stream, default to what we entered in monitor. Isaac Connor 2024-12-21 18:13:30 -0500
  • 24ad12fa22 Don't include empty fields in filter query string, just to shorten it a bit Isaac Connor 2024-12-21 14:34:35 -0500
  • 27dfdd1b4e Upgrade Amcrest to use parent's code Isaac Connor 2024-12-21 14:32:32 -0500
  • 7b59995a48 Use parent's credentials in HikVision Isaac Connor 2024-12-21 14:32:08 -0500
  • 72330a5234 Fix api url getting monitors for map Isaac Connor 2024-12-18 13:44:20 -0500
  • 13c987182a Add explicit path to sphinx conf.py as required by readthedocs Isaac Connor 2024-12-18 12:27:38 -0500
  • 0bbaedc5d9 Add explicit path to sphinx conf.py as required by readthedocs Isaac Connor 2024-12-18 12:27:38 -0500
  • fcd0d03c6e Add docs/requirements from master Isaac Connor 2024-12-17 18:50:44 -0500
  • dae071bd10 Don't show deleted monitors in zones Isaac Connor 2024-12-17 16:09:42 -0500
  • 6ec0b5a1dc Fix SQL query when a user is limited to a subset of monitors and tries to view all zones. Isaac Connor 2024-12-17 15:58:23 -0500
  • 2a22d22882
    Merge branch 'ZoneMinder:master' into patch-474778 IgorA100 2024-12-17 23:47:17 +0300
  • 9fd8882f39 Handle auto in width Isaac Connor 2024-12-17 15:22:05 -0500
  • 4f01627e33 Fix duplicated px on width and height because we now have px in the dropdown options Isaac Connor 2024-12-17 12:39:51 -0500
  • ce66cc02c3 Add readthedocs.yaml from master will hopefully fix docs building which has been broken for some time. Isaac Connor 2024-12-17 10:08:01 -0500
  • 4dcab65d51 document what scaleEl is Isaac Connor 2024-12-16 10:57:16 -0500
  • 3aaba3154b Move changeScale down as the video area has to have height before we can call scaleToFit Isaac Connor 2024-12-16 10:56:43 -0500
  • 7b6d4952bd Revert "Don't allow a scale of 0. Default to 100. Call changeStreamQuality after changeScale so that we always pass the right value. Prevents Errors in logs about bogus scale value" Isaac Connor 2024-12-16 10:45:30 -0500
  • b71d6e4569
    Merge pull request #4198 from sertonix/gzip-n Isaac Connor 2024-12-16 10:38:49 -0500
  • 16e02e11cd Strip build time from compressed manpages Sertonix 2024-12-16 16:03:58 +0100
  • 72fcd3eb9e Handle when scale is 0 in getImageSrc Isaac Connor 2024-12-14 13:53:56 -0500
  • 55b99e19ab Use a redirect on homeview to fix having query params added on Isaac Connor 2024-12-13 12:19:30 -0500
  • 4c4ae608e0 Fix quoting on default for Importance Isaac Connor 2024-12-13 11:40:39 -0500
  • c2b64364a6 Fix width and height not persisting. Check for valid value instead of validInt because we have px on the end. Clear cookie if not valid Isaac Connor 2024-12-12 13:05:22 -0500
  • 36f45fdbc7 Wait until we get a successful shm connect before trying to set StartupTime. fixes crash Isaac Connor 2024-12-12 12:21:32 -0500
  • 3fbb8bdaca Fix ffm=>video_out_stream Isaac Connor 2024-12-10 15:45:39 -0500
  • 1922eaacdf Fix lack of support for rotation in ffmpeg 5.1 onwards Isaac Connor 2024-12-10 15:20:15 -0500
  • df0438d487 Fix lack of support for rotation in ffmpeg 5.1 onwards Isaac Connor 2024-12-10 15:20:15 -0500
  • 9700ecf773 Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2024-12-09 19:10:47 -0500
  • 223dc4b70f Don't allow a scale of 0. Default to 100. Call changeStreamQuality after changeScale so that we always pass the right value. Prevents Errors in logs about bogus scale value Isaac Connor 2024-12-09 19:08:35 -0500
  • 0d34e4647a Log scale in debug about status command Isaac Connor 2024-12-09 19:07:51 -0500