Skip to content

Commit 846ed56

Browse files
vkantchevvkantchev
committed
Auto push on 2023-09-17 18:35:04
1 parent 87bc8f3 commit 846ed56

32 files changed

+140
-136
lines changed

‎samples/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if (OS STREQUAL "darwin")
2222

2323
add_subdirectory(${OS}/mux_mp4_file)
2424

25-
add_subdirectory(${OS}/remux)
25+
add_subdirectory(${OS}/re-encode)
2626
add_subdirectory(${OS}/slideshow)
2727
endif()
2828

@@ -41,7 +41,7 @@ if(OS STREQUAL "linux")
4141

4242
add_subdirectory(${OS}/mux_mp4_file)
4343

44-
add_subdirectory(${OS}/remux)
44+
add_subdirectory(${OS}/re-encode)
4545
add_subdirectory(${OS}/slideshow)
4646
endif()
4747

@@ -60,6 +60,6 @@ if(OS STREQUAL "windows")
6060

6161
add_subdirectory(${OS}/mux_mp4_file)
6262

63-
add_subdirectory(${OS}/remux)
63+
add_subdirectory(${OS}/re-encode)
6464
add_subdirectory(${OS}/slideshow)
6565
endif()

‎samples/darwin/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ See [enc_avc_file](./enc_avc_file) for details.
100100

101101
## Misc
102102

103-
### remux
103+
### re-encode
104104

105105
Take an MP4 input and re-encodes the audio and video streams back into an MP4 output.
106106

107-
See [remux](./remux) for details.
107+
See [re-encode](./re-encode) for details.
108108

109109
### slideshow
110110

‎samples/darwin/remux/CMakeLists.txt renamed to ‎samples/darwin/re-encode/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.16)
22

3-
project(remuxe)
4-
set (target remux)
3+
project(re-encode)
4+
set (target re-encode)
55

66
add_executable(${target})
77

‎samples/darwin/re-encode/README.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
## re-encode
2+
3+
Take an MP4 input and re-encodes the audio and video streams back into MP4 output. Shows how to force encoding of individual streams even when it is not needed.
4+
5+
### Command Line
6+
7+
```sh
8+
re-encode [--input <input_file.mp4>] [--output <output_file.mp4>] [--audio <yes|no>] [--video <yes|no>]
9+
```
10+
11+
### Examples
12+
13+
List options:
14+
15+
```sh
16+
./bin/x64/re-encode --help
17+
18+
Usage: re-encode --input inputFile.mp4 --output outputFile.mp4 [--audio yes|no] [--video yes|no]
19+
20+
-h, --help
21+
-i, --input input mp4 file
22+
-o, --output output mp4 file
23+
-a, --audio re-encode audio, yes|no
24+
-v, --video re-encode video, yes|no
25+
```
26+
27+
Re-encode the video stream of an MP4 / H.264 clip.
28+
29+
```sh
30+
mkdir -p ./output/re-encode
31+
32+
./bin/x64/re-encode \
33+
--audio no \
34+
--video yes \
35+
--input ./assets/mov/big_buck_bunny_trailer.mp4 \
36+
--output ./output/re-encode/big_buck_bunny_trailer.mp4
37+
```

‎samples/darwin/remux/options.cpp renamed to ‎samples/darwin/re-encode/options.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ namespace fs = std::filesystem;
1111

1212
void help(primo::program_options::OptionsConfig<char>& optcfg)
1313
{
14-
cout << "Usage: remux --input inputFile.mp4 --output outputFile.mp4 [--audio yes|no] [--video yes|no]\n" << endl;
14+
cout << "Usage: re-encode --input inputFile.mp4 --output outputFile.mp4 [--audio yes|no] [--video yes|no]\n" << endl;
1515
primo::program_options::doHelp(cout, optcfg);
1616
}
1717

