linus/mpv.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc

Browse Source
This commit is contained in:
stax76
2023-12-24 07:34:12 +01:00
parent 764f00ed3a
commit 86c823bfde
10 changed files with 417 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changelog.md
View File

@@ -1,14 +1,16 @@
# v7.0.0.5 Beta (2023-??-??) # v7.0.0.5 Beta (2023-??-??)
- More libplacebo options added.
- Support of the mpv option `title-bar`. - Support of the mpv option `title-bar`.
- Command line parser fix using list options with `-add` suffix.
- Fix video being rendered with black line at the bottom. - Fix video being rendered with black line at the bottom.
- The conf file reader/writer detects if the user prefers space before and after the equal sign. - The conf file reader/writer detects if the user prefers space before and after the equal sign.
- The portable download includes like the installer debug symbols. - The portable download includes like the installer debug symbols.
- Setup questions on startup removed. - Setup questions on startup removed.
- Pressing shift while drag and drop (and clipboard import) appends - Pressing shift while drag and drop (and clipboard import) appends
instead of replaces files in the playlist. mpv supports this as well. instead of replaces files in the playlist. mpv supports this as well.
- All list operation suffixes are available on the command line.
- Improved layout in conf editor.
# v7.0.0.4 Beta (2023-12-19) # v7.0.0.4 Beta (2023-12-19)

12
docs/manual.md
View File

