Skip to content

Commit ec12353

Browse files
committed
[api] Remove deprecated video_manager module
1 parent 44ce9fa commit ec12353

File tree

14 files changed

+11
-930
lines changed

14 files changed

+11
-930
lines changed

scenedetect/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
from scenedetect.frame_timecode import FrameTimecode
3636
from scenedetect.video_stream import VideoStream, VideoOpenFailure
3737
from scenedetect.video_splitter import split_video_ffmpeg, split_video_mkvmerge
38-
from scenedetect.scene_detector import SceneDetector
38+
from scenedetect.detector import SceneDetector
3939
from scenedetect.detectors import (
4040
ContentDetector,
4141
AdaptiveDetector,
@@ -52,7 +52,6 @@
5252
)
5353
from scenedetect.stats_manager import StatsManager, StatsFileCorrupt
5454
from scenedetect.scene_manager import SceneManager, save_images, SceneList, CutList, Interpolation
55-
from scenedetect.video_manager import VideoManager # [DEPRECATED] DO NOT USE.
5655

5756
# Used for module identification and when printing version & about info
5857
# (e.g. calling `scenedetect version` or `scenedetect about`).

scenedetect/_cli/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525

2626
from platformdirs import user_config_dir
2727

28+
from scenedetect.detector import FlashFilter
2829
from scenedetect.detectors import ContentDetector
2930
from scenedetect.frame_timecode import FrameTimecode
30-
from scenedetect.scene_detector import FlashFilter
3131
from scenedetect.scene_manager import Interpolation
3232
from scenedetect.video_splitter import DEFAULT_FFMPEG_ARGS
3333

scenedetect/_cli/context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
ConfigRegistry,
2525
CropValue,
2626
)
27+
from scenedetect.detector import FlashFilter, SceneDetector
2728
from scenedetect.detectors import (
2829
AdaptiveDetector,
2930
ContentDetector,
@@ -33,7 +34,6 @@
3334
)
3435
from scenedetect.frame_timecode import MAX_FPS_DELTA, FrameTimecode
3536
from scenedetect.platform import init_logger
36-
from scenedetect.scene_detector import FlashFilter, SceneDetector
3737
from scenedetect.scene_manager import Interpolation, SceneManager
3838
from scenedetect.stats_manager import StatsManager
3939
from scenedetect.video_splitter import is_ffmpeg_available, is_mkvmerge_available

scenedetect/detectors/adaptive_detector.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ def __init__(
4343
weights: ContentDetector.Components = ContentDetector.DEFAULT_COMPONENT_WEIGHTS,
4444
luma_only: bool = False,
4545
kernel_size: ty.Optional[int] = None,
46-
video_manager=None,
4746
min_delta_hsv: ty.Optional[float] = None,
4847
):
4948
"""
@@ -65,13 +64,8 @@ def __init__(
6564
Overrides `weights` if both are set.
6665
kernel_size: Size of kernel to use for post edge detection filtering. If None,
6766
automatically set based on video resolution.
68-
video_manager: [DEPRECATED] DO NOT USE. For backwards compatibility only.
6967
min_delta_hsv: [DEPRECATED] DO NOT USE. Use `min_content_val` instead.
7068
"""
71-
# TODO(v0.7): Replace with DeprecationWarning that `video_manager` and `min_delta_hsv` will
72-
# be removed in v0.8.
73-
if video_manager is not None:
74-
logger.error("video_manager is deprecated, use video instead.")
7569
if min_delta_hsv is not None:
7670
logger.error("min_delta_hsv is deprecated, use min_content_val instead.")
7771
min_content_val = min_delta_hsv

scenedetect/detectors/content_detector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import cv2
2323
import numpy
2424

25-
from scenedetect.scene_detector import FlashFilter, SceneDetector
25+
from scenedetect.detector import FlashFilter, SceneDetector
2626

2727

2828
def _mean_pixel_distance(left: numpy.ndarray, right: numpy.ndarray) -> float:

scenedetect/detectors/hash_detector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import numpy
3939

4040
# PySceneDetect Library Imports
41-
from scenedetect.scene_detector import SceneDetector
41+
from scenedetect.detector import SceneDetector
4242

4343

4444
class HashDetector(SceneDetector):

scenedetect/detectors/histogram_detector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import numpy
2222

2323
# PySceneDetect Library Imports
24-
from scenedetect.scene_detector import SceneDetector
24+
from scenedetect.detector import SceneDetector
2525

2626

2727
class HistogramDetector(SceneDetector):

scenedetect/detectors/threshold_detector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import numpy
2323

24-
from scenedetect.scene_detector import SceneDetector
24+
from scenedetect.detector import SceneDetector
2525

2626
logger = getLogger("pyscenedetect")
2727

scenedetect/scene_manager.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ def on_new_scene(frame_img: numpy.ndarray, frame_num: int):
101101
SimpleTableRow,
102102
)
103103
from scenedetect.common import CropRegion, CutList, SceneList
104+
from scenedetect.detector import SceneDetector, SparseSceneDetector
104105
from scenedetect.frame_timecode import FrameTimecode
105106
from scenedetect.platform import get_and_create_path, get_cv2_imwrite_params, tqdm
106-
from scenedetect.scene_detector import SceneDetector, SparseSceneDetector
107107
from scenedetect.stats_manager import StatsManager
108108
from scenedetect.video_stream import VideoStream
109109

@@ -722,7 +722,6 @@ def save_images(
722722
width: ty.Optional[int] = None,
723723
interpolation: Interpolation = Interpolation.CUBIC,
724724
threading: bool = True,
725-
video_manager=None,
726725
) -> ty.Dict[int, ty.List[str]]:
727726
"""Save a set number of images from each scene, given a list of scenes
728727
and the associated video/frame source.
@@ -761,7 +760,6 @@ def save_images(
761760
while preserving the aspect ratio.
762761
interpolation: Type of interpolation to use when resizing images.
763762
threading: Offload image encoding and disk IO to background threads to improve performance.
764-
video_manager: [DEPRECATED] DO NOT USE. For backwards compatibility only.
765763
766764
Returns:
767765
Dictionary of the format { scene_num : [image_paths] }, where scene_num is the
@@ -772,10 +770,6 @@ def save_images(
772770
ValueError: Raised if any arguments are invalid or out of range (e.g.
773771
if num_images is negative).
774772
"""
775-
# TODO(v0.7): Add DeprecationWarning that `video_manager` will be removed in v0.8.
776-
if video_manager is not None:
777-
logger.error("`video_manager` argument is deprecated, use `video` instead.")
778-
video = video_manager
779773

780774
if not scene_list:
781775
return {}

0 commit comments

Comments
 (0)