1818
void setDefaultOptions(Options& opt)
1919
{
2020
opt.inputFile = getExeDir() + "/../../assets/mov/big_buck_bunny_trailer.mp4";
2121

22-
fs::path output(getExeDir() + "/../../output/remux");
22+
fs::path output(getExeDir() + "/../../output/re-encode");
2323
fs::create_directories(output);
2424

2525
ostringstream s;
@@ -53,8 +53,8 @@ ErrorCodes prepareOptions(Options &opt, int argc, char* argv[])
5353
("help,h", opt.help, "")
5454
("input,i", opt.inputFile, string(), "input mp4 file")
5555
("output,o", opt.outputFile, string(), "output mp4 file")
56-
("audio,a", opt.reEncodeAudio, YesNo(true), "remux audio, yes|no")
57-
("video,v", opt.reEncodeVideo, YesNo(true), "remux video, yes|no");
56+
("audio,a", opt.reEncodeAudio, YesNo(true), "re-encode audio, yes|no")
57+
("video,v", opt.reEncodeVideo, YesNo(true), "re-encode video, yes|no");
5858

5959
try
6060
{

‎samples/darwin/remux/options.h renamed to ‎samples/darwin/re-encode/options.h

File renamed without changes.

‎samples/darwin/remux/program_options.h renamed to ‎samples/darwin/re-encode/program_options.h

File renamed without changes.

‎samples/darwin/remux/remux.cpp renamed to ‎samples/darwin/re-encode/remux.cpp

File renamed without changes.

‎samples/darwin/remux/util.cpp renamed to ‎samples/darwin/re-encode/util.cpp

File renamed without changes.

‎samples/darwin/remux/util.h renamed to ‎samples/darwin/re-encode/util.h

File renamed without changes.

‎samples/darwin/remux/README.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎samples/linux/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ See [enc_avc_file](./enc_avc_file) for details.
100100

101101
## Misc
102102

103-
### remux
103+
### re-encode
104104

105105
Take an MP4 input and re-encodes the audio and video streams back into an MP4 output.
106106

107-
See [remux](./remux) for details.
107+
See [re-encode](./re-encode) for details.
108108

109109
### slideshow
110110

‎samples/linux/remux/CMakeLists.txt renamed to ‎samples/linux/re-encode/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.16)
22

3-
project(remux)
4-
set (target remux)
3+
project(re-encode)
4+
set (target re-encode)
55

66
add_executable(${target})
77

‎samples/linux/re-encode/README.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
## re-encode
2+
3+
Take an MP4 input and re-encodes the audio and video streams back into MP4 output. Shows how to force encoding of individual streams even when it is not needed.
4+
5+
### Command Line
6+
7+
```sh
8+
re-encode [--input <input_file.mp4>] [--output <output_file.mp4>] [--audio <yes|no>] [--video <yes|no>]
9+
```
10+
11+
### Examples
12+
13+
List options:
14+
15+
```sh
16+
./bin/x64/re-encode --help
17+
18+
Usage: re-encode --input inputFile.mp4 --output outputFile.mp4 [--audio yes|no] [--video yes|no]
19+
20+
-h, --help
21+
-i, --input input mp4 file
22+
-o, --output output mp4 file
23+
-a, --audio re-encode audio, yes|no
24+
-v, --video re-encode video, yes|no
25+
```
26+
27+
Re-encode the video stream of an MP4 / H.264 clip.
28+
29+
```sh
30+
mkdir -p ./output/re-encode
31+
32+
./bin/x64/re-encode \
33+
--audio yes \
34+
--video yes \
35+
--input ./assets/mov/big_buck_bunny_trailer.mp4 \
36+
--output ./output/re-encode/big_buck_bunny_trailer.mp4
37+
```

‎samples/linux/remux/options.cpp renamed to ‎samples/linux/re-encode/options.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ namespace fs = std::filesystem;
1111

1212
void help(primo::program_options::OptionsConfig<char>& optcfg)
1313
{
14-
cout << "Usage: remux --input inputFile.mp4 --output outputFile.mp4 [--audio yes|no] [--video yes|no]\n" << endl;
14+
cout << "Usage: re-encode --input inputFile.mp4 --output outputFile.mp4 [--audio yes|no] [--video yes|no]\n" << endl;
1515
primo::program_options::doHelp(cout, optcfg);
1616
}
1717

1818
void setDefaultOptions(Options& opt)
1919
{
2020
opt.inputFile = getExeDir() + "/../../assets/mov/big_buck_bunny_trailer.mp4";
2121

22-
fs::path output(getExeDir() + "/../../output/remux");
22+
fs::path output(getExeDir() + "/../../output/re-encode");
2323
fs::create_directories(output);
2424

2525
ostringstream s;
@@ -53,8 +53,8 @@ ErrorCodes prepareOptions(Options &opt, int argc, char* argv[])
5353
("help,h", opt.help, "")
5454
("input,i", opt.inputFile, string(), "input mp4 file")
5555
("output,o", opt.outputFile, string(), "output mp4 file")
56-
("audio,a", opt.reEncodeAudio, YesNo(true), "remux audio, yes|no")
57-
("video,v", opt.reEncodeVideo, YesNo(true), "remux video, yes|no");
56+
("audio,a", opt.reEncodeAudio, YesNo(true), "re-encode audio, yes|no")
57+
("video,v", opt.reEncodeVideo, YesNo(true), "re-encode video, yes|no");
5858

5959
try
6060
{

‎samples/linux/remux/options.h renamed to ‎samples/linux/re-encode/options.h

File renamed without changes.

‎samples/linux/remux/program_options.h renamed to ‎samples/linux/re-encode/program_options.h

File renamed without changes.

‎samples/linux/remux/remux.cpp renamed to ‎samples/linux/re-encode/re-encode.cpp

File renamed without changes.

‎samples/linux/remux/util.h renamed to ‎samples/linux/re-encode/util.h

File renamed without changes.

‎samples/linux/remux/README.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎samples/windows/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ See [enc_avc_file](./enc_avc_file) for details.
100100

101101
## Misc
102102

103-
### remux
103+
### re-encode
104104

105105
Take an MP4 input and re-encodes the audio and video streams back into an MP4 output.
106106

107-
See [remux](./remux) for details.
107+
See [re-encode](./re-encode) for details.
108108

109109
### slideshow
110110

‎samples/windows/remux/CMakeLists.txt renamed to ‎samples/windows/re-encode/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.16)
22

3-
project(remux)
4-
set (target remux)
3+
project(re-encode)
4+
set (target re-encode)
55

66
add_executable(${target})
77

‎samples/windows/re-encode/README.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
## re-encode
2+
3+
This sample takes an MP4 input and re-encodes the audio and video streams back into MP4 output. It shows how to force encoding of individual streams even when it is not needed.
4+
5+
### Command Line
6+
7+
```powershell
8+
re-encode --input input_file.mp4 --output output_file.mp4 --audio <yes|no> --video <yes|no>
9+
```
10+
11+
### Examples
12+
13+
List options:
14+
15+
```powershell
16+
./bin/x64/re-encode --help
17+
18+
Usage: re-encode --input inputFile.mp4 --output outputFile.mp4 [--audio yes|no] [--video yes|no]
19+
20+
-h, --help
21+
-i, --input input mp4 file
22+
-o, --output output mp4 file
23+
-a, --audio re-encode audio, yes|no
24+
-v, --video re-encode video, yes|no
25+
```
26+
27+
The following example re-encodes only the video stream in an MP4 / H.264 clip:
28+
29+
```powershell
30+
mkdir -Force -Path ./output/re-encode
31+
32+
./bin/x64/re-encode `
33+
--input ./assets/mov/big_buck_bunny_trailer.mp4 `
34+
--output ./output/re-encode/big_buck_bunny_trailer.mp4 `
35+
--video yes `
36+
--audio no
37+
```

‎samples/windows/remux/options.cpp renamed to ‎samples/windows/re-encode/options.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void setDefaultOptions(Options& opt)
1414
//audio and video flags are enabled by default
1515
opt.inputFile = getExeDir() + L"/../../assets/mov/big_buck_bunny_trailer.mp4";
1616

17-
fs::path output(getExeDir() + L"/../../output/remux");
17+
fs::path output(getExeDir() + L"/../../output/re-encode");
1818
fs::create_directories(output);
1919

2020
wostringstream s;
@@ -25,7 +25,7 @@ void setDefaultOptions(Options& opt)
2525

2626
void help(OptionsConfig<wchar_t>& optionsConfig)
2727
{
28-
wcout << L"Usage: remux [--input inputFile.mp4] [--output outputFile.mp4] [--remux-audio yes|no] [--remux-video yes|no]\n" << endl;
28+
wcout << L"Usage: re-encode [--input inputFile.mp4] [--output outputFile.mp4] [--audio yes|no] [--video yes|no]\n" << endl;
2929
doHelp(wcout, optionsConfig);
3030
}
3131

@@ -44,8 +44,8 @@ ErrorCodes prepareOptions(Options& opt, int argc, wchar_t* argv[])
4444
wcout << L"Using defaults:\n";
4545
wcout << L"--input " << opt.inputFile;
4646
wcout << L" --output " << opt.outputFile;
47-
wcout << L" --remux-video " << opt.reEncodeVideo;
48-
wcout << L" --remux-audio " << opt.reEncodeAudio;
47+
wcout << L" --video " << opt.reEncodeVideo;
48+
wcout << L" --audio " << opt.reEncodeAudio;
4949
wcout << endl;
5050
return Parsed;
5151
}
@@ -55,8 +55,8 @@ ErrorCodes prepareOptions(Options& opt, int argc, wchar_t* argv[])
5555
(L"help,?", opt.help, L"")
5656
(L"input,i", opt.inputFile, wstring(), L"input file")
5757
(L"output,o", opt.outputFile, wstring(), L"output file")
58-
(L"remux-audio,a", opt.reEncodeAudio, YesNo(TRUE), L"remux audio with yes|no")
59-
(L"remux-video,v", opt.reEncodeVideo, YesNo(TRUE), L"remux video with yes|no");
58+
(L"audio,a", opt.reEncodeAudio, YesNo(TRUE), L"re-encode audio with yes|no")
59+
(L"video,v", opt.reEncodeVideo, YesNo(TRUE), L"re-encode video with yes|no");
6060

6161
try
6262
{

‎samples/windows/remux/options.h renamed to ‎samples/windows/re-encode/options.h

File renamed without changes.

‎samples/windows/remux/program_options.h renamed to ‎samples/windows/re-encode/program_options.h

File renamed without changes.

‎samples/windows/remux/remux.cpp renamed to ‎samples/windows/re-encode/remux.cpp

File renamed without changes.

‎samples/windows/remux/stdafx.cpp renamed to ‎samples/windows/re-encode/stdafx.cpp

File renamed without changes.

‎samples/windows/remux/stdafx.h renamed to ‎samples/windows/re-encode/stdafx.h

File renamed without changes.

‎samples/windows/remux/targetver.h renamed to ‎samples/windows/re-encode/targetver.h

File renamed without changes.

‎samples/windows/remux/util.h renamed to ‎samples/windows/re-encode/util.h

File renamed without changes.

0 commit comments

Comments
 (0)