X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fstandard_presets.xml;h=d44f9421eda7ffa1c0e56ee95100859a4efc648e;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=8bbc8c10f8e914704b3fff8cc43249aff7506200;hpb=3250542476cfc59c9158211bfd7650b4fd5e5e2a;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index 8bbc8c10..d44f9421 100644
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -16,7 +16,7 @@
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
-						<string>48</string>
+						<string>Auto</string>
 						<key>AudioTrack</key>
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
@@ -117,7 +117,7 @@
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
-						<string>48</string>
+						<string>Auto</string>
 						<key>AudioTrack</key>
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
@@ -166,8 +166,6 @@
 				<string>None</string>
 				<key>Type</key>
 				<integer>0</integer>
-				<key>UsesMaxPictureSettings</key>
-				<integer>0</integer>
 				<key>UsesPictureFilters</key>
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
@@ -204,7 +202,7 @@
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
-						<string>48</string>
+						<string>Auto</string>
 						<key>AudioTrack</key>
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
@@ -253,8 +251,6 @@
 				<string>None</string>
 				<key>Type</key>
 				<integer>0</integer>
-				<key>UsesMaxPictureSettings</key>
-				<integer>0</integer>
 				<key>UsesPictureFilters</key>
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
@@ -291,7 +287,96 @@
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
-						<string>48</string>
+						<string>Auto</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+				</array>
+				<key>ChapterMarkers</key>
+				<integer>1</integer>
+				<key>Default</key>
+				<integer>0</integer>
+				<key>FileFormat</key>
+				<string>MP4 file</string>
+				<key>Folder</key>
+				<false/>
+				<key>Mp4LargeFile</key>
+				<integer>1</integer>
+				<key>PictureAutoCrop</key>
+				<integer>1</integer>
+				<key>PictureBottomCrop</key>
+				<integer>0</integer>
+				<key>PictureDeblock</key>
+				<integer>0</integer>
+				<key>PictureDeinterlace</key>
+				<integer>0</integer>
+				<key>PictureDenoise</key>
+				<integer>0</integer>
+				<key>PictureDetelecine</key>
+				<integer>0</integer>
+				<key>PictureHeight</key>
+				<integer>0</integer>
+				<key>PictureKeepRatio</key>
+				<integer>0</integer>
+				<key>PictureLeftCrop</key>
+				<integer>0</integer>
+				<key>PicturePAR</key>
+				<integer>2</integer>
+				<key>PictureRightCrop</key>
+				<integer>0</integer>
+				<key>PictureTopCrop</key>
+				<integer>0</integer>
+				<key>PictureWidth</key>
+				<integer>1024</integer>
+				<key>PresetDescription</key>
+				<string>HandBrake's preset for the iPad (1st gen) is optimized for viewing on its 1024x768 display.</string>
+				<key>PresetName</key>
+				<string>iPad</string>
+				<key>Subtitles</key>
+				<string>None</string>
+				<key>Type</key>
+				<integer>0</integer>
+				<key>UsesPictureFilters</key>
+				<integer>1</integer>
+				<key>UsesPictureSettings</key>
+				<integer>1</integer>
+				<key>VFR</key>
+				<integer>0</integer>
+				<key>VideoAvgBitrate</key>
+				<string>2500</string>
+				<key>VideoEncoder</key>
+				<string>H.264 (x264)</string>
+				<key>VideoFramerate</key>
+				<string>29.97 (NTSC Video)</string>
+				<key>VideoFrameratePFR</key>
+				<integer>1</integer>
+				<key>VideoGrayScale</key>
+				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>20</real>
+				<key>VideoQualityType</key>
+				<integer>2</integer>
+				<key>VideoTargetSize</key>
+				<string>700</string>
+				<key>VideoTwoPass</key>
+				<integer>0</integer>
+				<key>x264Option</key>
+				<string></string>
+			</dict>
+			<dict>
+				<key>AudioList</key>
+				<array>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AAC (faac)</string>
+						<key>AudioMixdown</key>
+						<string>Dolby Pro Logic II</string>
+						<key>AudioSamplerate</key>
+						<string>Auto</string>
 						<key>AudioTrack</key>
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
@@ -379,7 +464,7 @@
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
 				<key>x264Option</key>
