Skip to content

Commit

Permalink
v1.9.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
zbabac committed Feb 10, 2020
2 parents 4343aae + 735de56 commit 5d01a14
Show file tree
Hide file tree
Showing 22 changed files with 43 additions and 262 deletions.
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@
/.vs
VCT_setup*
*mono*
bin/*
Debug/*
Release/*
.gitignore

bin/

# Build results
[Dd]ebug/
Expand Down
2 changes: 1 addition & 1 deletion App.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
</startup>
</configuration>
23 changes: 12 additions & 11 deletions Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,11 @@ private void MultiTransRow()
out_file = out_path + in_file; //set temp var out_file as selected path + input file name
string _subs = " -map 0:s? "; //include all subs streams
if (checkBoxTransRemoveSubtitle.Checked)
_subs = " -map -0:s "; //remove all subs streams
string _copy_all_streams = " -map 0:v -map 0:a "; //include all v&a streams
_subs = " -map -0:s? "; //remove all subs streams
string _copy_all_streams = " -map 0:v? -map 0:a? "; //include all v&a streams
if (!checkBoxTranscodeAllStreams.Checked)
{
_copy_all_streams = " -map 0:v:" + numericUpDownVideoNr.Value + " -map 0:a:" + numericUpDownAudioNr.Value + " "; //include only 1st v&a streams
_copy_all_streams = " -map 0:v:" + numericUpDownVideoNr.Value + "? -map 0:a:" + numericUpDownAudioNr.Value + "? "; //include only 1st v&a streams

}
string command = "ffmpeg -y -i \"" + input_file + "\" " + _copy_all_streams + _subs + " -c copy \"" + out_file + str_extension + "\"";//define ffmpeg command
Expand Down Expand Up @@ -728,23 +728,23 @@ private void ReadParametersFromGUI()
if (checkBox180.Checked)
{
if (vf != "")
vf += ",\"vflip\"";
vf += ",\"rotate=PI\"";
else
vf = " -vf \"vflip\"";
vf = " -vf \"rotate=PI\"";
}
if (checkBox90clockwise.Checked)
{
if (vf != "")
vf += "\"transpose=1\"";
vf += "\"rotate=PI/2\"";
else
vf = " -vf \"transpose=1\"";
vf = " -vf \"rotate=PI/2\"";
}
if (checkBox90counterclockwise.Checked)
{
if (vf != "")
vf += "\"transpose=2\"";
vf += "\"rotate=-PI/2\"";
else
vf = " -vf \"transpose=2\"";
vf = " -vf \"rotate=-PI/2\"";
}
//
preset = comboBoxPreset.SelectedItem.ToString();
Expand Down Expand Up @@ -1418,6 +1418,7 @@ private void buttonOutConvFile_Click(object sender, EventArgs e)
labelOutConvFile.Text = out_path; //let the user knows by writing it to GUI
labelOutTransFile.Text = out_path; //the same var is also for transcoding jobs
////allow user interaction - to select multiple input files
richTextBoxConv.Text = SetupConversionOptions();
EnableConvButtons();
buttonMultiTransFile.Enabled = true;
buttonRemoveOutPath.Enabled = true;
Expand Down Expand Up @@ -2033,9 +2034,9 @@ private void SetToolTips()
toolTip11.SetToolTip(this.buttonSellectAllQueue, "Click to select all jobs for deletion.\n NOTE: This will not delete, button 'Delete' will delete selected jobs.");
toolTip12.SetToolTip(this.buttonUnselectAll, "Click to unselect all jobs in the list.");
toolTip13.SetToolTip(this.buttonDeleteQueue, "Click to delete all selected jobs.\nBefore that, use check boxes to select those that you want to delete.");
toolTip14.SetToolTip(this.buttonInputConvFile, "Select input file of various formats of audio or video files.\nPay attention to filters in dialog window.\nThat file will be converted depending on options selected after selecting a file.\nYou can also drop your file onto the button.");
toolTip14.SetToolTip(this.buttonInputConvFile, "Select input file of various formats of audio or video files.\nPay attention to filters in dialog window.\nThat file will be converted depending on options selected after selecting a file.\nYou can also drop your file onto the button.\nIF YOU WANT TO OUTPUT TO DIFFERENT FOLDER, SELECT OUTPUT PATH FIRST!");
toolTip15.SetToolTip(this.buttonOutConvFile, "Select output path where converted files will be saved.\nBUT AFTER THAT YOU MUST SELECT INPUT FILE OR DROP FILE THERE!\nFile name will be generated from input file by adding\n '1.' to the end of file.\nIf you want to change file name, use the TEXT BOX BELOW TO MANUALLY enter name after you selected options.");
toolTip16.SetToolTip(this.buttonMultiConvFiles, "Select more files to be converted\nWITH SAME OPTIONS DEFINED ON THIS TAB BEFORE CLICKING THIS BUTTON.\nBatch job list will be populated automatically.\nYou can also drop files onto this button.");
toolTip16.SetToolTip(this.buttonMultiConvFiles, "Select more files to be converted\nWITH SAME OPTIONS DEFINED ON THIS TAB BEFORE CLICKING THIS BUTTON.\nBatch job list will be populated automatically.\nYou can also drop files onto this button.\nSELECT OPTIONS FIRST, THEN ADD FILES VIA THIS BUTTON!!!");
toolTip18.SetToolTip(this.richTextBoxConv, "When changing options, ffmpeg command is generated in this box.\nYou can tweak ffmpeg options manually if you are advanced user.\nWhen you are happy with command, you can click 'Add To Batch File List'.");
toolTip19.SetToolTip(this.buttonAddBatchConv, "When you select all options, click here to add job to the job list.\nAfterwards, you can select new options or keep the same for new job,\nor just click 'Start' to start encoding jobs in the list.");
toolTip20.SetToolTip(this.panelBatch, "The jobs that you added are displayed here.\nYou can drag and drop multiple files here (same effect as dropping files on Multiple Files button).\nIf you changed your mind regarding some options,\nyou can edit ffmpeg command directly in this table.\nWhen you are done building list, click 'Start' to process the queue.");
Expand Down
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.9.3.3")]
[assembly: AssemblyFileVersion("1.9.3.3")]
[assembly: AssemblyVersion("1.9.3.4")]
[assembly: AssemblyFileVersion("1.9.3.4")]
[assembly: NeutralResourcesLanguageAttribute("en-US")]
2 changes: 1 addition & 1 deletion Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# v1.9.3.3
# v1.9.3.4
- **Transcode all streams option "-map 0:v -map 0:a" to try to copy all streams (including multiple audio streams, thanks to user McCoy for suggestion). If it fails, then simply delete the batch task and remove check box for that option on Transcode tab
- **If this option is unchecked, then you have option to choose which video and audio stream will be copied to output; by default, first video and audio stream is copied
- **Keep file extension - useful with option above unchecked: only first video and first audio is copied and file extension (e.g. MP4) is preserved
- **Remove subtitle usage extended with 2 above options: in most of the cases, subtitle is not compatible in MKV and MP4 containers; it is by default set to remove subtitle stream, but you've left with option to keep it
- **Windows XP users can download VCT_setup.exe and separately download older version of FFmpeg (ffmpeg version N-76123-g002b049, e.g. http://hp.vector.co.jp/authors/VA020429/ffmpeg/list.html) in order to be able to get new VCT features
- **Linux finaly fixed file info bug if you use mono version; if you have Wine, you can download Windows VCT_setup.exe (or 64-bit binary)
- **Fixed issue when video rotated 180 degrees is also mirrored - used new filter option, e.g. `-vf "rotate=PI"`


### You can download binaries and source code from Sourceforge:
Expand Down
Loading

0 comments on commit 5d01a14

Please sign in to comment.