Skip to content

Commit 843040f

Browse files
joshstephensongalad87
joshstephenson
authored and
galad87
committed
Global replacement of passthrough with passthru
1 parent c54858d commit 843040f

25 files changed

+54
-54
lines changed

‎NEWS.markdown

+2-2
Original file line numberDiff line numberDiff line change
@@ -2300,7 +2300,7 @@ Superseded by HandBrake 1.0.5.
23002300

23012301
#### Audio
23022302

2303-
- Blu-ray: make TrueHD, DTS-HD and E-AC3 Secondary Audio streams available for decoding and/or passthrough
2303+
- Blu-ray: make TrueHD, DTS-HD and E-AC3 Secondary Audio streams available for decoding and/or passthru
23042304
- bug fix: libavcodec-decoded streams can now be decoded multiple times
23052305
- previously, multiple decodes of the same source tracks weren't possible and audio output tracks had to be dropped
23062306
- bug fix: fix audio screech at beginning of some audio tracks when decoding AC3
@@ -2478,7 +2478,7 @@ Superseded by HandBrake 1.0.5.
24782478
- Allows specifying field parity for detelecine and decomb
24792479
- Better AV sync
24802480
- Support for sources with no audio
2481-
- DTS passthrough for MKV
2481+
- DTS passthru for MKV
24822482
- x264 bumped from r1169 to r1347, which means speed optimizations, new default settings (see r2742 commit comment), the magic of macroblock tree rate control (mbtree), a new CRF curve (meaning you will get different, generally lower bitrates at the same RF, with similar quality metrics), and weighted P-Frames (disabled by default for Baseline encodes and the AppleTV preset).
24832483
- Better sample interleaving
24842484
- Better, optional deinterlacer for decomb (EEDI2)

‎gtk/data/fr.handbrake.ghb.metainfo.xml.in.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
</release>
122122
<release version="1.7.0" date="2023-11-12">
123123
<description>
124-
<p>Drag and drop support, native file chooser, chapter import and export, Dolby Vision metadata passthrough, and various user interface improvements.</p>
124+
<p>Drag and drop support, native file chooser, chapter import and export, Dolby Vision metadata passthru, and various user interface improvements.</p>
125125
</description>
126126
</release>
127127
<release version="1.6.1" date="2023-01-15">

‎gtk/po/ghb.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -1985,7 +1985,7 @@ msgstr ""
19851985

19861986
#: src/audiohandler.c:781
19871987
#, c-format
1988-
msgid "<small>Passthrough</small>"
1988+
msgid "<small>Passthru</small>"
19891989
msgstr ""
19901990

19911991
#: src/audiohandler.c:790
@@ -3259,7 +3259,7 @@ msgid "Burned Into Video"
32593259
msgstr ""
32603260

32613261
#: src/subtitlehandler.c:113
3262-
msgid "Passthrough"
3262+
msgid "Passthru"
32633263
msgstr ""
32643264

32653265
#: src/subtitlehandler.c:116

