Skip to content

Commit 3bd4ffd

Browse files
committed
Audio bitrate multiplier now works correctly for 8+ channels
1 parent 5c1081d commit 3bd4ffd

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

ff-utils-winforms/Forms/MainForm.Designer.cs

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ff-utils-winforms/Forms/MainForm.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,5 +243,10 @@ private void tabList_SelectedIndexChanged(object sender, EventArgs e)
243243
else
244244
SaveConfig();
245245
}
246+
247+
private void encAudChannels_SelectedIndexChanged(object sender, EventArgs e)
248+
{
249+
QuickConvertUi.AudEncoderSelected(encAudCodecBox.SelectedIndex);
250+
}
246251
}
247252
}

ff-utils-winforms/UI/Tasks/QuickConvertUi.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ public static void VidEncoderSelected(int index)
9797

9898
public static void AudEncoderSelected(int index)
9999
{
100+
if (index < 0)
101+
return;
102+
100103
CodecUtils.AudioCodec c = (CodecUtils.AudioCodec)index;
101104
IEncoder enc = CodecUtils.GetCodec(c);
102105

ff-utils-winforms/Utils/MiscUtils.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,21 @@ public static Fraction GetFpsFromString (string str)
5858

5959
public static float GetAudioBitrateMultiplier(int channels)
6060
{
61+
float mult = 1f;
62+
6163
if (channels == 1) // Mono
62-
return 0.5f;
64+
mult = 0.5f;
6365

6466
if (channels == 2) // Stereo
65-
return 1f;
67+
mult = 1f;
6668

6769
if (channels > 4) // 5.1, etc
68-
return 2f;
70+
mult = 2f;
6971

7072
if (channels > 6) // 6.1, 7.1, etc
71-
return 2.25f;
73+
mult = 2.5f;
7274

73-
return 1f;
75+
return mult;
7476
}
7577
}
7678
}

0 commit comments

Comments
 (0)