From de382feeffd9ab4642e8d0426714389a45fe28b6 Mon Sep 17 00:00:00 2001 From: ThisBirchWood Date: Thu, 8 May 2025 23:00:06 +0200 Subject: [PATCH] CHANGE access levels --- .../java/com/ddf/vodsystem/entities/Job.java | 4 ++-- ...mpegService.java => CompressionService.java} | 17 +++++++++++++---- .../com/ddf/vodsystem/services/JobService.java | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) rename src/main/java/com/ddf/vodsystem/services/{FfmpegService.java => CompressionService.java} (92%) diff --git a/src/main/java/com/ddf/vodsystem/entities/Job.java b/src/main/java/com/ddf/vodsystem/entities/Job.java index f00e115..8d620f2 100644 --- a/src/main/java/com/ddf/vodsystem/entities/Job.java +++ b/src/main/java/com/ddf/vodsystem/entities/Job.java @@ -1,6 +1,6 @@ package com.ddf.vodsystem.entities; -import com.ddf.vodsystem.services.FfmpegService; +import com.ddf.vodsystem.services.CompressionService; import lombok.Data; import java.io.File; import java.io.IOException; @@ -37,7 +37,7 @@ public class Job implements Runnable { logger.info("Job {} started", uuid); this.status = JobStatus.RUNNING; - FfmpegService f = new FfmpegService(file, new File("output.mp4")); + CompressionService f = new CompressionService(file, new File("output.mp4")); f.setStartPoint(startPoint); f.setEndPoint(endPoint); f.setFps(fps); diff --git a/src/main/java/com/ddf/vodsystem/services/FfmpegService.java b/src/main/java/com/ddf/vodsystem/services/CompressionService.java similarity index 92% rename from src/main/java/com/ddf/vodsystem/services/FfmpegService.java rename to src/main/java/com/ddf/vodsystem/services/CompressionService.java index 8bdf578..d7e8650 100644 --- a/src/main/java/com/ddf/vodsystem/services/FfmpegService.java +++ b/src/main/java/com/ddf/vodsystem/services/CompressionService.java @@ -10,24 +10,33 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; +import lombok.Getter; +import lombok.Setter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static java.lang.Long.parseLong; -@Data -public class FfmpegService { - private static final Logger logger = LoggerFactory.getLogger(FfmpegService.class); +public class CompressionService { + private static final Logger logger = LoggerFactory.getLogger(CompressionService.class); private List command; + @Getter @Setter private File inputFile; + @Getter @Setter private File outputFile; + @Getter @Setter private Float startPoint; + @Getter @Setter private Float endPoint; + @Getter @Setter private Integer width; + @Getter @Setter private Integer height; + @Getter @Setter private Float fps; + @Getter @Setter private Float fileSize; private static final float AUDIO_RATIO = 0.15f; @@ -37,7 +46,7 @@ public class FfmpegService { private Pattern timePattern = Pattern.compile("time=([\\d:.]+)"); private long out_time_ms; - public FfmpegService(File file, File output) { + public CompressionService(File file, File output) { command = new ArrayList<>(); command.add("ffmpeg"); command.add("-progress"); diff --git a/src/main/java/com/ddf/vodsystem/services/JobService.java b/src/main/java/com/ddf/vodsystem/services/JobService.java index 443e308..e03e2da 100644 --- a/src/main/java/com/ddf/vodsystem/services/JobService.java +++ b/src/main/java/com/ddf/vodsystem/services/JobService.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.LinkedList; @Service -public class JobService { +class JobService { private static final Logger logger = LoggerFactory.getLogger(JobService.class); private final HashMap jobs = new HashMap<>(); private final LinkedList jobQueue = new LinkedList<>();