‎gtk/src/audiohandler.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ audio_refresh_list_row_ui(
778778

779779
if (ghb_audio_is_passthru(encoder->codec))
780780
{
781-
info_dst = g_strdup_printf(_("<small>Passthrough</small>"));
781+
info_dst = g_strdup_printf(_("<small>Passthru</small>"));
782782
}
783783
else
784784
{

‎gtk/src/callbacks.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2777,7 +2777,7 @@ ghb_set_title_settings(signal_user_data_t *ud, GhbValue *settings)
27772777
ghb_dict_set_string(settings, "MetaDescription", "");
27782778
ghb_dict_set_string(settings, "MetaLongDescription", "");
27792779

2780-
if (ghb_dict_get_bool(settings, "MetadataPassthrough"))
2780+
if (ghb_dict_get_bool(settings, "MetadataPassthru"))
27812781
{
27822782
if (title->metadata && title->metadata->dict)
27832783
{
@@ -3012,7 +3012,7 @@ meta_pass_changed_cb (GtkWidget *widget, gpointer data)
30123012
title = ghb_lookup_title(title_id, &titleindex);
30133013

30143014
if (title != NULL &&
3015-
ghb_dict_get_bool(ud->settings, "MetadataPassthrough"))
3015+
ghb_dict_get_bool(ud->settings, "MetadataPassthru"))
30163016
{
30173017
// Reload metadata from title
30183018
if (title->metadata && title->metadata->dict)

‎gtk/src/hb-backend.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4612,7 +4612,7 @@ ghb_validate_audio(GhbValue *settings, GtkWindow *parent)
46124612
!(ghb_audio_can_passthru(aconfig->in.codec) &&
46134613
(aconfig->in.codec & codec)))
46144614
{
4615-
// Not supported. AC3 is passthrough only, so input must be AC3
4615+
// Not supported. AC3 is passthru only, so input must be AC3
46164616
if (!ghb_question_dialog_run(parent, GHB_ACTION_NORMAL,
46174617
_("Continue"), _("Cancel"), _("Invalid Audio Selection"),
46184618
_("The source does not support Pass-Thru.\n\n"

‎gtk/src/subtitlehandler.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ subtitle_refresh_list_row_ui(
110110

111111
GString *str = g_string_new("<small>");
112112
g_string_append(str, burned ? _("Burned Into Video") :
113-
_("Passthrough"));
113+
_("Passthru"));
114114
if (forced)
115115
{
116116
g_string_append_printf(str, " (%s)", _("Forced Subtitles Only"));

‎gtk/src/ui/ghb.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -1811,7 +1811,7 @@ sync for broken players that do not honor MP4 edit lists.</property>
18111811
</object>
18121812
</child>
18131813
<child>
1814-
<object class="GtkCheckButton" id="MetadataPassthrough">
1814+
<object class="GtkCheckButton" id="MetadataPassthru">
18151815
<property name="label" translatable="yes">Passthru Common Metadata</property>
18161816
<property name="focusable">1</property>
18171817
<property name="tooltip-text" translatable="yes">Copy metadata from source to output.</property>

‎libhb/common.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1422,7 +1422,7 @@ void hb_audio_bitrate_get_limits(uint32_t codec, int samplerate, int mixdown,
14221422
*high = (nchannels + lfe_count) * 256;
14231423
break;
14241424

1425-
// Bitrates don't apply to passthrough audio, but may apply if we
1425+
// Bitrates don't apply to passthru audio, but may apply if we
14261426
// fall back to an encoder when the source can't be passed through.
14271427
default:
14281428
*low = hb_audio_bitrates_first_item->rate;
@@ -5723,7 +5723,7 @@ int hb_audio_can_apply_drc(uint32_t codec, uint32_t codec_param, int encoder)
57235723
{
57245724
if (encoder & HB_ACODEC_PASS_FLAG)
57255725
{
5726-
// can't apply DRC to passthrough audio
5726+
// can't apply DRC to passthru audio
57275727
return 0;
57285728
}
57295729
else if (codec & HB_ACODEC_FF_MASK)

‎libhb/decavsub.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ int decavsubWork( hb_avsub_context_t * ctx,
415415

416416
if (!usable_sub)
417417
{
418-
// Discard accumulated passthrough subtitle data
418+
// Discard accumulated passthru subtitle data
419419
hb_buffer_list_close(&ctx->list_pass);
420420
avsubtitle_free(&subtitle);
421421
continue;
@@ -488,7 +488,7 @@ int decavsubWork( hb_avsub_context_t * ctx,
488488

489489
if (ctx->subtitle->format == TEXTSUB)
490490
{
491-
// TEXTSUB && (PASSTHROUGHSUB || RENDERSUB)
491+
// TEXTSUB && (PASSTHRUSUB || RENDERSUB)
492492

493493
// Text subtitles are treated the same regardless of
494494
// whether we are burning or passing through. They
@@ -521,7 +521,7 @@ int decavsubWork( hb_avsub_context_t * ctx,
521521
else if (ctx->subtitle->config.dest == PASSTHRUSUB &&
522522
hb_subtitle_can_pass(ctx->subtitle->source, ctx->job->mux))
523523
{
524-
// PICTURESUB && PASSTHROUGHSUB
524+
// PICTURESUB && PASSTHRUSUB
525525

526526
// subtitles may be spread across multiple packets
527527
//

‎libhb/handbrake/preset_builtin.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10042,7 +10042,7 @@ const char hb_builtin_presets_json[] =
1004210042
" \"Folder\": false,\n"
1004310043
" \"FolderOpen\": false,\n"
1004410044
" \"InlineParameterSets\": false,\n"
10045-
" \"MetadataPassthrough\": true,\n"
10045+
" \"MetadataPassthru\": true,\n"
1004610046
" \"Mp4iPodCompatible\": false,\n"
1004710047
" \"Optimize\": false,\n"
1004810048
" \"PictureAllowUpscaling\": false,\n"

‎libhb/work.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ void hb_display_job_info(hb_job_t *job)
718718
if (job->indepth_scan)
719719
{
720720
hb_log( " * Foreign Audio Search: %s%s%s",
721-
job->select_subtitle_config.dest == RENDERSUB ? "Render/Burn-in" : "Passthrough",
721+
job->select_subtitle_config.dest == RENDERSUB ? "Render/Burn-in" : "Passthru",
722722
job->select_subtitle_config.force ? ", Forced Only" : "",
723723
job->select_subtitle_config.default_track ? ", Default" : "" );
724724
}
@@ -743,7 +743,7 @@ void hb_display_job_info(hb_job_t *job)
743743
subtitle->out_track, subtitle->lang, subtitle->track,
744744
subtitle->id,
745745
subtitle->config.dest == RENDERSUB ? "Render/Burn-in"
746-
: "Passthrough",
746+
: "Passthru",
747747
subtitle->config.default_track ? ", Default" : "",
748748
subtitle->config.offset, subtitle->config.src_codeset);
749749
}
@@ -755,7 +755,7 @@ void hb_display_job_info(hb_job_t *job)
755755
subtitle->out_track, subtitle->lang, subtitle->track,
756756
subtitle->id,
757757
subtitle->config.dest == RENDERSUB ? "Render/Burn-in"
758-
: "Passthrough",
758+
: "Passthru",
759759
subtitle->config.default_track ? ", Default" : "",
760760
subtitle->config.offset);
761761
}
@@ -767,7 +767,7 @@ void hb_display_job_info(hb_job_t *job)
767767
subtitle->id,
768768
subtitle->format == PICTURESUB ? "Picture" : "Text",
769769
subtitle->config.dest == RENDERSUB ? "Render/Burn-in"
770-
: "Passthrough",
770+
: "Passthru",
771771
subtitle->config.force ? ", Forced Only" : "",
772772
subtitle->config.default_track ? ", Default" : "" );
773773
}
@@ -1949,7 +1949,7 @@ static void do_job(hb_job_t *job)
19491949
if ( !(audio->config.out.codec & HB_ACODEC_PASS_FLAG ) )
19501950
{
19511951
/*
1952-
* Add the encoder thread if not doing pass through
1952+
* Add the encoder thread if not doing passthru
19531953
*/
19541954
w = hb_audio_encoder( job->h, audio->config.out.codec);
19551955
if (w == NULL)

‎macosx/HBJob.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ - (BOOL)applyPreset:(HBPreset *)preset error:(NSError * __autoreleasing *)outErr
116116
self.alignAVStart = [preset[@"AlignAVStart"] boolValue];
117117

118118
self.chaptersEnabled = [preset[@"ChapterMarkers"] boolValue];
119-
self.metadataPassthru = [preset[@"MetadataPassthrough"] boolValue];
119+
self.metadataPassthru = [preset[@"MetadataPassthru"] boolValue];
120120

121121
[self.audio applyPreset:preset jobSettings:jobSettings];
122122
[self.subtitles applyPreset:preset jobSettings:jobSettings];
@@ -150,7 +150,7 @@ - (void)writeToPreset:(HBMutablePreset *)preset
150150
preset[@"Mp4iPodCompatible"] = @(self.mp4iPodCompatible);
151151

152152
preset[@"ChapterMarkers"] = @(self.chaptersEnabled);
153-
preset[@"MetadataPassthrough"] = @(self.metadataPassthru);
153+
preset[@"MetadataPassthru"] = @(self.metadataPassthru);
154154

155155
[@[self.video, self.filters, self.picture, self.audio, self.subtitles] makeObjectsPerformSelector:@selector(writeToPreset:)
156156
withObject:preset];

‎make/configure.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1435,11 +1435,11 @@ def createCLI( cross = None ):
14351435
h = 'Nvidia NVENC video encoder' if nvenc_supported else argparse.SUPPRESS
14361436
grp.add_argument( '--enable-nvenc', dest="enable_nvenc", default=True, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
14371437
grp.add_argument( '--disable-nvenc', dest="enable_nvenc", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
1438-
1438+
14391439
h = 'Nvidia NVDEC video decoder' if nvenc_supported else argparse.SUPPRESS
14401440
grp.add_argument( '--enable-nvdec', dest="enable_nvdec", default=False, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
14411441
grp.add_argument( '--disable-nvdec', dest="enable_nvdec", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
1442-
1442+
14431443
h = 'Intel QSV video encoder/decoder' if qsv_supported else argparse.SUPPRESS
14441444
grp.add_argument( '--enable-qsv', dest="enable_qsv", default=IfHost(True, "x86_64-w64-mingw32*", none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
14451445
grp.add_argument( '--disable-qsv', dest="enable_qsv", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
@@ -2217,7 +2217,7 @@ class Tools:
22172217
print(f'Enable GTK GUI: {options.enable_gtk}' + ('' if gtk_supported else note_unsupported))
22182218

22192219
if len(targets) > 0:
2220-
print( print_blue('Note:'), 'passthrough arguments:', *targets)
2220+
print( print_blue('Note:'), 'passthru arguments:', *targets)
22212221

22222222
if len(exports) > 0:
22232223
print( print_blue('Note:'), 'exported variables:', end = ' ')

‎test/test.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1535,9 +1535,9 @@ static void ShowHelp(void)
15351535
fprintf(out, " %s\n", encoder->short_name);
15361536
}
15371537
fprintf(out,
1538-
" \"copy:<type>\" will pass through the corresponding\n"
1539-
" audio track without modification, if pass through\n"
1540-
" is supported for the audio type.\n"
1538+
" \"copy:<type>\" will enable passthru of the \n"
1539+
" corresponding audio track without modification\n"
1540+
" if passthru is supported for the audio type.\n"
15411541
" Separate tracks by commas.\n"
15421542
" Defaults:\n");
15431543
container = NULL;

‎win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ public static bool SubtitleCanBurn(int source)
379379
/// <returns>
380380
/// True if the subtitle type can be passed through with the given muxer.
381381
/// </returns>
382-
public static bool SubtitleCanPassthrough(int subtitleSourceType, int muxer)
382+
public static bool SubtitleCanPassthru(int subtitleSourceType, int muxer)
383383
{
384384
return HBFunctions.hb_subtitle_can_pass(subtitleSourceType, muxer) > 0;
385385
}
@@ -432,7 +432,7 @@ public static string GetSubtitleSourceName(int source)
432432
/// True if the given encoder is compatible with the given audio track.
433433
/// </returns>
434434
/// <remarks>
435-
/// Only works with passthrough encoders.
435+
/// Only works with passthru encoders.
436436
/// </remarks>
437437
public static bool AudioEncoderIsCompatible(int codecId, HBAudioEncoder encoder)
438438
{
@@ -518,7 +518,7 @@ public static bool CanApplyDrc(int codecId, int codecParam, HBAudioEncoder encod
518518
/// <returns>
519519
/// True if the codec can be passed through.
520520
/// </returns>
521-
public static bool CanPassthroughAudio(int codecId)
521+
public static bool CanPassthruAudio(int codecId)
522522
{
523523
return (codecId & NativeConstants.HB_ACODEC_PASS_MASK) > 0;
524524
}

‎win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBAudioEncoder.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ public string CodecName
7171
public int Id { get; private set; }
7272

7373
/// <summary>
74-
/// Gets a value indicating whether the encoder is passthrough.
74+
/// Gets a value indicating whether the encoder is passthru.
7575
/// </summary>
76-
public bool IsPassthrough
76+
public bool IsPassthru
7777
{
7878
get
7979
{
@@ -153,4 +153,4 @@ public bool IsLosslessEncoder
153153
}
154154
}
155155
}
156-
}
156+
}

‎win/CS/HandBrake.Interop/Interop/Json/Presets/HBPreset.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,6 @@ public class HBPreset
408408

409409
public bool PresetDisabled { get; set; }
410410

411-
public bool MetadataPassthrough { get; set; }
411+
public bool MetadataPassthru { get; set; }
412412
}
413-
}
413+
}

‎win/CS/HandBrake.sln.DotSettings

+2-2
Original file line numberDiff line numberDiff line change
@@ -1439,11 +1439,11 @@
14391439
<s:Boolean x:Key="/Default/UserDictionary/Words/=detelecine/@EntryIndexedValue">True</s:Boolean>
14401440
<s:Boolean x:Key="/Default/UserDictionary/Words/=interop/@EntryIndexedValue">True</s:Boolean>
14411441
<s:Boolean x:Key="/Default/UserDictionary/Words/=hb/@EntryIndexedValue">True</s:Boolean>
1442-
<s:Boolean x:Key="/Default/UserDictionary/Words/=passthrough/@EntryIndexedValue">True</s:Boolean>
1442+
<s:Boolean x:Key="/Default/UserDictionary/Words/=passthru/@EntryIndexedValue">True</s:Boolean>
14431443
<s:Boolean x:Key="/Default/UserDictionary/Words/=qsv/@EntryIndexedValue">True</s:Boolean>
14441444
<s:Boolean x:Key="/Default/UserDictionary/Words/=deinterlace/@EntryIndexedValue">True</s:Boolean>
14451445
<s:Boolean x:Key="/Default/UserDictionary/Words/=denoise/@EntryIndexedValue">True</s:Boolean>
14461446
<s:Boolean x:Key="/Default/UserDictionary/Words/=framerate/@EntryIndexedValue">True</s:Boolean>
14471447
<s:Boolean x:Key="/Default/UserDictionary/Words/=mixdown/@EntryIndexedValue">True</s:Boolean>
14481448
<s:Boolean x:Key="/Default/UserDictionary/Words/=samplerate/@EntryIndexedValue">True</s:Boolean>
1449-
<s:Boolean x:Key="/Default/UserDictionary/Words/=vrate/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
1449+
<s:Boolean x:Key="/Default/UserDictionary/Words/=vrate/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

‎win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
8585
{
8686
foreach (HBAudioEncoder encoder in HandBrakeEncoderHelpers.AudioEncoders)
8787
{
88-
if (encoder.IsPassthrough)
88+
if (encoder.IsPassthru)
8989
{
9090
encoders.Remove(encoder);
9191
}
@@ -101,7 +101,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
101101
Audio sourceTrack = values[2] as Audio;
102102
foreach (HBAudioEncoder encoder in HandBrakeEncoderHelpers.AudioEncoders)
103103
{
104-
if (encoder.IsPassthrough)
104+
if (encoder.IsPassthru)
105105
{
106106
RemoveIfNotSupported(encoder, sourceTrack, encoders);
107107
}

‎win/CS/HandBrakeWPF/Converters/Audio/AudioRateTypeForDefaultsConverter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
3939
HBAudioEncoder audioEncoder = values[0] is HBAudioEncoder ? (HBAudioEncoder)values[0] : HBAudioEncoder.None;
4040
HBAudioEncoder fallbackEncoder = values[1] is HBAudioEncoder ? (HBAudioEncoder)values[1] : HBAudioEncoder.None;
4141

42-
if (audioEncoder != null && audioEncoder.IsPassthrough)
42+
if (audioEncoder != null && audioEncoder.IsPassthru)
4343
{
4444
if (fallbackEncoder != null && !fallbackEncoder.SupportsQuality)
4545
{

‎win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ public string BitRateDisplayValue
279279
{
280280
get
281281
{
282-
if (this.Encoder != null && this.Encoder.IsPassthrough)
282+
if (this.Encoder != null && this.Encoder.IsPassthru)
283283
{
284284
return "Auto";
285285
}
@@ -338,7 +338,7 @@ public bool IsPassthru
338338
{
339339
get
340340
{
341-
return this.Encoder != null && this.Encoder.IsPassthrough;
341+
return this.Encoder != null && this.Encoder.IsPassthru;
342342
}
343343
}
344344

@@ -649,7 +649,7 @@ private void GetDefaultMixdownIfNull()
649649
private HBAudioEncoder GetEncoderForLimits()
650650
{
651651
HBAudioEncoder hbaenc = this.Encoder;
652-
if (hbaenc != null && hbaenc.IsPassthrough)
652+
if (hbaenc != null && hbaenc.IsPassthru)
653653
{
654654
hbaenc = this.fallbackEncoder;
655655
}
@@ -659,4 +659,4 @@ private HBAudioEncoder GetEncoderForLimits()
659659

660660
#endregion
661661
}
662-
}
662+
}

0 commit comments

Comments
 (0)