eliminate job->largeFileSize

It is no longer needed since we eliminated mp4v2 support

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6647 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 4a0afea64418daea4da59927335a310f5c59e41c..4dae08a23d3b07a04253b239ee7c96a8c5015f04 100644 (file)
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -979,8 +979,7 @@ update_title_duration(signal_user_data_t *ud)
 
 void ghb_show_container_options(signal_user_data_t *ud)
 {
-    GtkWidget *w1, *w2, *w3;
-    w1 = GHB_WIDGET(ud->builder, "Mp4LargeFile");
+    GtkWidget *w2, *w3;
     w2 = GHB_WIDGET(ud->builder, "Mp4HttpOptimize");
     w3 = GHB_WIDGET(ud->builder, "Mp4iPodCompatible");
 
@@ -992,7 +991,6 @@ void ghb_show_container_options(signal_user_data_t *ud)
 
     gint enc = ghb_settings_video_encoder_codec(ud->settings, "VideoEncoder");
 
-    gtk_widget_set_visible(w1, (mux->format == HB_MUX_MP4V2));
     gtk_widget_set_visible(w2, (mux->format & HB_MUX_MASK_MP4));
     gtk_widget_set_visible(w3, (mux->format & HB_MUX_MASK_MP4) &&
                                (enc == HB_VCODEC_X264));

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 10cd30d60d0b3a6fa4280df49f2ff3072e1d544f..fd04f008a4cf624fa09667b241e21f375425e7ec 100644 (file)
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -1479,7 +1479,7 @@ This is often the feature title of a DVD.</property>
                                 <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
                               </object>
                               <packing>
-                                <property name="top_attach">0</property>
+                                <property name="top_attach">1</property>
                                 <property name="left_attach">1</property>
                                 <property name="width">1</property>
                                 <property name="height">1</property>
@@ -1505,27 +1505,6 @@ This allows a player to initiate playback before downloading the entire file.</p
                                 <property name="height">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkCheckButton" id="Mp4LargeFile">
-                                <property name="label" translatable="yes">Large file (&gt;4GB)</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="tooltip_markup" translatable="yes">Allow 64 bit MP4 file which can be over 4GB.
-
-&lt;b&gt;Caution:&lt;/b&gt; This option may break device compatibility.</property>
-                                <property name="halign">start</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="left_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index d7a56155ed74c96f7686312bf7266e9a9a78bd8b..f84049b1f16d6ad62241d587eadb146100e4f1ee 100644 (file)
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -4210,12 +4210,10 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, int titleindex)
     job->mux = mux->format;
     if (job->mux & HB_MUX_MASK_MP4)
     {
-        job->largeFileSize = ghb_settings_get_boolean(js, "Mp4LargeFile");
         job->mp4_optimize = ghb_settings_get_boolean(js, "Mp4HttpOptimize");
     }
     else
     {
-        job->largeFileSize = FALSE;
         job->mp4_optimize = FALSE;
     }
     if (!job->start_at_preview)

diff --git a/gtk/src/internal_defaults.xml b/gtk/src/internal_defaults.xml
index fe817a7ff9c5476020f0f6680ee6878f2c310aec..3a71a1c016f91c2416d2a6380385f475b30e31b9 100644 (file)
--- a/gtk/src/internal_defaults.xml
+++ b/gtk/src/internal_defaults.xml
@@ -278,8 +278,6 @@
         <false />
         <key>PictureKeepRatio</key>
         <true />
-        <key>Mp4LargeFile</key>
-        <false />
         <key>AudioAllowMP3Pass</key>
         <true />
         <key>AudioAllowAACPass</key>

diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 69adc81b2fb9189da9847e4cc34187a24a23fc82..021c569130696e2bb60ff458f5af87ffa6934afc 100644 (file)
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -197,14 +197,13 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
 
     // Next line in the display (Container options)
     // Container Options: - Chapter Markers
-    gboolean ipod = FALSE, http = FALSE, large = FALSE;
+    gboolean ipod = FALSE, http = FALSE;
     if (mux->format & HB_MUX_MASK_MP4)
     {
         ipod = ghb_settings_get_boolean(settings, "Mp4iPodCompatible");
         http = ghb_settings_get_boolean(settings, "Mp4HttpOptimize");
-        large = ghb_settings_get_boolean(settings, "Mp4LargeFile");
     }
