6
6
7
7
#include < filesystem>
8
8
9
- namespace ffmpeg {
9
+ BEGIN_FFMPEG_NAMESPACE_V
10
10
11
11
class FFMPEG_API_DLL AudioMixer {
12
12
public:
13
+ AudioMixer () = delete ;
14
+ AudioMixer (const AudioMixer&) = delete ;
15
+ AudioMixer (AudioMixer&&) = delete ;
16
+
13
17
/* *
14
18
* @brief Mixes a video file and an audio file into a single MP4 output.
15
19
*
@@ -23,25 +27,7 @@ class FFMPEG_API_DLL AudioMixer {
23
27
* @warning The audio file is expected to contain stereo (dual-channel) audio. Using other formats might lead to unexpected results.
24
28
* @warning The video file is expected to contain a single video stream. Only the first video stream will be copied.
25
29
*/
26
- geode::Result<void > mixVideoAudio (std::filesystem::path videoFile, std::filesystem::path audioFile, std::filesystem::path outputMp4File);
27
-
28
- /* *
29
- * @deprecated sampleRate parameter is no longer used. Use the other overload of this function instead.
30
- *
31
- * @brief Mixes a video file and raw audio data into a single MP4 output.
32
- *
33
- * This function takes an input video file and raw audio data (in the form of a vector of floating-point samples),
34
- * and merges them into a single MP4 output file.
35
- *
36
- * @param videoFile The path to the input video file.
37
- * @param raw A vector containing the raw audio data (floating-point samples).
38
- * @param outputMp4File The path where the output MP4 file will be saved.
39
- * @param sampleRate The sample rate of the raw audio data.
40
- *
41
- * @warning The raw audio data is expected to be stereo (dual-channel). Using mono or multi-channel audio might lead to issues.
42
- * @warning The video file is expected to contain a single video stream. Only the first video stream will be copied.
43
- */
44
- [[deprecated]] void mixVideoRaw (std::filesystem::path videoFile, const std::vector<float >& raw, std::filesystem::path outputMp4File, uint32_t sampleRate);
30
+ static geode::Result<> mixVideoAudio (std::filesystem::path videoFile, std::filesystem::path audioFile, std::filesystem::path outputMp4File);
45
31
46
32
/* *
47
33
* @brief Mixes a video file and raw audio data into a single MP4 output.
@@ -56,7 +42,7 @@ class FFMPEG_API_DLL AudioMixer {
56
42
* @warning The raw audio data is expected to be stereo (dual-channel). Using mono or multi-channel audio might lead to issues.
57
43
* @warning The video file is expected to contain a single video stream. Only the first video stream will be copied.
58
44
*/
59
- geode::Result<void > mixVideoRaw (const std::filesystem::path& videoFile, const std::vector<float >& raw, const std::filesystem::path &outputMp4File);
45
+ static geode::Result<> mixVideoRaw (const std::filesystem::path& videoFile, const std::vector<float >& raw, const std::filesystem::path &outputMp4File);
60
46
};
61
47
62
- }
48
+ END_FFMPEG_NAMESPACE_V
0 commit comments