Use 64-bit MP4 containers for the AppleTV preset, in case the 2500kb/s video and...

git-svn-id: svn://localhost/HandBrake/trunk@1291 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/HBPresets.m b/macosx/HBPresets.m
index 2fe9104..8ef02b8 100644 (file)
--- a/macosx/HBPresets.m
+++ b/macosx/HBPresets.m
@@ -243,6 +243,9 @@
     /* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
 
+    /* 64-bit MP4 file */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
+
     /* Chapter Markers*/
      [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
 

diff --git a/scripts/manicure.rb b/scripts/manicure.rb
index 4ba092b..55a4e64 100755 (executable)
--- a/scripts/manicure.rb
+++ b/scripts/manicure.rb
@@ -342,6 +342,11 @@ class Display
       commandString << " -I"
     end
     
+    # 64-bit files
+    if hash["Mp4LargeFile"].to_i == 1
+      commandString << " -4"
+    end
+    
     #Cropping
     if !hash["PictureAutoCrop"].to_i
       commandString << " --crop "
@@ -483,6 +488,11 @@ class Display
       commandString << " -I"
     end
     
+    # 64-bit files
+    if hash["Mp4LargeFile"].to_i == 1
+      commandString << " -4"
+    end
+    
     #Cropping
     if !hash["PictureAutoCrop"].to_i
       commandString << " --crop "
@@ -581,6 +591,11 @@ class Display
       commandString << "job->ipod_atom = 1;\n   "
     end
     
+    # 64-bit files
+    if hash["Mp4LargeFile"].to_i == 1
+      commandString << "job->largeFileSize = 1;\n"
+    end
+    
     #Video encoder
     if hash["VideoEncoder"] != "FFmpeg"
       commandString << "vcodec = "
@@ -803,6 +818,11 @@ class Display
       commandString << " -I"
     end
     
+    # 64-bit files
+    if hash["Mp4LargeFile"].to_i == 1
+      commandString << " -4"
+    end
+    
     #Cropping
     if !hash["PictureAutoCrop"].to_i
       commandString << " --crop "

diff --git a/test/test.c b/test/test.c
index 97eee5d..08bd193 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -424,6 +424,7 @@ static int HandleEvents( hb_handle_t * h )
                 if (!strcmp(preset_name, "AppleTV"))
                 {
                     mux = HB_MUX_MP4;
+                    job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vbitrate = 2500;
                     job->abitrate = 160;
@@ -1254,7 +1255,7 @@ static void ShowPresets()
 {
     printf("\n+ Animation:  -e x264 -b 1000 -B 160 -R 48 -E faac -f mkv --deinterlace=\"slower\" -m -p -2 -T -x ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2\n");
 
-    printf("\n+ AppleTV:  -e x264 -b 2500 -B 160 -R 48 -E aac+ac3 -f mp4 -m -p -x bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=1:cabac=0\n");
+    printf("\n+ AppleTV:  -e x264 -b 2500 -B 160 -R 48 -E aac+ac3 -f mp4 -4 -m -p -x bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=1:cabac=0\n");
 
     printf("\n+ Bedlam:  -e x264 -b 1800 -E ac3 -f mkv -m -p -2 -T -x ref=16:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fast-pskip:no-dct-decimate:filter=-2,-1\n");