-    if (http || ipod || large || markers)
+    if (http || ipod || markers)
     {
         const char *prefix = " ";
         XPRINT(_("<b>Container Options:</b><small>"));
@@ -223,11 +222,6 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
             XPRINT(_("%sWeb Optimized"), prefix);
             prefix = " - ";
         }
-        if (large)
-        {
-            XPRINT(_("%sLarge File Size (>4GB)"), prefix);
-            prefix = " - ";
-        }
         XPRINT("</small>\n");
     }
 

diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index ed6ceafea0e5c8dda456ceaa877c010238834159..066dd36682b0e2e8160b22f9f786f529a2e98714 100644 (file)
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -63,8 +63,6 @@
                                <false/>
                                <key>Mp4HttpOptimize</key>
                                <integer>0</integer>
-                               <key>Mp4LargeFile</key>
-                               <integer>0</integer>
                                <key>Mp4iPodCompatible</key>
                                <integer>0</integer>
                                <key>PictureAutoCrop</key>
@@ -194,8 +192,6 @@
                                <false/>
                                <key>Mp4HttpOptimize</key>
                                <integer>0</integer>
-                               <key>Mp4LargeFile</key>
-                               <integer>0</integer>
                                <key>Mp4iPodCompatible</key>
                                <integer>1</integer>
                                <key>PictureAutoCrop</key>
@@ -325,8 +321,6 @@
                                <false/>
                                <key>Mp4HttpOptimize</key>
                                <integer>0</integer>
-                               <key>Mp4LargeFile</key>
-                               <integer>1</integer>
                                <key>Mp4iPodCompatible</key>
                                <integer>0</integer>
                                <key>PictureAutoCrop</key>
@@ -456,8 +450,6 @@
                                <false/>
                                <key>Mp4HttpOptimize</key>
                                <integer>0</integer>
-                               <key>Mp4LargeFile</key>
-                               <integer>1</integer>
                                <key>Mp4iPodCompatible</key>
                                <integer>0</integer>
                                <key>PictureAutoCrop</key>
@@ -603,8 +595,6 @@
                                <false/>
                                <key>Mp4HttpOptimize</key>
                                <integer>0</integer>
-                               <key>Mp4LargeFile</key>
-                               <integer>1</integer>
                                <key>Mp4iPodCompatible</key>
                                <integer>0</integer>
                                <key>PictureAutoCrop</key>
@@ -750,8 +740,6 @@
                                <false/>
                                <key>Mp4HttpOptimize</key>
                                <integer>0</integer>
-                               <key>Mp4LargeFile</key>
-                               <integer>1</integer>
                                <key>Mp4iPodCompatible</key>
                                <integer>0</integer>
                                <key>PictureAutoCrop</key>
@@ -897,8 +885,6 @@
                                <false/>
                                <key>Mp4HttpOptimize</key>
                                <integer>0</integer>
-                               <key>Mp4LargeFile</key>
-                               <integer>1</integer>
                                <key>Mp4iPodCompatible</key>
                                <integer>0</integer>
                                <key>PictureAutoCrop</key>
@@ -1028,8 +1014,6 @@
                                <false/>
                                <key>Mp4HttpOptimize</key>
                                <integer>0</integer>
-                               <key>Mp4LargeFile</key>
-                               <integer>0</integer>
                                <key>Mp4iPodCompatible</key>
                                <integer>0</integer>
                                <key>PictureAutoCrop</key>
@@ -1159,8 +1143,6 @@
                                <false/>
                                <key>Mp4HttpOptimize</key>
                                <integer>0</integer>
-                               <key>Mp4LargeFile</key>
-                               <integer>0</integer>
                                <key>Mp4iPodCompatible</key>
                                <integer>0</integer>
                                <key>PictureAutoCrop</key>
@@ -1290,8 +1272,6 @@
                                <false/>
                                <key>Mp4HttpOptimize</key>
                                <integer>0</integer>
-                               <key>Mp4LargeFile</key>
-                               <integer>0</integer>
                                <key>Mp4iPodCompatible</key>
                                <integer>0</integer>
                                <key>PictureAutoCrop</key>
@@ -1436,8 +1416,6 @@
                                <false/>
                                <key>Mp4HttpOptimize</key>
                                <integer>0</integer>
