transcoder_fftool: add cutting, qscale, pix_fmt, scale set

JackLau1222 · JackLau1222 · commit 7d3bb90f418b · 2025-11-11T10:40:07.000+08:00
Fix code style typos in transcoder and common

Signed-off-by: Jack Lau &lt;jacklau1222@qq.com&gt;
diff --git a/src/builder/src/cut_video_page.cpp b/src/builder/src/cut_video_page.cpp
@@ -416,8 +416,8 @@ void CutVideoPage::OnCutClicked() {
     ProcessParameter *processParam = new ProcessParameter();
 
     // Set start and end time (convert milliseconds to seconds)
-    encodeParam->SetStartTime(startTime / 1000.0);
-    encodeParam->SetEndTime(endTime / 1000.0);
+    encodeParam->set_start_time(startTime / 1000.0);
+    encodeParam->set_end_time(endTime / 1000.0);
 
     // Use copy mode for fast cutting (no re-encoding)
     // Leave video and audio codec empty to copy streams
diff --git a/src/common/include/encode_parameter.h b/src/common/include/encode_parameter.h
@@ -66,9 +66,9 @@ class EncodeParameter {
 
     void set_preset(std::string p);
 
-    void SetStartTime(double t);
+    void set_start_time(double t);
 
-    void SetEndTime(double t);
+    void set_end_time(double t);
 
     std::string get_video_codec_name();
 
@@ -88,9 +88,9 @@ class EncodeParameter {
 
     std::string get_preset();
 
-    double GetStartTime();
+    double get_start_time();
 
-    double GetEndTime();
+    double get_end_time();
 };
 
 #endif // ENCODEPARAMETER_H
diff --git a/src/common/src/encode_parameter.cpp b/src/common/src/encode_parameter.cpp
@@ -117,18 +117,18 @@ void EncodeParameter::set_preset(std::string p) {
 
 std::string EncodeParameter::get_preset() { return preset; }
 
-void EncodeParameter::SetStartTime(double t) {
+void EncodeParameter::set_start_time(double t) {
     startTime = t;
     available = true;
 }
 
-void EncodeParameter::SetEndTime(double t) {
+void EncodeParameter::set_end_time(double t) {
     endTime = t;
     available = true;
 }
 
-double EncodeParameter::GetStartTime() { return startTime; }
+double EncodeParameter::get_start_time() { return startTime; }
 
-double EncodeParameter::GetEndTime() { return endTime; }
+double EncodeParameter::get_end_time() { return endTime; }
 
 EncodeParameter::~EncodeParameter() {}
diff --git a/src/main.cpp b/src/main.cpp
@@ -302,25 +302,25 @@ bool handleCLI(int argc, char *argv[]) {
 
     // Handle time parameters with validation
     if (startTime >= 0.0) {
-        encodeParam->SetStartTime(startTime);
+        encodeParam->set_start_time(startTime);
     }
 
     // Calculate endTime from duration if -t is specified
     // Note: -to takes precedence over -t if both are specified
     if (endTime >= 0.0) {
-        encodeParam->SetEndTime(endTime);
+        encodeParam->set_end_time(endTime);
     } else if (duration >= 0.0) {
         // Calculate endTime = startTime + duration
         double calculatedEndTime = (startTime >= 0.0 ? startTime : 0.0) + duration;
-        encodeParam->SetEndTime(calculatedEndTime);
+        encodeParam->set_end_time(calculatedEndTime);
         std::cout << "Duration: " << duration << "s, calculated end time: "
                   << calculatedEndTime << "s\n";
     }
 
     // Validate time range (will be checked in transcoder as well)
-    if (startTime >= 0.0 && encodeParam->GetEndTime() >= 0.0) {
-        if (encodeParam->GetEndTime() <= startTime) {
-            std::cerr << "Error: End time (" << encodeParam->GetEndTime()
+    if (startTime >= 0.0 && encodeParam->get_end_time() >= 0.0) {
+        if (encodeParam->get_end_time() <= startTime) {
+            std::cerr << "Error: End time (" << encodeParam->get_end_time()
                       << "s) must be greater than start time (" << startTime << "s)\n";
             result = false;
             goto end;
diff --git a/src/tests/transcoder_test.cpp b/src/tests/transcoder_test.cpp
@@ -123,8 +123,8 @@ TEST_F(TranscoderTest, VideoCutCopyMode) {
     ProcessParameter processParams;
 
     // Set start and end time (cut first 1 second)
-    encodeParams.SetStartTime(0.0);
-    encodeParams.SetEndTime(1.0);
+    encodeParams.set_start_time(0.0);
+    encodeParams.set_end_time(1.0);
     // Leave codecs empty for copy mode
 
     auto converter = std::make_unique<Converter>(&processParams, &encodeParams);
@@ -149,8 +149,8 @@ TEST_F(TranscoderTest, VideoCutWithTranscode) {
     ProcessParameter processParams;
 
     // Set start and end time (cut from 0.5s to 1.5s)
-    encodeParams.SetStartTime(0.5);
-    encodeParams.SetEndTime(1.5);
+    encodeParams.set_start_time(0.5);
+    encodeParams.set_end_time(1.5);
 
     // Set video codec for transcoding
     encodeParams.set_video_codec_name("libx264");
@@ -174,8 +174,8 @@ TEST_F(TranscoderTest, VideoCutInvalidTimeRange) {
     ProcessParameter processParams;
 
     // Set invalid time range (end time before start time)
-    encodeParams.SetStartTime(2.0);
-    encodeParams.SetEndTime(1.0);
+    encodeParams.set_start_time(2.0);
+    encodeParams.set_end_time(1.0);
 
     auto converter = std::make_unique<Converter>(&processParams, &encodeParams);
     converter->set_transcoder("FFMPEG");
@@ -199,7 +199,7 @@ TEST_F(TranscoderTest, VideoCutStartTimeOnly) {
     ProcessParameter processParams;
 
     // Set only start time (should cut from start time to end of video)
-    encodeParams.SetStartTime(0.5);
+    encodeParams.set_start_time(0.5);
     // Don't set end time (defaults to -1.0)
 
     auto converter = std::make_unique<Converter>(&processParams, &encodeParams);
@@ -227,8 +227,8 @@ TEST_F(TranscoderTest, VideoCutWithDuration) {
     // This simulates: -ss 0.5 -t 1.0 (cut from 0.5s for 1 second duration)
     double startTime = 0.5;
     double duration = 1.0;
-    encodeParams.SetStartTime(startTime);
-    encodeParams.SetEndTime(startTime + duration);  // endTime = 1.5s
+    encodeParams.set_start_time(startTime);
+    encodeParams.set_end_time(startTime + duration);  // endTime = 1.5s
 
     auto converter = std::make_unique<Converter>(&processParams, &encodeParams);
     converter->set_transcoder("FFMPEG");
diff --git a/src/transcoder/include/transcoder.h b/src/transcoder/include/transcoder.h
@@ -26,9 +26,9 @@
 
 class Transcoder {
 public:
-    Transcoder(ProcessParameter *processParameter,
-               EncodeParameter *encodeParameter)
-        : processParameter(processParameter), encodeParameter(encodeParameter) {
+    Transcoder(ProcessParameter *process_parameter,
+               EncodeParameter *encode_parameter)
+        : process_parameter(process_parameter), encode_parameter(encode_parameter) {
         last_ui_update = std::chrono::system_clock::now();
     }
 
@@ -50,8 +50,8 @@ class Transcoder {
                          duration_history.size();
     }
 
-    void send_process_parameter(int64_t frameNumber, int64_t frameTotalNumber) {
-        processNumber = frameNumber * 100 / frameTotalNumber;
+    void send_process_parameter(int64_t frame_number, int64_t frame_total_number) {
+        process_number = frame_number * 100 / frame_total_number;
 
         static auto last_encoder_call_time = std::chrono::system_clock::now();
         auto now = std::chrono::system_clock::now();
@@ -62,8 +62,8 @@ class Transcoder {
         last_encoder_call_time = now;
 
         double smooth_duration = compute_smooth_duration(duration);
-        if (frameNumber > 0 && frameTotalNumber > 0) {
-            remainTime = smooth_duration * (100 - processNumber) / 1000;
+        if (frame_number > 0 && frame_total_number > 0) {
+            remain_time = smooth_duration * (100 - process_number) / 1000;
         }
 
         // Only update UI if enough time has passed (100ms)
@@ -72,27 +72,27 @@ class Transcoder {
                 now - last_ui_update)
                 .count();
         if (time_since_last_ui_update >= 100) {
-            processParameter->set_process_number(processNumber);
-            if (frameNumber > 0 && frameTotalNumber > 0) {
-                processParameter->set_time_required(remainTime);
+            process_parameter->set_process_number(process_number);
+            if (frame_number > 0 && frame_total_number > 0) {
+                process_parameter->set_time_required(remain_time);
             }
             last_ui_update = now;
         }
 
-        std::cout << "Process Number (percentage): " << processNumber << "%\t"
+        std::cout << "Process Number (percentage): " << process_number << "%\t"
                   << "Current duration (milliseconds): " << duration << "\t"
                   << "Smoothed Duration: " << smooth_duration << " ms\t"
-                  << "Estimated Rest Time (seconds): " << remainTime
+                  << "Estimated Rest Time (seconds): " << remain_time
                   << std::endl;
     }
 
-    ProcessParameter *processParameter = NULL;
-    EncodeParameter *encodeParameter = NULL;
+    ProcessParameter *process_parameter = NULL;
+    EncodeParameter *encode_parameter = NULL;
 
-    int64_t frameNumber = 0;
-    int64_t frameTotalNumber = 0;
-    int processNumber = 0;
-    double remainTime = 0;
+    int64_t frame_number = 0;
+    int64_t frame_total_number = 0;
+    int process_number = 0;
+    double remain_time = 0;
 
     std::chrono::system_clock::time_point
         last_ui_update; // Track last UI update time
diff --git a/src/transcoder/include/transcoder_bmf.h b/src/transcoder/include/transcoder_bmf.h
@@ -25,8 +25,8 @@
 
 class TranscoderBMF : public Transcoder {
 public:
-    TranscoderBMF(ProcessParameter *processParameter,
-                  EncodeParameter *encodeParamter);
+    TranscoderBMF(ProcessParameter *process_parameter,
+                  EncodeParameter *encode_parameter);
 
     bool prepare_info(std::string input_path, std::string output_path);
 
@@ -38,8 +38,8 @@ class TranscoderBMF : public Transcoder {
 
 private:
     // encoder's parameters
-    bool copyVideo;
-    bool copyAudio;
+    bool copy_video;
+    bool copy_audio;
 
     int width;
     int height;
diff --git a/src/transcoder/include/transcoder_ffmpeg.h b/src/transcoder/include/transcoder_ffmpeg.h
@@ -37,8 +37,8 @@ typedef struct FilteringContext {
 
 class TranscoderFFmpeg : public Transcoder {
 public:
-    TranscoderFFmpeg(ProcessParameter *processParameter,
-                     EncodeParameter *encodeParameter);
+    TranscoderFFmpeg(ProcessParameter *process_parameter,
+                     EncodeParameter *encode_parameter);
     ~TranscoderFFmpeg();
 
     bool transcode(std::string input_path, std::string output_path);
@@ -76,10 +76,10 @@ class TranscoderFFmpeg : public Transcoder {
               AVStream *outStream);
 
 private:
-    char errorMsg[128];
+    char error_msg[128];
     // encoder's parameters
-    bool copyVideo;
-    bool copyAudio;
+    bool copy_video;
+    bool copy_audio;
 
     // Decoder and encoder contexts
     StreamContext *decoder;
diff --git a/src/transcoder/include/transcoder_fftool.h b/src/transcoder/include/transcoder_fftool.h
@@ -20,8 +20,8 @@
 
 class TranscoderFFTool : public Transcoder {
 public:
-    TranscoderFFTool(ProcessParameter *processParameter,
-                     EncodeParameter *encodeParameter);
+    TranscoderFFTool(ProcessParameter *process_parameter,
+                     EncodeParameter *encode_parameter);
     ~TranscoderFFTool();
 
     bool prepared_opt();
@@ -30,17 +30,27 @@ class TranscoderFFTool : public Transcoder {
 
 private:
     // encoder's parameters
-    bool copyVideo;
-    bool copyAudio;
+    bool copy_video;
+    bool copy_audio;
 
-    std::string videoCodec;
-    int64_t videoBitRate;
-    std::string audioCodec;
-    int64_t audioBitRate;
+    std::string video_codec;
+    int64_t video_bit_rate;
+    std::string audio_codec;
+    int64_t audio_bit_rate;
 
-    static int frameNumber;
+    // Additional video parameters
+    uint16_t width;
+    uint16_t height;
+    int qscale;
+    std::string pixel_format;
 
-    int64_t frameTotalNumber;
+    // Time range parameters
+    double start_time;  // in seconds
+    double end_time;    // in seconds
+
+    static int frame_number;
+
+    int64_t frame_total_number;
 };
 
 #endif // TRANSCODERFFTOOL_H
diff --git a/src/transcoder/src/transcoder_bmf.cpp b/src/transcoder/src/transcoder_bmf.cpp
diff --git a/src/transcoder/src/transcoder_ffmpeg.cpp b/src/transcoder/src/transcoder_ffmpeg.cpp
diff --git a/src/transcoder/src/transcoder_fftool.cpp b/src/transcoder/src/transcoder_fftool.cpp