-				<string>cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500</string>
+				<string>cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500</string>
 			</dict>
 		</array>
 		<key>Default</key>
@@ -387,7 +472,7 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2009112101</integer>
+		<integer>2010070201</integer>
 		<key>PresetName</key>
 		<string>Apple</string>
 		<key>Type</key>
@@ -407,7 +492,7 @@
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
-						<string>48</string>
+						<string>Auto</string>
 						<key>AudioTrack</key>
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
@@ -454,12 +539,10 @@
 				<string>None</string>
 				<key>Type</key>
 				<integer>0</integer>
-				<key>UsesMaxPictureSettings</key>
-				<integer>1</integer>
 				<key>UsesPictureFilters</key>
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
-				<integer>1</integer>
+				<integer>2</integer>
 				<key>VFR</key>
 				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
@@ -494,7 +577,7 @@
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
-						<string>48</string>
+						<string>Auto</string>
 						<key>AudioTrack</key>
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
@@ -559,12 +642,10 @@
 				<string>None</string>
 				<key>Type</key>
 				<integer>0</integer>
-				<key>UsesMaxPictureSettings</key>
-				<integer>1</integer>
 				<key>UsesPictureFilters</key>
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
-				<integer>1</integer>
+				<integer>2</integer>
 				<key>VideoAvgBitrate</key>
 				<string>1800</string>
 				<key>VideoEncoder</key>
@@ -592,7 +673,7 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2009112101</integer>
+		<integer>2010070201</integer>
 		<key>PresetName</key>
 		<string>Regular</string>
 		<key>Type</key>
@@ -612,7 +693,7 @@
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
-						<string>48</string>
+						<string>Auto</string>
 						<key>AudioTrack</key>
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
@@ -659,12 +740,10 @@
 				<string>None</string>
 				<key>Type</key>
 				<integer>0</integer>
-				<key>UsesMaxPictureSettings</key>
-				<integer>1</integer>
 				<key>UsesPictureFilters</key>
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
-				<integer>1</integer>
+				<integer>2</integer>
 				<key>VFR</key>
 				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
@@ -697,7 +776,7 @@
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
-						<string>48</string>
+						<string>Auto</string>
 						<key>AudioTrack</key>
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
@@ -760,12 +839,10 @@
 				<string>None</string>
 				<key>Type</key>
 				<integer>0</integer>
-				<key>UsesMaxPictureSettings</key>
-				<integer>1</integer>
 				<key>UsesPictureFilters</key>
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
-				<integer>1</integer>
+				<integer>2</integer>
 				<key>VFR</key>
 				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
@@ -785,7 +862,7 @@
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
 				<key>x264Option</key>
-				<string>ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0</string>
+				<string>ref=1:b-pyramid=none:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0</string>
 			</dict>
 			<dict>
 				<key>AudioList</key>
@@ -798,7 +875,7 @@
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
-						<string>48</string>
+						<string>Auto</string>
 						<key>AudioTrack</key>
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
@@ -847,8 +924,6 @@
 				<string>None</string>
 				<key>Type</key>
 				<integer>0</integer>
-				<key>UsesMaxPictureSettings</key>
-				<integer>0</integer>
 				<key>UsesPictureFilters</key>
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
@@ -885,7 +960,7 @@
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
-						<string>48</string>
+						<string>Auto</string>
 						<key>AudioTrack</key>
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
@@ -934,8 +1009,6 @@
 				<string>None</string>
 				<key>Type</key>
 				<integer>0</integer>
-				<key>UsesMaxPictureSettings</key>
-				<integer>0</integer>
 				<key>UsesPictureFilters</key>
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
@@ -967,7 +1040,7 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2009112101</integer>
+		<integer>2010070201</integer>
 		<key>PresetName</key>
 		<string>Legacy</string>
 		<key>Type</key>