-                               <key>Mp4LargeFile</key>
-                               <integer>0</integer>
                                <key>Mp4iPodCompatible</key>
                                <integer>0</integer>
                                <key>PictureAutoCrop</key>
@@ -1583,8 +1561,6 @@
                                <false/>
                                <key>Mp4HttpOptimize</key>
                                <integer>0</integer>
-                               <key>Mp4LargeFile</key>
-                               <integer>1</integer>
                                <key>Mp4iPodCompatible</key>
                                <integer>0</integer>
                                <key>PictureAutoCrop</key>

diff --git a/libhb/common.h b/libhb/common.h
index a932a07a8ad170fbd172ed58d06d898f31139946..f4d25dcf6509b8b80c88b3bc9614ae1ae305635f 100644 (file)
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -555,8 +555,6 @@ struct hb_job_s
     int             mux;
     char          * file;
 
-    /* Allow MP4 files > 4 gigs */
-    int             largeFileSize;
     int             mp4_optimize;
     int             ipod_atom;
 

diff --git a/libhb/hb_json.c b/libhb/hb_json.c
index 236f3af81975c0475a5882f5a289d688409388d3..70160436eaf01d73acc59034fad93d6bbefc7062 100644 (file)
--- a/libhb/hb_json.c
+++ b/libhb/hb_json.c
@@ -431,9 +431,8 @@ char* hb_job_to_json( const hb_job_t * job )
     if (job->mux & HB_MUX_MASK_MP4)
     {
         json_t *mp4_dict;
-        mp4_dict = json_pack_ex(&error, 0, "{s:o, s:o, s:o}",
+        mp4_dict = json_pack_ex(&error, 0, "{s:o, s:o}",
             "Mp4Optimize",      json_boolean(job->mp4_optimize),
-            "LargeFileSize",    json_boolean(job->largeFileSize),
             "IpodAtom",         json_boolean(job->ipod_atom));
         json_object_set_new(dest_dict, "Mp4Options", mp4_dict);
     }
@@ -707,8 +706,8 @@ hb_job_t* hb_json_to_job( hb_handle_t * h, const char * json_job )
     "{"
     "s:i,"
     // Destination {File, Mux, ChapterMarkers, Mp4Options {
-    //                          Mp4Optimize, LargeFileSize, IpodAtom}
-    "s:{s?s, s:i, s:b s?{s?b, s?b, s?b}},"
+    //                          Mp4Optimize, IpodAtom}
+    "s:{s?s, s:i, s:b s?{s?b, s?b}},"
     // Source {Angle, Range {ChapterStart, ChapterEnd, PtsToStart, PtsToStop,
     //                  FrameToStart, FrameToStop, StartAtPreview, SeekPoints}
     "s:{s?i, s:{s?i, s?i, s?I, s?I, s?i, s?i, s?i, s?i}},"
@@ -734,7 +733,6 @@ hb_job_t* hb_json_to_job( hb_handle_t * h, const char * json_job )
             "ChapterMarkers",       unpack_b(&job->chapter_markers),
             "Mp4Options",
                 "Mp4Optimize",      unpack_b(&job->mp4_optimize),
-                "LargeFileSize",    unpack_b(&job->largeFileSize),
                 "IpodAtom",         unpack_b(&job->ipod_atom),
         "Source",
             "Angle",                unpack_i(&job->angle),

diff --git a/libhb/work.c b/libhb/work.c
index 7b135c85a31dd5333dbcb2e3e3c08ac059bcbd92..4825a1db486a9f1076000b73b2233329a71b937e 100644 (file)
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -213,9 +213,6 @@ void hb_display_job_info(hb_job_t *job)
     hb_log("   + container: %s", hb_container_get_long_name(job->mux));
     switch (job->mux)
     {
-        case HB_MUX_MP4V2:
-            if (job->largeFileSize)
-                hb_log("     + 64-bit chunk offsets");
         case HB_MUX_AV_MP4:
             if (job->mp4_optimize)
                 hb_log("     + optimized for HTTP streaming (fast start)");

diff --git a/macosx/HBPresetsManager.m b/macosx/HBPresetsManager.m
index 53f74d3e5e3b4627c96177eb0655902d08281465..34a80723ba9e72d0229d58476f8c64c889a8ff12 100644 (file)
--- a/macosx/HBPresetsManager.m
+++ b/macosx/HBPresetsManager.m
@@ -450,7 +450,6 @@ NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
     
     /* Container format and related settings */
     preset[@"FileFormat"] = @"MP4 file";
-    preset[@"Mp4LargeFile"] = @0;
     preset[@"Mp4HttpOptimize"] = @0;
     preset[@"Mp4iPodCompatible"] = @0;
     
@@ -564,7 +563,6 @@ NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
     
     /* Container format and related settings */
     preset[@"FileFormat"] = @"MP4 file";
-    preset[@"Mp4LargeFile"] = @0;
     preset[@"Mp4HttpOptimize"] = @0;
     preset[@"Mp4iPodCompatible"] = @1;
     
@@ -667,7 +665,6 @@ NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
     
     /* Container format and related settings */
     preset[@"FileFormat"] = @"MP4 file";
-    preset[@"Mp4LargeFile"] = @1;
     preset[@"Mp4HttpOptimize"] = @0;
     preset[@"Mp4iPodCompatible"] = @0;
     
@@ -770,7 +767,6 @@ NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
     
     /* Container format and related settings */
     preset[@"FileFormat"] = @"MP4 file";
-    preset[@"Mp4LargeFile"] = @1;
     preset[@"Mp4HttpOptimize"] = @0;
     preset[@"Mp4iPodCompatible"] = @0;
     
@@ -873,7 +869,6 @@ NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
     
     /* Container format and related settings */
     preset[@"FileFormat"] = @"MP4 file";
-    preset[@"Mp4LargeFile"] = @1;
     preset[@"Mp4HttpOptimize"] = @0;
     preset[@"Mp4iPodCompatible"] = @0;
     
@@ -987,7 +982,6 @@ NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
     
     /* Container format and related settings */
     preset[@"FileFormat"] = @"MP4 file";
-    preset[@"Mp4LargeFile"] = @1;
     preset[@"Mp4HttpOptimize"] = @0;
     preset[@"Mp4iPodCompatible"] = @0;
     
@@ -1101,7 +1095,6 @@ NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
     
     /* Container format and related settings */
     preset[@"FileFormat"] = @"MP4 file";
-    preset[@"Mp4LargeFile"] = @1;
     preset[@"Mp4HttpOptimize"] = @0;
     preset[@"Mp4iPodCompatible"] = @0;
     
@@ -1215,7 +1208,6 @@ NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
     
     /* Container format and related settings */
     preset[@"FileFormat"] = @"MP4 file";
-    preset[@"Mp4LargeFile"] = @0;
     preset[@"Mp4HttpOptimize"] = @0;
     preset[@"Mp4iPodCompatible"] = @0;
     
@@ -1318,7 +1310,6 @@ NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
     
     /* Container format and related settings */
     preset[@"FileFormat"] = @"MP4 file";
-    preset[@"Mp4LargeFile"] = @0;
     preset[@"Mp4HttpOptimize"] = @0;
     preset[@"Mp4iPodCompatible"] = @0;
     
@@ -1421,7 +1412,6 @@ NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
     
     /* Container format and related settings */
     preset[@"FileFormat"] = @"MP4 file";
-    preset[@"Mp4LargeFile"] = @0;
     preset[@"Mp4HttpOptimize"] = @0;
     preset[@"Mp4iPodCompatible"] = @0;
     
@@ -1524,7 +1514,6 @@ NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
     
     /* Container format and related settings */
     preset[@"FileFormat"] = @"MP4 file";
-    preset[@"Mp4LargeFile"] = @0;
     preset[@"Mp4HttpOptimize"] = @0;
     preset[@"Mp4iPodCompatible"] = @0;
     
@@ -1627,7 +1616,6 @@ NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
     
     /* Container format and related settings */
     preset[@"FileFormat"] = @"MP4 file";
-    preset[@"Mp4LargeFile"] = @1;
     preset[@"Mp4HttpOptimize"] = @0;
     preset[@"Mp4iPodCompatible"] = @0;
     

diff --git a/scripts/manicure.rb b/scripts/manicure.rb
index d4afb3ed2324b9c14079588c14e996a7ea6a8822..6764a3e1fe128076deb8510bed96a0894875ea11 100755 (executable)
--- a/scripts/manicure.rb
+++ b/scripts/manicure.rb
@@ -508,11 +508,6 @@ class Display
       commandString << " -I"
     end
     
-    # 64-bit files
-    if hash["Mp4LargeFile"] == 1
-      commandString << " -4"
-    end
-    
     #MP4 Optimize for HTTP Streaming
     if hash["Mp4HttpOptimize"].to_i == 1
       commandString << " -O"
@@ -912,11 +907,6 @@ class Display
       commandString << " -I"
     end
     
-    # 64-bit files
-    if hash["Mp4LargeFile"] == 1
-      commandString << " -4"
-    end
-    
     #MP4 Optimize for HTTP Streaming
     if hash["Mp4HttpOptimize"].to_i == 1
       commandString << " -O"
@@ -1081,11 +1071,6 @@ class Display
       commandString << "job->ipod_atom = 1;\n    "
     end
     
-    # 64-bit files
-    if hash["Mp4LargeFile"] == 1
-      commandString << "job->largeFileSize = 1;\n    "
-    end
-    
     #MP4 Optimize for HTTP Streaming
     if hash["Mp4HttpOptimize"].to_i == 1
       commandString << "job->mp4_optimize = 1;\n    "
@@ -1774,11 +1759,6 @@ class Display
       commandString << " -I"
     end
     
-    # 64-bit files
-    if hash["Mp4LargeFile"] == 1
-      commandString << " -4"
-    end
-    
     #MP4 Optimize for HTTP Streaming
     if hash["Mp4HttpOptimize"].to_i == 1
       commandString << " -O"

diff --git a/test/test.c b/test/test.c
index 65708378b3d27990004b1ef74974fd6066abeb63..67cf4c301b0074206683ea12fc5b3b5028c2f31b 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -129,7 +129,6 @@ static char * h264_level    = NULL;
 static int    maxHeight     = 0;
 static int    maxWidth      = 0;
 static int    turbo_opts_enabled = 0;
-static int    largeFileSize = 0;
 static int    preset        = 0;
 static char * preset_name   = 0;
 static int    cfr           = 0;
@@ -924,7 +923,6 @@ static int HandleEvents( hb_handle_t * h )
                     {
                         mux = HB_MUX_MP4;
                     }
-                    job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 22.0;
                     filter_vrate.den = 900000;
@@ -994,7 +992,6 @@ static int HandleEvents( hb_handle_t * h )
                     {
                         mux = HB_MUX_MP4;
                     }
-                    job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
                     filter_vrate.den = 900000;
@@ -1064,7 +1061,6 @@ static int HandleEvents( hb_handle_t * h )
                     {
                         mux = HB_MUX_MP4;
                     }
-                    job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
                     filter_vrate.den = 900000;
@@ -1138,7 +1134,6 @@ static int HandleEvents( hb_handle_t * h )
                     {
                         mux = HB_MUX_MP4;
                     }
-                    job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
                     filter_vrate.den = 900000;
@@ -1208,7 +1203,6 @@ static int HandleEvents( hb_handle_t * h )
                     {
                         mux = HB_MUX_MP4;
                     }
-                    job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
                     filter_vrate.den = 900000;
@@ -1549,7 +1543,6 @@ static int HandleEvents( hb_handle_t * h )
                     {
                         mux = HB_MUX_MP4;
                     }
-                    job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
                     if( !atracks )
@@ -1834,10 +1827,6 @@ static int HandleEvents( hb_handle_t * h )
                 job->mux = mux;
             }
             // then, muxer options
-            if (largeFileSize)
-            {
-                job->largeFileSize = 1;
-            }
             if (mp4_optimize)
             {
                 job->mp4_optimize = 1;
@@ -3648,7 +3637,6 @@ static int ParseOptions( int argc, char ** argv )
             { "format",      required_argument, NULL,    'f' },
             { "input",       required_argument, NULL,    'i' },
             { "output",      required_argument, NULL,    'o' },
-            { "large-file",  no_argument,       NULL,    '4' },
             { "optimize",    no_argument,       NULL,    'O' },
             { "ipod-atom",   no_argument,       NULL,    'I' },
             { "use-opencl",  no_argument,       NULL,    'P' },
@@ -3821,9 +3809,6 @@ static int ParseOptions( int argc, char ** argv )
             case 'o':
                 output = strdup( optarg );
                 break;
-            case '4':
-                largeFileSize = 1;
-                break;
             case 'O':
                 mp4_optimize = 1;
                 break;