diff options
| -rw-r--r-- | gtk/src/standard_presets.xml | 34 | ||||
| -rw-r--r-- | libhb/encx264.c | 15 | ||||
| -rw-r--r-- | libhb/work.c | 8 | ||||
| -rw-r--r-- | macosx/HBPresets.m | 42 | ||||
| -rw-r--r-- | test/test.c | 70 |
5 files changed, 69 insertions, 100 deletions
diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml index 3653c986a..d44f9421e 100644 --- a/gtk/src/standard_presets.xml +++ b/gtk/src/standard_presets.xml @@ -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> @@ -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> @@ -468,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> @@ -476,7 +472,7 @@ <key>Folder</key> <true/> <key>PresetBuildNumber</key> - <integer>2010061801</integer> + <integer>2010070201</integer> <key>PresetName</key> <string>Apple</string> <key>Type</key> @@ -543,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> @@ -648,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> @@ -681,7 +673,7 @@ <key>Folder</key> <true/> <key>PresetBuildNumber</key> - <integer>2010061801</integer> + <integer>2010070201</integer> <key>PresetName</key> <string>Regular</string> <key>Type</key> @@ -748,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> @@ -849,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> @@ -874,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> @@ -936,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> @@ -1023,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> @@ -1056,7 +1040,7 @@ <key>Folder</key> <true/> <key>PresetBuildNumber</key> - <integer>2010061801</integer> + <integer>2010070201</integer> <key>PresetName</key> <string>Legacy</string> <key>Type</key> diff --git a/libhb/encx264.c b/libhb/encx264.c index 91b53f764..2a3c2b6e2 100644 --- a/libhb/encx264.c +++ b/libhb/encx264.c @@ -123,9 +123,6 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job ) } } - /* Temporary hack to use old b-pyramid default */ - param.i_bframe_pyramid = X264_B_PYRAMID_NONE; - /* Enable metrics */ param.analyse.b_psnr = 1; param.analyse.b_ssim = 1; @@ -221,18 +218,6 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job ) value++; } - if( !( strcmp( name, "b-pyramid" ) ) ) - { - if( value == NULL || !strcmp( value, "1" ) ) - { - value = "normal"; - } - else if( !strcmp( value, "0" ) ) - { - value = "none"; - } - } - /* Here's where the strings are passed to libx264 for parsing. */ ret = x264_param_parse( ¶m, name, value ); diff --git a/libhb/work.c b/libhb/work.c index e9b15d6de..d8fc4d98d 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -525,6 +525,14 @@ static void do_job( hb_job_t * job, int cpu_count ) free( audio ); continue; } + if( audio->config.out.codec != HB_ACODEC_AC3 && + audio->config.out.codec != HB_ACODEC_DCA && + audio->config.out.samplerate > 48000 ) + { + hb_log( "Sample rate %d not supported. Down-sampling to 48kHz.", + audio->config.out.samplerate ); + audio->config.out.samplerate = 48000; + } if ( audio->config.in.codec == HB_ACODEC_FFMPEG ) { if ( aud_id_uses[audio->id] ) diff --git a/macosx/HBPresets.m b/macosx/HBPresets.m index 58e950b58..c810e729a 100644 --- a/macosx/HBPresets.m +++ b/macosx/HBPresets.m @@ -183,7 +183,7 @@ [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"]; /* x264 Option String (We can use this to tweak the appleTV output)*/ - [preset setObject:@"cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500" forKey:@"x264Option"]; + [preset setObject:@"cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500" forKey:@"x264Option"]; /* Video quality */ [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"]; @@ -233,7 +233,7 @@ [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"]; [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"]; [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"]; - [audioTrack1Array setObject:@"48" forKey:@"AudioSamplerate"]; + [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"]; [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"]; [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"]; [audioTrack1Array autorelease]; @@ -276,7 +276,7 @@ [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"]; /*Get the whether or not to apply pic settings in the AddPresetPanel*/ - [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"]; + [preset setObject:[NSNumber numberWithInt:2] forKey:@"UsesPictureSettings"]; /* Get the New Preset Description from the field in the AddPresetPanel */ [preset setObject:@"HandBrake's deprecated settings for the AppleTV, including Dolby Digital 5.1 AC3 sound. Provides a good balance between quality and file size, and optimizes performance. This is the AppleTV preset from HandBrake 0.9.2, and while it is offered as a service to legacy users, it is no longer supported." forKey:@"PresetDescription"]; @@ -294,7 +294,7 @@ [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"]; /* x264 Option String (We can use this to tweak the appleTV output)*/ - [preset setObject:@"ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0" forKey:@"x264Option"]; + [preset setObject:@"ref=1:b-pyramid=none:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0" forKey:@"x264Option"]; /* Video quality */ [preset setObject:[NSNumber numberWithInt:1] forKey:@"VideoQualityType"]; @@ -313,7 +313,6 @@ /* Basic Picture Settings */ /* Use Max Picture settings for whatever the dvd is.*/ - [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesMaxPictureSettings"]; [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureWidth"]; [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"]; [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"]; @@ -344,7 +343,7 @@ [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"]; [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"]; [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"]; - [audioTrack1Array setObject:@"48" forKey:@"AudioSamplerate"]; + [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"]; [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"]; [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"]; [audioTrack1Array autorelease]; @@ -456,7 +455,7 @@ [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"]; [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"]; [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"]; - [audioTrack1Array setObject:@"48" forKey:@"AudioSamplerate"]; + [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"]; [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"]; [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"]; [audioTrack1Array autorelease]; @@ -569,7 +568,7 @@ [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"]; [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"]; [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"]; - [audioTrack1Array setObject:@"48" forKey:@"AudioSamplerate"]; + [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"]; [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"]; [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"]; [audioTrack1Array autorelease]; @@ -598,7 +597,7 @@ [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"]; /*Get the whether or not to apply pic settings in the AddPresetPanel*/ - [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"]; + [preset setObject:[NSNumber numberWithInt:2] forKey:@"UsesPictureSettings"]; /* Get the New Preset Description from the field in the AddPresetPanel */ [preset setObject:@"HandBrake's traditional, faster, lower-quality settings." forKey:@"PresetDescription"]; @@ -632,7 +631,6 @@ /*Picture Settings*/ /* Use Max Picture settings for whatever the dvd is.*/ - [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesMaxPictureSettings"]; [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"]; [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureWidth"]; [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"]; @@ -663,7 +661,7 @@ [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"]; [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"]; [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"]; - [audioTrack1Array setObject:@"48" forKey:@"AudioSamplerate"]; + [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"]; [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"]; [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"]; [audioTrack1Array autorelease]; @@ -692,7 +690,7 @@ [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"]; /*Get the whether or not to apply pic settings in the AddPresetPanel*/ - [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"]; + [preset setObject:[NSNumber numberWithInt:2] forKey:@"UsesPictureSettings"]; /* Get the New Preset Description from the field in the AddPresetPanel */ [preset setObject:@"HandBrake's general-purpose preset for High Profile H.264 video, with all the bells and whistles." forKey:@"PresetDescription"]; @@ -727,7 +725,6 @@ /*Picture Settings*/ /* Use Max Picture settings for whatever the dvd is.*/ - [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesMaxPictureSettings"]; [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"]; [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureWidth"]; [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"]; @@ -759,7 +756,7 @@ [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"]; [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"]; [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"]; - [audioTrack1Array setObject:@"48" forKey:@"AudioSamplerate"]; + [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"]; [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"]; [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"]; [audioTrack1Array autorelease]; @@ -836,7 +833,6 @@ /*Picture Settings*/ /* Use a width of 480 for the iPhone*/ - [preset setObject:[NSNumber numberWithInt:0] forKey:@"UsesMaxPictureSettings"]; [preset setObject:[NSNumber numberWithInt:480] forKey:@"PictureWidth"]; [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"]; [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"]; @@ -867,7 +863,7 @@ [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"]; [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"]; [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"]; - [audioTrack1Array setObject:@"48" forKey:@"AudioSamplerate"]; + [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"]; [audioTrack1Array setObject:@"128" forKey:@"AudioBitrate"]; [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"]; [audioTrack1Array autorelease]; @@ -930,7 +926,6 @@ /*Picture Settings*/ /* Use a width of 480 for the iPhone*/ - [preset setObject:[NSNumber numberWithInt:0] forKey:@"UsesMaxPictureSettings"]; [preset setObject:[NSNumber numberWithInt:480] forKey:@"PictureWidth"]; [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"]; [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"]; @@ -961,7 +956,7 @@ [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"]; [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"]; [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"]; - [audioTrack1Array setObject:@"48" forKey:@"AudioSamplerate"]; + [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"]; [audioTrack1Array setObject:@"128" forKey:@"AudioBitrate"]; [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"]; [audioTrack1Array autorelease]; @@ -1024,7 +1019,6 @@ /*Picture Settings*/ /* Use a width of 640 for iPod TV-out */ - [preset setObject:[NSNumber numberWithInt:0] forKey:@"UsesMaxPictureSettings"]; [preset setObject:[NSNumber numberWithInt:640] forKey:@"PictureWidth"]; [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"]; [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"]; @@ -1055,7 +1049,7 @@ [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"]; [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"]; [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"]; - [audioTrack1Array setObject:@"48" forKey:@"AudioSamplerate"]; + [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"]; [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"]; [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"]; [audioTrack1Array autorelease]; @@ -1118,7 +1112,6 @@ /*Picture Settings*/ /* Use a width of 320 for the iPod screen */ - [preset setObject:[NSNumber numberWithInt:0] forKey:@"UsesMaxPictureSettings"]; [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"]; [preset setObject:[NSNumber numberWithInt:320] forKey:@"PictureWidth"]; [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"]; @@ -1149,7 +1142,7 @@ [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"]; [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"]; [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"]; - [audioTrack1Array setObject:@"48" forKey:@"AudioSamplerate"]; + [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"]; [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"]; [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"]; [audioTrack1Array autorelease]; @@ -1178,7 +1171,7 @@ [preset setObject:[NSNumber numberWithInt:1] forKey:@"Default"]; /*Get the whether or not to apply pic settings in the AddPresetPanel*/ - [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"]; + [preset setObject:[NSNumber numberWithInt:2] forKey:@"UsesPictureSettings"]; /* Get the New Preset Description from the field in the AddPresetPanel */ [preset setObject:@"HandBrake's normal, default settings." forKey:@"PresetDescription"]; @@ -1213,7 +1206,6 @@ /*Picture Settings*/ /* Use Max Picture settings for whatever the dvd is.*/ - [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesMaxPictureSettings"]; [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"]; [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureWidth"]; [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"]; @@ -1244,7 +1236,7 @@ [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"]; [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"]; [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"]; - [audioTrack1Array setObject:@"48" forKey:@"AudioSamplerate"]; + [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"]; [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"]; [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"]; [audioTrack1Array autorelease]; diff --git a/test/test.c b/test/test.c index 4e190874f..34daa7377 100644 --- a/test/test.c +++ b/test/test.c @@ -626,7 +626,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !arates ) { - arates = strdup("48,Auto"); + arates = strdup("Auto,Auto"); } if( !dynamic_range_compression ) { @@ -642,7 +642,7 @@ static int HandleEvents( hb_handle_t * h ) anamorphic_mode = 2; } job->chapter_markers = 1; - + } if (!strcmp(preset_name, "iPod")) @@ -672,7 +672,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !arates ) { - arates = strdup("48"); + arates = strdup("Auto"); } if( !dynamic_range_compression ) { @@ -684,7 +684,7 @@ static int HandleEvents( hb_handle_t * h ) x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0"); } job->chapter_markers = 1; - + } if (!strcmp(preset_name, "iPhone & iPod Touch")) @@ -713,7 +713,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !arates ) { - arates = strdup("48"); + arates = strdup("Auto"); } if( !dynamic_range_compression ) { @@ -725,7 +725,7 @@ static int HandleEvents( hb_handle_t * h ) x264opts = strdup("cabac=0:ref=2:me=umh:bframes=0:subme=6:8x8dct=0:trellis=0"); } job->chapter_markers = 1; - + } if (!strcmp(preset_name, "iPad")) @@ -757,7 +757,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !arates ) { - arates = strdup("48"); + arates = strdup("Auto"); } if( !dynamic_range_compression ) { @@ -769,7 +769,7 @@ static int HandleEvents( hb_handle_t * h ) anamorphic_mode = 2; } job->chapter_markers = 1; - + } if (!strcmp(preset_name, "AppleTV")) @@ -799,7 +799,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !arates ) { - arates = strdup("48,Auto"); + arates = strdup("Auto,Auto"); } if( !dynamic_range_compression ) { @@ -808,14 +808,14 @@ static int HandleEvents( hb_handle_t * h ) maxWidth = 960; if( !x264opts ) { - x264opts = strdup("cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500"); + x264opts = strdup("cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500"); } if( !anamorphic_mode ) { anamorphic_mode = 2; } job->chapter_markers = 1; - + } if (!strcmp(preset_name, "Normal")) @@ -844,7 +844,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !arates ) { - arates = strdup("48"); + arates = strdup("Auto"); } if( !dynamic_range_compression ) { @@ -859,7 +859,7 @@ static int HandleEvents( hb_handle_t * h ) anamorphic_mode = 1; } job->chapter_markers = 1; - + } if (!strcmp(preset_name, "High Profile")) @@ -888,7 +888,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !arates ) { - arates = strdup("48,Auto"); + arates = strdup("Auto,Auto"); } if( !dynamic_range_compression ) { @@ -905,7 +905,7 @@ static int HandleEvents( hb_handle_t * h ) anamorphic_mode = 2; } job->chapter_markers = 1; - + } if (!strcmp(preset_name, "Classic")) @@ -933,13 +933,13 @@ static int HandleEvents( hb_handle_t * h ) } if( !arates ) { - arates = strdup("48"); + arates = strdup("Auto"); } if( !dynamic_range_compression ) { dynamic_range_compression = strdup("0.0"); } - + } if (!strcmp(preset_name, "AppleTV Legacy")) @@ -969,7 +969,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !arates ) { - arates = strdup("48,Auto"); + arates = strdup("Auto,Auto"); } if( !dynamic_range_compression ) { @@ -977,14 +977,14 @@ static int HandleEvents( hb_handle_t * h ) } if( !x264opts ) { - x264opts = strdup("ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0"); + x264opts = strdup("ref=1:b-pyramid=none:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0"); } if( !anamorphic_mode ) { anamorphic_mode = 1; } job->chapter_markers = 1; - + } if (!strcmp(preset_name, "iPhone Legacy")) @@ -1014,7 +1014,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !arates ) { - arates = strdup("48"); + arates = strdup("Auto"); } if( !dynamic_range_compression ) { @@ -1026,7 +1026,7 @@ static int HandleEvents( hb_handle_t * h ) x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:subme=6:8x8dct=0:trellis=0"); } job->chapter_markers = 1; - + } if (!strcmp(preset_name, "iPod Legacy")) @@ -1056,7 +1056,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !arates ) { - arates = strdup("48"); + arates = strdup("Auto"); } if( !dynamic_range_compression ) { @@ -1068,7 +1068,7 @@ static int HandleEvents( hb_handle_t * h ) x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0"); } job->chapter_markers = 1; - + } } @@ -2498,35 +2498,35 @@ static void ShowPresets() { printf("\n< Apple\n"); - printf("\n + Universal: -e x264 -q 20.0 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R 48,Auto -D 0.0,0.0 -f mp4 -X 720 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:bframes=0:8x8dct=0:trellis=0:subme=6\n"); + printf("\n + Universal: -e x264 -q 20.0 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -X 720 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:bframes=0:8x8dct=0:trellis=0:subme=6\n"); - printf("\n + iPod: -e x264 -b 700 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4 -I -X 320 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0\n"); + printf("\n + iPod: -e x264 -b 700 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 320 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0\n"); - printf("\n + iPhone & iPod Touch: -e x264 -q 20.0 -a 1 -E faac -B 128 -6 dpl2 -R 48 -D 0.0 -f mp4 -X 480 -m -x cabac=0:ref=2:me=umh:bframes=0:subme=6:8x8dct=0:trellis=0\n"); + printf("\n + iPhone & iPod Touch: -e x264 -q 20.0 -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 -f mp4 -X 480 -m -x cabac=0:ref=2:me=umh:bframes=0:subme=6:8x8dct=0:trellis=0\n"); - printf("\n + iPad: -e x264 -q 20.0 -r 29.97 --pfr -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4 -4 -X 1024 --loose-anamorphic -m\n"); + printf("\n + iPad: -e x264 -q 20.0 -r 29.97 --pfr -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -4 -X 1024 --loose-anamorphic -m\n"); - printf("\n + AppleTV: -e x264 -q 20.0 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R 48,Auto -D 0.0,0.0 -f mp4 -4 -X 960 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n"); + printf("\n + AppleTV: -e x264 -q 20.0 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 960 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n"); printf("\n>\n"); printf("\n< Regular\n"); - printf("\n + Normal: -e x264 -q 20.0 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4 --strict-anamorphic -m -x ref=2:bframes=2:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0\n"); + printf("\n + Normal: -e x264 -q 20.0 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 --strict-anamorphic -m -x ref=2:bframes=2:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0\n"); - printf("\n + High Profile: -e x264 -q 20.0 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R 48,Auto -D 0.0,0.0 -f mp4 --detelecine --decomb --loose-anamorphic -m -x b-adapt=2:rc-lookahead=50\n"); + printf("\n + High Profile: -e x264 -q 20.0 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 --detelecine --decomb --loose-anamorphic -m -x b-adapt=2:rc-lookahead=50\n"); printf("\n>\n"); printf("\n< Legacy\n"); - printf("\n + Classic: -b 1000 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4\n"); + printf("\n + Classic: -b 1000 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4\n"); - printf("\n + AppleTV Legacy: -e x264 -b 2500 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R 48,Auto -D 0.0,0.0 -f mp4 -4 --strict-anamorphic -m -x ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0\n"); + printf("\n + AppleTV Legacy: -e x264 -b 2500 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 --strict-anamorphic -m -x ref=1:b-pyramid=none:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0\n"); - printf("\n + iPhone Legacy: -e x264 -b 960 -a 1 -E faac -B 128 -6 dpl2 -R 48 -D 0.0 -f mp4 -I -X 480 -m -x level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:subme=6:8x8dct=0:trellis=0\n"); + printf("\n + iPhone Legacy: -e x264 -b 960 -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 480 -m -x level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:subme=6:8x8dct=0:trellis=0\n"); - printf("\n + iPod Legacy: -e x264 -b 1500 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4 -I -X 640 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0\n"); + printf("\n + iPod Legacy: -e x264 -b 1500 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 640 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0\n"); printf("\n>\n"); |