From aa6c649a68eeaa450c6f6a268503b0e5be3fef2e Mon Sep 17 00:00:00 2001 From: Werner Robitza Date: Tue, 18 Jul 2023 09:38:34 +0200 Subject: [PATCH] remove deprecated methods --- .../ffmpeg_quality_metrics.py | 48 ------------------- 1 file changed, 48 deletions(-) diff --git a/ffmpeg_quality_metrics/ffmpeg_quality_metrics.py b/ffmpeg_quality_metrics/ffmpeg_quality_metrics.py index a5f1531..633504a 100644 --- a/ffmpeg_quality_metrics/ffmpeg_quality_metrics.py +++ b/ffmpeg_quality_metrics/ffmpeg_quality_metrics.py @@ -296,10 +296,6 @@ def _get_filter_opts(self, filter_name: FilterName) -> str: else: raise FfmpegQualityMetricsError(f"Unknown filter {filter_name}!") - def calc(self, **kwargs): - logger.warning("The calc method is deprecated. Use calculate() instead.") - return self.calculate(**kwargs) - def calculate( self, metrics: List[MetricName] = ["ssim", "psnr"], @@ -600,50 +596,6 @@ def _run_ffmpeg_command( _, stderr = run_command(cmd, dry_run=self.dry_run) return stderr - def calc_ssim_psnr(self) -> Dict[MetricName, SingleMetricData]: - """Calculate SSIM and PSNR - - Raises: - e: A generic error - - Returns: - dict: SSIM and PSNR results, each with their own key - """ - logger.warning( - "The calc_ssim_psnr() method is deprecated and will be removed eventually. " - "Please use calc() instead!" - ) - - if "ssim" not in self.available_filters: - raise FfmpegQualityMetricsError( - "Your ffmpeg build does not have support for the 'ssim' filter. " - ) - - if "psnr" not in self.available_filters: - raise FfmpegQualityMetricsError( - "Your ffmpeg build does not have support for the 'psnr' filter. " - ) - - filter_chains = [ - f"[1][0]scale2ref=flags={self.scaling_algorithm}[dist][ref]", - "[dist]setpts=PTS-STARTPTS[distpts]", - "[ref]setpts=PTS-STARTPTS[refpts]", - "[distpts]split[dist1][dist2]", - "[refpts]split[ref1][ref2]", - f"[dist1][ref1]{self._get_filter_opts('ssim')}", - f"[dist2][ref2]{self._get_filter_opts('psnr')}", - ] - - try: - self._run_ffmpeg_command(filter_chains, desc="PSNR and SSIM") - self._read_temp_files(["ssim", "psnr"]) - except Exception as e: - raise e - finally: - self._cleanup_temp_files() - - return {"ssim": self.data["ssim"], "psnr": self.data["psnr"]} - def _cleanup_temp_files(self) -> None: """ Remove the temporary files