Browse files

Add MP2 and AC-3 audio formats, update DVD preset to use MP2 instead …

…of MP3 as the audio format as this is what it should have used all along, whoops. Thanks to guiodic for the bug report.
  • Loading branch information...
1 parent 6a14795 commit 46cbb98dda245ff3735b9202e6ae031ac5cfaac8 @danielgtaylor committed Jun 16, 2011
Showing with 64 additions and 8 deletions.
  1. +7 −3 arista-gtk
  2. +20 −0 help/ac-3.html
  3. +32 −0 help/mp2.html
  4. +5 −5 presets/dvd.json
View
10 arista-gtk
@@ -1661,15 +1661,17 @@ class PresetDialog(gobject.GObject):
"faac": "AAC",
"lame": "MP3",
"vorbisenc": "Vorbis",
- "ffenc_ac3": "AC3",
+ "ffenc_ac3": "AC-3",
"flacenc": "FLAC",
+ "twolame": "MP2",
}
ACODEC_TO_ENCODER = {
"Vorbis": "vorbisenc",
"AAC": "faac",
"MP3": "lame",
- "AC3": "ffenc_ac3",
+ "AC-3": "ffenc_ac3",
"FLAC": "flacenc",
+ "MP2": "twolame",
}
EFFECT_LIST = ["None", "Rotate clockwise", "Rotate counter-clockwise", "Flip vertical", "Flip horizontal"]
EFFECT_TO_ELEMENTS = {
@@ -2017,7 +2019,7 @@ class PresetDialog(gobject.GObject):
"AVI": ["AAC", "MP3", "Vorbis"],
"MPEG PS": ["AAC", "MP3"],
"MPEG TS": ["AAC", "MP3"],
- "DVD (VOB)": ["MP3"],
+ "DVD (VOB)": ["MP2", "AC-3"],
"Matroska": ["AAC", "MP3", "Vorbis", "FLAC"],
"Ogg": ["Vorbis", "FLAC"],
"FLV": ["MP3"],
@@ -2122,6 +2124,8 @@ class PresetDialog(gobject.GObject):
"AAC": "profile=4 bitrate=128000",
"MP3": "vbr=new vbr-quality=4",
"FLAC": "quality=6",
+ "MP2": "bitrate=192",
+ "AC-3": "bitrate=128000",
}.get(acodec, ""))
def on_audio_options_changed(self, widget):
View
20 help/ac-3.html
@@ -0,0 +1,20 @@
+<html>
+ <head>
+ <link rel="stylesheet" type="text/css" href="style.css"/>
+ </head>
+ <body>
+ <h1>AC-3 (Dolby Digital)</h1>
+ <p>AC-3 is a codec used on video DVDs. It supports up to six audio channels.</p>
+ <div class="options">
+ <h2>Options</h2>
+ <ul>
+ <li>
+ <strong>Bitrate</strong> (number)<br/>
+ Set a specific bitrate to control file size. Default is 128000.<br/>
+ <pre><code>bitrate=128000</code></pre>
+ </li>
+ </ul>
+ </div>
+ <iframe src="common.html" scrolling="no" frameborder="0"></iframe>
+ </body>
+</html>
View
32 help/mp2.html
@@ -0,0 +1,32 @@
+<html>
+ <head>
+ <link rel="stylesheet" type="text/css" href="style.css"/>
+ </head>
+ <body>
+ <h1>MP2</h1>
+ <p>MPEG1 Layer 2 audio, later replaced by MP3, is used on video DVDs.</p>
+ <div class="options">
+ <h2>Options</h2>
+ <ul>
+ <li>
+ <strong>Bitrate</strong> (number)<br/>
+ Set a specific bitrate in kbps to control file size. Default is 192.<br/>
+ <pre><code>bitrate=256</code></pre>
+ </li>
+ <li>
+ <strong>Mode</strong><br/>
+ Set the encoding mode.<br/>
+ <ul>
+ <li>auto: select automatically</li>
+ <li>stereo: stereo</li>
+ <li>joint: joint stereo (default)</li>
+ <li>dual: dual channel</li>
+ <li>mono: mono</li>
+ </ul>
+ <pre><code>mode=stereo</code></pre>
+ </li>
+ </ul>
+ </div>
+ <iframe src="common.html" scrolling="no" frameborder="0"></iframe>
+ </body>
+</html>
View
10 presets/dvd.json
@@ -1,5 +1,5 @@
{
- "version": "1.1",
+ "version": "1.2",
"description": "DivX or MPEG2 for DVD players",
"author": {
"name": "Daniel G. Taylor",
@@ -33,10 +33,10 @@
"extension": "mpg",
"acodec": {
"passes": [
- "bitrate=128"
+ "bitrate=192"
],
"container": "ffmux_dvd",
- "name": "lame",
+ "name": "twolame",
"depth": [
8,
24
@@ -127,10 +127,10 @@
"extension": "mpg",
"acodec": {
"passes": [
- "bitrate=128"
+ "bitrate=192"
],
"container": "ffmux_dvd",
- "name": "lame",
+ "name": "twolame",
"depth": [
8,
24

0 comments on commit 46cbb98

Please sign in to comment.