Merge branch 'releases/0.6.5'

Author: Breakthrough

.github/workflows/build-windows.yml

@@ -30,7 +30,7 @@ jobs:
         python-version: ["3.13"]
 
     env:
-      ffmpeg-version: "7.0"
+      ffmpeg-version: "7.1"
       IMAGEIO_FFMPEG_EXE: ""
 
     steps:

README.md

@@ -11,7 +11,7 @@ Video Cut Detection and Analysis Tool
 
 ----------------------------------------------------------
 
-### Latest Release: v0.6.4 (June 10, 2024)
+### Latest Release: v0.6.5 (November 24, 2024)
 
 **Website**:  [scenedetect.com](https://www.scenedetect.com)
 

appveyor.yml

@@ -14,7 +14,7 @@ skip_non_tags: true
 
 environment:
   matrix:
-    - PYTHON: "C:\\Python39-x64"
+    - PYTHON: "C:\\Python313-x64"
   # Encrypted AdvancedInstaller License
   ai_license_secret:
     secure: MOkULlGPSi0C1Hg2PU1h2SZg/eyQnPQhRJ1XFlavfMKMOoX9hY4pSjpdgW3psSau
@@ -34,13 +34,14 @@ install:
   - echo * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
   - 'SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%'
   - python --version
-  - python -m pip install --upgrade pip
+  - python -m pip install --upgrade pip build wheel virtualenv setuptools
   - python -m pip install -r docs/requirements.txt
-  - python -m pip install --upgrade -r dist/requirements_windows.txt
+  - python -m pip install --upgrade -r dist/requirements_windows.txt --no-binary imageio-ffmpeg
   # Checkout build resources and third party software used for testing.
   - git checkout refs/remotes/origin/resources -- dist/
-  - appveyor DownloadFile https://github.com/GyanD/codexffmpeg/releases/download/6.0/ffmpeg-6.0-full_build.7z
-  - 7z e ffmpeg-6.0-full_build.7z -odist/ffmpeg ffmpeg.exe LICENSE -r
+  - appveyor DownloadFile https://github.com/GyanD/codexffmpeg/releases/download/7.1/ffmpeg-7.1-full_build.7z
+  - 7z e ffmpeg-7.1-full_build.7z -odist/ffmpeg ffmpeg.exe LICENSE -r
+  - 'SET IMAGEIO_FFMPEG_EXE=%APPVEYOR_BUILD_FOLDER%\\dist\\ffmpeg\\ffmpeg.exe'
 
   - echo * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
   - echo * *                          BUILDING WINDOWS EXE                           * *
@@ -54,7 +55,7 @@ install:
   - move dist\windows\README* dist\scenedetect\
   - move dist\windows\LICENSE* dist\scenedetect\thirdparty\
   - move scenedetect\_thirdparty\LICENSE* dist\scenedetect\thirdparty\
-  - move dist\ffmpeg\ffmpeg.exe dist\scenedetect\
+  - copy dist\ffmpeg\ffmpeg.exe dist\scenedetect\
   - move dist\ffmpeg\LICENSE dist\scenedetect\thirdparty\LICENSE-FFMPEG
   - cd dist/scenedetect
   - 7z a ../scenedetect-win64.zip *
@@ -69,7 +70,7 @@ install:
   - appveyor-tools\secure-file -decrypt license65.dat.enc -secret %ai_license_secret% -salt %ai_license_salt%
   - appveyor DownloadFile https://www.advancedinstaller.com/downloads/advinst.msi
   - msiexec /i advinst.msi /qn
-  - 'SET PATH=%PATH%;C:\\Program Files (x86)\\Caphyon\\Advanced Installer 21.8.1\\bin\\x86'
+  - 'SET PATH=%PATH%;C:\\Program Files (x86)\\Caphyon\\Advanced Installer 22.2\\bin\\x86'
   # License path must be absolute
   - AdvancedInstaller.com /RegisterOffline "%cd%\license65.dat"
   # Create MSI installer

dist/installer/PySceneDetect.aip

@@ -56,7 +56,7 @@
 
 # Used for module identification and when printing version & about info
 # (e.g. calling `scenedetect version` or `scenedetect about`).
-__version__ = "0.6.5-dev1"
+__version__ = "0.6.5"
 
 init_logger()
 logger = getLogger("pyscenedetect")

scenedetect/__init__.py

@@ -4,6 +4,42 @@ Releases
 
 ## PySceneDetect 0.6
 
+### PySceneDetect 0.6.5 (November 24, 2024)
+
+#### Release Notes
+
+This release brings crop support, performance improvements to save-images, lots of bugfixes, and improved compatibility with MoviePy 2.0+.
+
+#### Changelog
+
+ - [feature] Add ability to crop input video before processing [#302](https://github.com/Breakthrough/PySceneDetect/issues/302) [#449](https://github.com/Breakthrough/PySceneDetect/issues/449)
+     - [cli] Add `--crop` option to `scenedetect` command and config file to crop video frames before scene detection
+     - [api] Add `crop` property to `SceneManager` to crop video frames before scene detection
+ - [feature] Add ability to configure CSV separators for rows/columns in config file [#423](https://github.com/Breakthrough/PySceneDetect/issues/423)
+ - [feature] Add new `--show` flag to `export-html` command to launch browser after processing [#442](https://github.com/Breakthrough/PySceneDetect/issues/442)
+ - [improvement] Add new `threading` option to `save-images`/`save_images()` [#456](https://github.com/Breakthrough/PySceneDetect/issues/456)
+    - Enabled by default, offloads image encoding and disk IO to separate threads
+    - Improves performance by up to 50% in some cases
+ - [improvement] The `export-html` command now implicitly invokes `save-images` with default parameters
+    - The output of the `export-html` command will always use the result of the `save-images` command that *precedes* it
+ - [improvement] `save_to_csv` now works with paths from `pathlib`
+ - [api] The `save_to_csv` function now works correctly with paths from the `pathlib` module
+ - [api] Add `col_separator` and `row_separator` args to `write_scene_list` function in `scenedetect.scene_manager`
+ - [api] The MoviePy backend now works with MoviePy 2.0+
+ - [bugfix] Fix `SyntaxWarning` due to incorrect escaping [#400](https://github.com/Breakthrough/PySceneDetect/issues/400)
+ - [bugfix] Fix `ContentDetector` crash when using callbacks [#416](https://github.com/Breakthrough/PySceneDetect/issues/416) [#420](https://github.com/Breakthrough/PySceneDetect/issues/420)
+ - [bugfix] Fix `save-images`/`save_images()` not working correctly with UTF-8 paths [#450](https://github.com/Breakthrough/PySceneDetect/issues/450)
+ - [bugfix] Fix crash when using `save-images`/`save_images()` with OpenCV backend [#455](https://github.com/Breakthrough/PySceneDetect/issues/455)
+ - [bugfix] Fix new detectors not working with `default-detector` config option
+ - [general] Timecodes of the form `MM:SS[.nnn]` are now processed correctly [#443](https://github.com/Breakthrough/PySceneDetect/issues/443)
+ - [general] Updates to Windows distributions:
+    - The MoviePy backend is now included with Windows distributions
+    - Python 3.9 -> Python 3.13
+    - PyAV 10 -> 13.1.0
+    - OpenCV 4.10.0.82 -> 4.10.0.84
+    - Ffmpeg 6.0 -> 7.1
+
+
 ### 0.6.4 (June 10, 2024)
 
 #### Release Notes
@@ -581,28 +617,4 @@ Both the Windows installer and portable distributions now include signed executa
 Development
 ==========================================================
 
-## PySceneDetect 0.6.5 (TBD)
-
- - [bugfix] Fix `SyntaxWarning` due to incorrect escaping [#400](https://github.com/Breakthrough/PySceneDetect/issues/400)
- - [bugfix] Fix `ContentDetector` crash when using callbacks [#416](https://github.com/Breakthrough/PySceneDetect/issues/416) [#420](https://github.com/Breakthrough/PySceneDetect/issues/420)
- - [feature] Add ability to configure CSV separators for rows/columns in config file [#423](https://github.com/Breakthrough/PySceneDetect/issues/423)
- - [feature] Add new `--show` flag to `export-html` command to launch browser after processing [#442](https://github.com/Breakthrough/PySceneDetect/issues/442)
- - [general] Timecodes of the form `MM:SS[.nnn]` are now processed correctly [#443](https://github.com/Breakthrough/PySceneDetect/issues/443)
- - [bugfix] Fix `save-images`/`save_images()` not working correctly with UTF-8 paths [#450](https://github.com/Breakthrough/PySceneDetect/issues/450)
- - [improvement] Add new `threading` option to `save-images`/`save_images()` [#456](https://github.com/Breakthrough/PySceneDetect/issues/456)
-    - Enabled by default, offloads image encoding and disk IO to separate threads
-    - Improves performance by up to 50% in some cases
- - [bugfix] Fix crash when using `save-images`/`save_images()` with OpenCV backend [#455](https://github.com/Breakthrough/PySceneDetect/issues/455)
- - [bugfix] Fix new detectors not working with `default-detector` config option
- - [improvement] The `export-html` command now implicitly invokes `save-images` with default parameters
-    - The output of the `export-html` command will always use the result of the `save-images` command that *precedes* it
- - [general] Updates to Windows distributions:
-    - The MoviePy backend is now included with Windows distributions
-    - Bundled Python interpreter is now Python 3.13
-    - Updated PyAV 10 -> 13.1.0 and OpenCV 4.10.0.82 -> 4.10.0.84
- - [improvement] `save_to_csv` now works with paths from `pathlib`
- - [api] The `save_to_csv` function now works correctly with paths from the `pathlib` module
- - [api] Add `col_separator` and `row_separator` args to `write_scene_list` function in `scenedetect.scene_manager`
- - [feature] Add ability to crop input video before processing [#302](https://github.com/Breakthrough/PySceneDetect/issues/302) [#449](https://github.com/Breakthrough/PySceneDetect/issues/449)
-     - [cli] Add `--crop` option to `scenedetect` command and config file to crop video frames before scene detection
-     - [api] Add `crop` property to `SceneManager` to crop video frames before scene detection
+## PySceneDetect 0.6.6 (TBD)

website/pages/changelog.md

@@ -20,10 +20,10 @@ PySceneDetect is available via `pip` as [the `scenedetect` package](https://pypi
 ## Windows Build (64-bit Only) &nbsp; <span class="wy-text-neutral"><span class="fa fa-windows"></span></span>
 
 <div class="important">
-<h3 class="wy-text-neutral"><span class="fa fa-forward wy-text-info"></span> Latest Release: <b class="wy-text-neutral">v0.6.4</b></h3>
-<h4 class="wy-text-neutral"><span class="fa fa-calendar wy-text-info"></span>&nbsp; Release Date:&nbsp; <b>June 10, 2024</b></h4>
-<a href="https://github.com/Breakthrough/PySceneDetect/releases/download/v0.6.4-release/PySceneDetect-0.6.4-win64.msi" class="btn btn-info" style="margin-bottom:8px;" role="button"><span class="fa fa-download"></span>&nbsp; <b>Installer</b>&nbsp;&nbsp;(recommended)</a> &nbsp;&nbsp;&nbsp;&nbsp;
-<a href="https://github.com/Breakthrough/PySceneDetect/releases/download/v0.6.4-release/PySceneDetect-0.6.4-win64-portable.zip" class="btn btn-info" style="margin-bottom:8px;" role="button"><span class="fa fa-download"></span>&nbsp; <b>Portable .zip</b></a> &nbsp;&nbsp;&nbsp;&nbsp;
+<h3 class="wy-text-neutral"><span class="fa fa-forward wy-text-info"></span> Latest Release: <b class="wy-text-neutral">v0.6.5</b></h3>
+<h4 class="wy-text-neutral"><span class="fa fa-calendar wy-text-info"></span>&nbsp; Release Date:&nbsp; <b>November 24, 2024</b></h4>
+<a href="https://github.com/Breakthrough/PySceneDetect/releases/download/v0.6.5-release/PySceneDetect-0.6.5-win64.msi" class="btn btn-info" style="margin-bottom:8px;" role="button"><span class="fa fa-download"></span>&nbsp; <b>Installer</b>&nbsp;&nbsp;(recommended)</a> &nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://github.com/Breakthrough/PySceneDetect/releases/download/v0.6.5-release/PySceneDetect-0.6.5-win64-portable.zip" class="btn btn-info" style="margin-bottom:8px;" role="button"><span class="fa fa-download"></span>&nbsp; <b>Portable .zip</b></a> &nbsp;&nbsp;&nbsp;&nbsp;
 <a href="../cli/" class="btn btn-success" style="margin-bottom:8px;" role="button"><span class="fa fa-book"></span>&nbsp; <b>Getting Started</b></a>
 </div>
 

website/pages/download.md

@@ -2,7 +2,7 @@
 <img alt="PySceneDetect" src="img/pyscenedetect_logo_small.png" />
 
 <div class="important">
-<h3 class="wy-text-neutral"><span class="fa fa-info-circle wy-text-info"></span>&nbsp; Latest Release: <b>v0.6.4</b> (June 10, 2024)</h3>
+<h3 class="wy-text-neutral"><span class="fa fa-info-circle wy-text-info"></span>&nbsp; Latest Release: <b>v0.6.5</b> (November 24, 2024)</h3>
 <a href="download/" class="btn btn-success" style="margin-bottom:8px;" role="button"><span class="fa fa-download"></span>&nbsp; <b>Download</b></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="changelog/" class="btn btn-info" style="margin-bottom:8px;" role="button"><span class="fa fa-reorder"></span>&nbsp; <b>Changelog</b></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="docs/latest/" class="btn btn-warning" style="margin-bottom:8px;" role="button"><span class="fa fa-gear"></span>&nbsp; <b>Documentation</b></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="cli/" class="btn btn-danger" style="margin-bottom:8px;" role="button"><span class="fa fa-book"></span>&nbsp; <b>Getting Started</b></a>
 <br/>
 See the changelog for the latest release notes and known issues.