From 2f8e8b63af1a896d4d15b48ee46a09ca1e061583 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Tue, 23 Dec 2014 22:08:10 +0000 Subject: [PATCH] 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 --- gtk/src/callbacks.c | 4 +--- gtk/src/ghb.ui | 23 +---------------------- gtk/src/hb-backend.c | 2 -- gtk/src/internal_defaults.xml | 2 -- gtk/src/queuehandler.c | 10 ++-------- gtk/src/standard_presets.xml | 24 ------------------------ libhb/common.h | 2 -- libhb/hb_json.c | 8 +++----- libhb/work.c | 3 --- macosx/HBPresetsManager.m | 12 ------------ scripts/manicure.rb | 20 -------------------- test/test.c | 15 --------------- 12 files changed, 7 insertions(+), 118 deletions(-) diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index 4a0afea64..4dae08a23 100644 --- 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 10cd30d60..fd04f008a 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -1479,7 +1479,7 @@ This is often the feature title of a DVD. - 0 + 1 1 1 1 @@ -1505,27 +1505,6 @@ This allows a player to initiate playback before downloading the entire file.

1 - - - Large file (>4GB) - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Allow 64 bit MP4 file which can be over 4GB. - -<b>Caution:</b> This option may break device compatibility. - start - True - - - - 1 - 1 - 1 - 1 - - False diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index d7a56155e..f84049b1f 100644 --- 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 fe817a7ff..3a71a1c01 100644 --- a/gtk/src/internal_defaults.xml +++ b/gtk/src/internal_defaults.xml @@ -278,8 +278,6 @@ PictureKeepRatio - Mp4LargeFile - AudioAllowMP3Pass AudioAllowAACPass diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c index 69adc81b2..021c56913 100644 --- 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(_("Container Options:")); @@ -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("\n"); } diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml index ed6ceafea..066dd3668 100644 --- a/gtk/src/standard_presets.xml +++ b/gtk/src/standard_presets.xml @@ -63,8 +63,6 @@ Mp4HttpOptimize 0 - Mp4LargeFile - 0 Mp4iPodCompatible 0 PictureAutoCrop @@ -194,8 +192,6 @@ Mp4HttpOptimize 0 - Mp4LargeFile - 0 Mp4iPodCompatible 1 PictureAutoCrop @@ -325,8 +321,6 @@ Mp4HttpOptimize 0 - Mp4LargeFile - 1 Mp4iPodCompatible 0 PictureAutoCrop @@ -456,8 +450,6 @@ Mp4HttpOptimize 0 - Mp4LargeFile - 1 Mp4iPodCompatible 0 PictureAutoCrop @@ -603,8 +595,6 @@ Mp4HttpOptimize 0 - Mp4LargeFile - 1 Mp4iPodCompatible 0 PictureAutoCrop @@ -750,8 +740,6 @@ Mp4HttpOptimize 0 - Mp4LargeFile - 1 Mp4iPodCompatible 0 PictureAutoCrop @@ -897,8 +885,6 @@ Mp4HttpOptimize 0 - Mp4LargeFile - 1 Mp4iPodCompatible 0 PictureAutoCrop @@ -1028,8 +1014,6 @@ Mp4HttpOptimize 0 - Mp4LargeFile - 0 Mp4iPodCompatible 0 PictureAutoCrop @@ -1159,8 +1143,6 @@ Mp4HttpOptimize 0 - Mp4LargeFile - 0 Mp4iPodCompatible 0 PictureAutoCrop @@ -1290,8 +1272,6 @@ Mp4HttpOptimize 0 - Mp4LargeFile - 0 Mp4iPodCompatible 0 PictureAutoCrop @@ -1436,8 +1416,6 @@ Mp4HttpOptimize 0 - Mp4LargeFile - 0 Mp4iPodCompatible 0 PictureAutoCrop @@ -1583,8 +1561,6 @@ Mp4HttpOptimize 0 - Mp4LargeFile - 1 Mp4iPodCompatible 0 PictureAutoCrop diff --git a/libhb/common.h b/libhb/common.h index a932a07a8..f4d25dcf6 100644 --- 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 236f3af81..70160436e 100644 --- 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 7b135c85a..4825a1db4 100644 --- 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 53f74d3e5..34a80723b 100644 --- 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 d4afb3ed2..6764a3e1f 100755 --- 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 65708378b..67cf4c301 100644 --- 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; -- 2.40.0