@@ -92,14 +92,14 @@ Before making a support request, please try the newest [beta version](../../../r
Support can be requested here: Support can be requested here:
Beginner questions:
https://www.reddit.com/r/mpv
mpv.net bug reports, feature requests and advanced questions: mpv.net bug reports, feature requests and advanced questions:
https://github.com/mpvnet-player/mpv.net/issues https://github.com/mpvnet-player/mpv.net/issues
Beginner mpv questions:
https://www.reddit.com/r/mpv
Advanced mpv questions: Advanced mpv questions:
https://github.com/mpv-player/mpv/issues https://github.com/mpv-player/mpv/issues
@@ -735,8 +735,8 @@ Blu-ray and DVD ISO image files are supported.
### Open > Open URL or file path from clipboard ### Open > Open URL or file path from clipboard
Opens files and URLs from the clipboard. How to open URLs directly Opens files and URLs from the clipboard. Shift key appends to the playlist.
from the browser from sites like YouTube is described in the How to open URLs directly from the browser from sites like YouTube is described in the
[External Tools section](#external-tools). [External Tools section](#external-tools).

370
src/MpvNet.Windows/Resources/editor_conf.txt
View File

@@ -17,7 +17,7 @@ name = media-info
file = mpvnet file = mpvnet
default = yes default = yes
directory = General directory = General
help = Usage of the media info library instead of mpv to access media information. (mpv.net option) help = Usage of the media info library instead of mpv to retrieve media information. (mpv.net option)
option = yes option = yes
option = no option = no
@@ -327,6 +327,14 @@ default = no
option = yes option = yes
option = no option = no
name = deband_preset
file = libplacebo
directory = Video/libplacebo/Debanding
help = Overrides the value of all options in this section by their default values from the given preset.
default = none
option = none
option = default
name = deband_iterations name = deband_iterations
file = libplacebo file = libplacebo
directory = Video/libplacebo/Debanding directory = Video/libplacebo/Debanding
@@ -355,6 +363,14 @@ default = yes
option = yes option = yes
option = no option = no
name = sigmoid_preset
file = libplacebo
directory = Video/libplacebo/Sigmoidization
help = Overrides the value of all options in this section by their default values from the given preset.
default = none
option = none
option = default
name = sigmoid_center name = sigmoid_center
file = libplacebo file = libplacebo
directory = Video/libplacebo/Sigmoidization directory = Video/libplacebo/Sigmoidization
@@ -365,6 +381,355 @@ file = libplacebo
directory = Video/libplacebo/Sigmoidization directory = Video/libplacebo/Sigmoidization
help = <1.0..20.0> The slope (steepness) of the sigmoid curve. Defaults to 6.5. help = <1.0..20.0> The slope (steepness) of the sigmoid curve. Defaults to 6.5.
name = color_adjustment
file = libplacebo
directory = Video/libplacebo/Color Adjustment
help = Enables color adjustment.
default = yes
option = yes
option = no
name = color_adjustment_preset
file = libplacebo
directory = Video/libplacebo/Color Adjustment
help = Overrides the value of all options in this section by their default values from the given preset.
default = none
option = none
option = neutral
name = brightness
file = libplacebo
directory = Video/libplacebo/Color Adjustment
help = <-1.0..1.0> Brightness boost. Adds a constant bias onto the source luminance signal. 0.0 = neutral, 1.0 = solid white, -1.0 = solid black. Defaults to 0.0.
name = contrast
file = libplacebo
directory = Video/libplacebo/Color Adjustment
help = <0.0..100.0> Contrast gain. Multiplies the source luminance signal by a constant factor. 1.0 = neutral, 0.0 = solid black. Defaults to 1.0.
name = saturation
file = libplacebo
directory = Video/libplacebo/Color Adjustment
help = <0.0..100.0> Saturation gain. Multiplies the source chromaticity signal by a constant factor. 1.0 = neutral, 0.0 = grayscale. Defaults to 1.0.
name = hue
file = libplacebo
directory = Video/libplacebo/Color Adjustment
help = <angle> Hue shift. Corresponds to a rotation of the UV subvector around the neutral axis. Specified in radians. Defaults to 0.0 (neutral).
name = gamma
file = libplacebo
directory = Video/libplacebo/Color Adjustment
help = <0.0..100.0> Gamma lift. Subjectively brightnes or darkens the scene while preserving overall contrast. 1.0 = neutral, 0.0 = solid black. Defaults to 1.0.
name = temperature
file = libplacebo
directory = Video/libplacebo/Color Adjustment
help = <-1.143..5.286> Color temperature shift. Relative to 6500 K, a value of 0.0 gives you 6500 K (no change), a value of -1.0 gives you 3000 K, and a value of 1.0 gives you 10000 K. Defaults to 0.0.
name = peak_detect
file = libplacebo
directory = Video/libplacebo/HDR Peak Detection
help = Enables HDR peak detection.
default = yes
option = yes
option = no
name = peak_detection_preset
file = libplacebo
directory = Video/libplacebo/HDR Peak Detection
help = Overrides the value of all options in this section by their default values from the given preset. high_quality also enables frame histogram measurement.
default = none
option = none
option = default
option = high_quality
name = peak_smoothing_period
file = libplacebo
directory = Video/libplacebo/HDR Peak Detection
help = <0.0..1000.0> Smoothing coefficient for the detected values.
url = https://libplacebo.org/options/#peak_smoothing_period0010000
name = scene_threshold_low
file = libplacebo
directory = Video/libplacebo/HDR Peak Detection
url = https://libplacebo.org/options/#scene_threshold_low001000-scene_threshold_high001000
name = scene_threshold_high
file = libplacebo
directory = Video/libplacebo/HDR Peak Detection
url = https://libplacebo.org/options/#scene_threshold_low001000-scene_threshold_high001000
name = peak_percentile
file = libplacebo
directory = Video/libplacebo/HDR Peak Detection
help = <0.0..100.0> Which percentile of the input image brightness histogram to consider as the true peak of the scene.
url = https://libplacebo.org/options/#peak_percentile001000
name = black_cutoff
file = libplacebo
directory = Video/libplacebo/HDR Peak Detection
help = <0.0..100.0> Black cutoff strength.
url = https://libplacebo.org/options/#black_cutoff001000
name = allow_delayed_peak
file = libplacebo
directory = Video/libplacebo/HDR Peak Detection
help = Allows the peak detection result to be delayed by up to a single frame, which can sometimes improve throughput, at the cost of introducing the possibility of 1-frame flickers on transitions.
default = no
option = yes
option = no
name = color_map
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Enables the use of these color mapping settings. Disabling this option does not disable color mapping, it just means "use the default options for everything".
default = yes
option = yes
option = no
name = color_map_preset
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Overrides the value of all options in this section by their default values from the given preset. high_quality also enables HDR contrast recovery.
default = none
option = none
option = default
option = high_quality
name = gamut_mapping
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Gamut mapping function to use to handle out-of-gamut colors, including colors which are out-of-gamut as a consequence of tone mapping.
default = perceptual
option = clip
option = perceptual
option = softclip
option = relative
option = saturation
option = absolute
option = desaturate
option = darken
option = highlight
option = linear
name = perceptual_deadzone
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0.0..1.0> (Relative) chromaticity protection zone for perceptual mapping. Defaults to 0.30.
name = perceptual_strength
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0.0..1.0> Strength of the perceptual saturation mapping component. Defaults to 0.80.
name = colorimetric_gamma
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0.0..10.0> I vs C curve gamma to use for colorimetric clipping (relative, absolute and darken). Defaults to 1.80.
name = softclip_knee
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0.0..1.0> Knee point to use for soft-clipping methods (perceptual, softclip). Defaults to 0.70.
name = softclip_desat
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0.0..1.0> Desaturation strength for softclip. Defaults to 0.35.
name = lut3d_size_I
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0..1024> Gamut mapping 3DLUT size. Setting a dimension to 0 picks the default value. Defaults to 48.
name = lut3d_size_C
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0..1024> Gamut mapping 3DLUT size. Setting a dimension to 0 picks the default value. Defaults to 32.
name = lut3d_size_h
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0..1024> Gamut mapping 3DLUT size. Setting a dimension to 0 picks the default value. Defaults to 256.
name = lut3d_tricubic
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Use higher quality, but slower, tricubic interpolation for gamut mapping 3DLUTs. May substantially improve the 3DLUT gamut mapping accuracy, in particular at smaller 3DLUT sizes. Shouldn't have much effect at the default size.
default = no
option = yes
option = no
name = gamut_expansion
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = If enabled, allows the gamut mapping function to expand the gamut, in cases where the target gamut exceeds that of the source. If disabled, the source gamut will never be enlarged, even when using a gamut mapping function capable of bidirectional mapping.
default = no
option = yes
option = no
name = tone_mapping
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Tone mapping function to use for adapting between difference luminance ranges, including black point adaptation.
default = spline
option = clip
option = spline
option = st2094-40
option = st2094-10
option = bt2390
option = bt2446a
option = reinhard
option = mobius
option = hable
option = gamma
option = linear
option = linearlight
name = knee_adaptation
file = libplacebo
directory = Video/libplacebo/Color Mapping
url = https://libplacebo.org/options/#tone-mapping-constants
name = knee_minimum
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0.0..0.5> Configures the knee point minimum as a percentage of the PQ luminance range. Provides a hard limit on the knee point chosen by knee_adaptation. Defaults to 0.1.
name = knee_maximum
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0.5..1.0> Configures the knee point maximum as a percentage of the PQ luminance range. Provides a hard limit on the knee point chosen by knee_adaptation. Defaults to 0.8.
name = knee_default
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0.0..1.0> Default knee point to use in the absence of source scene average metadata. Normally, this is ignored in favor of picking the knee point as the (relative) source scene average brightness level. Defaults to 0.4.
name = knee_offset
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0.5..2.0> Knee point offset (for bt2390 only). Note that a value of 0.5 is the spec-defined default behavior, which differs from the libplacebo default of 1.0.
name = slope_tuning
file = libplacebo
directory = Video/libplacebo/Color Mapping
url = https://libplacebo.org/options/#tone-mapping-constants
name = slope_offset
file = libplacebo
directory = Video/libplacebo/Color Mapping
url = https://libplacebo.org/options/#tone-mapping-constants
name = spline_contrast
file = libplacebo
directory = Video/libplacebo/Color Mapping
url = https://libplacebo.org/options/#tone-mapping-constants
name = reinhard_contrast
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0.0..1.0> For the reinhard function, this specifies the local contrast coefficient at the display peak. Essentially, a value of 0.5 implies that the reference white will be about half as bright as when clipping. Defaults to 0.5.
name = linear_knee
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0.0..1.0> For legacy functions (mobius, gamma) which operate on linear light, this directly sets the corresponding knee point. Defaults to 0.3.
name = exposure
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0.0..10.0> For linear methods (linear, linearlight), this controls the linear exposure/gain applied to the image. Defaults to 1.0.
name = inverse_tone_mapping
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = If enabled, and supported by the given tone mapping function, will perform inverse tone mapping to expand the dynamic range of a signal. libplacebo is not liable for any HDR-induced eye damage.
default = no
option = yes
option = no
name = tone_map_metadata
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Data source to use when tone-mapping. Setting this to a specific value allows overriding the default metadata preference logic.
default = any
option = any
option = none
option = hdr10
option = hdr10plus
option = cie_y
name = tone_lut_size
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <0..4096> Tone mapping LUT size. Setting 0 picks the default size. Defaults to 256.
name = contrast_recovery
file = libplacebo
directory = Video/libplacebo/Color Mapping
url = https://libplacebo.org/options/#contrast_recovery0020
name = contrast_smoothness
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = <1.0..32.0> HDR contrast recovery lowpass kernel size. Increasing or decreasing this will affect the visual appearance substantially. Defaults to 3.5.
name = force_tone_mapping_lut
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Force the use of a full tone-mapping LUT even for functions that have faster pure GLSL replacements (e.g. clip, linear, saturation). This is a debug option.
default = no
option = yes
option = no
name = visualize_lut
file = libplacebo
directory = Video/libplacebo/Color Mapping
url = https://libplacebo.org/options/#debug-options
default = no
option = yes
option = no
name = visualize_lut_x0
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Controls where to draw the LUt visualization, relative to the rendered video. Defaults to 0.0.
name = visualize_lut_y0
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Controls where to draw the LUt visualization, relative to the rendered video. Defaults to 0.0.
name = visualize_lut_x1
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Controls where to draw the LUt visualization, relative to the rendered video. Defaults to 1.0.
name = visualize_lut_y1
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Controls where to draw the LUt visualization, relative to the rendered video. Defaults to 1.0.
name = visualize_hue
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Controls the rotation of the gamut 3DLUT visualization. Rotates the gamut through hue space (around the I axis), in radians. Defaults to 0.0.
name = visualize_theta
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Controls the rotation of the gamut 3DLUT visualization. The theta parameter vertically rotates the cross section (around the C axis), in radians. Defaults to 0.0.
name = show_clipping
file = libplacebo
directory = Video/libplacebo/Color Mapping
help = Graphically highlight hard-clipped pixels during tone-mapping (i.e. pixels that exceed the claimed source luminance range).
default = no
option = yes
option = no
name = screenshot-directory name = screenshot-directory
file = mpv file = mpv
width = 500 width = 500
@@ -763,8 +1128,7 @@ name = language
file = mpvnet file = mpvnet
default = system default = system
directory = Appearance directory = Appearance
help = User interface display language.\nmpv.net must be restarted after a change.\nInterested joining our translation team?: help = User interface display language.\nmpv.net must be restarted after a change.
url = https://app.transifex.com/stax76/teams/
option = system option = system
option = english option = english
option = chinese-china option = chinese-china

3
src/MpvNet.Windows/WPF/ConfWindow.xaml
View File

@@ -40,7 +40,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="180" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
@@ -48,6 +48,7 @@
x:Name="SearchControl" x:Name="SearchControl"
HintText="Find a setting (Ctrl+F)" HintText="Find a setting (Ctrl+F)"
Margin="20,20,0,10" Margin="20,20,0,10"
MaxWidth="190"
Text="{Binding SearchText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Text="{Binding SearchText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
/> />

1
src/MpvNet.Windows/WPF/Controls/CommandPaletteControl.xaml.cs
View File

@@ -92,7 +92,6 @@ public partial class CommandPaletteControl : UserControl
if (item.Binding != null) if (item.Binding != null)
{ {
// TODO: CommandItem.Alias
//if (item.CommandItem.Alias.ContainsEx(filter)) //if (item.CommandItem.Alias.ContainsEx(filter))
// return true; // return true;

2
src/MpvNet.Windows/WPF/Controls/SearchControl.xaml
View File

@@ -24,7 +24,7 @@
Name="SearchTextBox" Name="SearchTextBox"
Height="25" Height="25"
BorderThickness="2" BorderThickness="2"
Padding="2" Padding="2,2,20,2"
Background="Transparent" Background="Transparent"
Foreground="{Binding Theme.Foreground}" Foreground="{Binding Theme.Foreground}"
CaretBrush="{Binding Theme.Foreground}" CaretBrush="{Binding Theme.Foreground}"

8
src/MpvNet.Windows/WPF/Controls/SearchControl.xaml.cs
View File

@@ -39,11 +39,17 @@ public partial class SearchControl : UserControl
{ {
HintTextBlock.Text = string.IsNullOrEmpty(Text) ? HintText : ""; HintTextBlock.Text = string.IsNullOrEmpty(Text) ? HintText : "";
if (string.IsNullOrEmpty(Text) || HideClearButton || Text.Length > 21) if (string.IsNullOrEmpty(Text) || HideClearButton || Text.Length > 30)
{
SearchTextBox.Padding = new Thickness(2);
SearchClearButton.Visibility = Visibility.Hidden; SearchClearButton.Visibility = Visibility.Hidden;
}
else else
{
SearchTextBox.Padding = new Thickness(2, 2, 20, 2);
SearchClearButton.Visibility = Visibility.Visible; SearchClearButton.Visibility = Visibility.Visible;
} }
}
public string Text public string Text
{ {

3
src/MpvNet.Windows/WPF/Controls/StringSettingControl.xaml.cs
View File

@@ -33,6 +33,9 @@ public partial class StringSettingControl : UserControl, ISettingControl
if (string.IsNullOrEmpty(stringSetting.URL)) if (string.IsNullOrEmpty(stringSetting.URL))
LinkTextBlock.Visibility = Visibility.Collapsed; LinkTextBlock.Visibility = Visibility.Collapsed;
if (string.IsNullOrEmpty(stringSetting.Help))
HelpTextBox.Visibility = Visibility.Collapsed;
} }
public Theme? Theme => Theme.Current; public Theme? Theme => Theme.Current;

3
src/MpvNet/InputHelp.cs
View File

@@ -284,6 +284,9 @@ public static class InputHelp
if (string.IsNullOrEmpty(content)) if (string.IsNullOrEmpty(content))
return bindings; return bindings;
if (content.Contains('\t'))
content = content.Replace('\t', ' ');
foreach (string it in content.Split('\n')) foreach (string it in content.Split('\n'))
{ {
string line = it.Trim(); string line = it.Trim();

35
src/MpvNet/Player.cs
View File

@@ -131,10 +131,6 @@ public class MainPlayer : MpvClient
if (err < 0) if (err < 0)
throw new Exception("mpv_initialize error" + BR2 + GetError(err) + BR); throw new Exception("mpv_initialize error" + BR2 + GetError(err) + BR);
SetPropertyString("user-data/frontend/name", "mpv.net");
SetPropertyString("user-data/frontend/version", AppInfo.Version.ToString());
SetPropertyString("user-data/frontend/process-path", Environment.ProcessPath!);
string idle = GetPropertyString("idle"); string idle = GetPropertyString("idle");
App.Exit = idle == "no" || idle == "once"; App.Exit = idle == "no" || idle == "once";
@@ -152,6 +148,10 @@ public class MainPlayer : MpvClient
// this means Lua scripts that use idle might not work correctly // this means Lua scripts that use idle might not work correctly
SetPropertyString("idle", "yes"); SetPropertyString("idle", "yes");
SetPropertyString("user-data/frontend/name", "mpv.net");
SetPropertyString("user-data/frontend/version", AppInfo.Version.ToString());
SetPropertyString("user-data/frontend/process-path", Environment.ProcessPath!);
ObservePropertyBool("pause", value => { ObservePropertyBool("pause", value => {
Paused = value; Paused = value;
Pause?.Invoke(); Pause?.Invoke();
@@ -419,7 +419,14 @@ public class MainPlayer : MpvClient
{ {
foreach (var pair in CommandLine.Arguments) foreach (var pair in CommandLine.Arguments)
{ {
if (pair.Name.EndsWith("-add")) if (pair.Name.EndsWith("-add") ||
pair.Name.EndsWith("-set") ||
pair.Name.EndsWith("-pre") ||
pair.Name.EndsWith("-clr") ||
pair.Name.EndsWith("-append") ||
pair.Name.EndsWith("-remove") ||
pair.Name.EndsWith("-toggle"))
continue; continue;
ProcessProperty(pair.Name, pair.Value); ProcessProperty(pair.Name, pair.Value);
@@ -434,11 +441,19 @@ public class MainPlayer : MpvClient
foreach (var pair in CommandLine.Arguments) foreach (var pair in CommandLine.Arguments)
{ {
if (pair.Name.EndsWith("-add")) if (pair.Name.EndsWith("-add"))
{ CommandV("change-list", pair.Name[..^4], "add", pair.Value);
string name = pair.Name[..^4]; else if (pair.Name.EndsWith("-set"))
string separator = name.Contains("-file") || name.Contains("-path") ? ";" : ","; CommandV("change-list", pair.Name[..^4], "set", pair.Value);
SetPropertyString(name, (GetPropertyString(name) + separator + pair.Value).TrimStart(',', ';')); else if (pair.Name.EndsWith("-append"))
} CommandV("change-list", pair.Name[..^7], "append", pair.Value);
else if (pair.Name.EndsWith("-pre"))
CommandV("change-list", pair.Name[..^4], "pre", pair.Value);
else if (pair.Name.EndsWith("-clr"))
CommandV("change-list", pair.Name[..^4], "clr", "");
else if (pair.Name.EndsWith("-remove"))
CommandV("change-list", pair.Name[..^7], "remove", pair.Value);
else if (pair.Name.EndsWith("-toggle"))
CommandV("change-list", pair.Name[..^7], "toggle", pair.Value);
} }
} }