Skip to content

Commit d7257c0

Browse files
SuRGeoNixSuRGeoNix
committed
AudioDecoder: Fixes an issue with audio filters when the audio input channel is unspecified (mainly noticed with ffmpeg devices and microphones)
+Minor updates for Sample
1 parent fb6f032 commit d7257c0

5 files changed

Lines changed: 20 additions & 8 deletions

File tree

‎FlyleafLib.Controls.WPF/Themes/FlyleafBar.xaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
3+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
mc:Ignorable="d"
46
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
57
xmlns:flwpf="clr-namespace:FlyleafLib.Controls.WPF">
68

@@ -70,7 +72,7 @@
7072
</Grid.ColumnDefinitions>
7173

7274
<!--Current Time | Slider | Duration-->
73-
<TextBlock Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Player.CurTime, Converter={StaticResource TicksToTime}}"/>
75+
<TextBlock Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Player.CurTime, Converter={StaticResource TicksToTime}}" d:Text="00:00:00"/>
7476
<Slider Grid.Column="1" IsSelectionRangeEnabled="True" SelectionStart="{Binding RelativeSource={RelativeSource Self}, Path=Value, Mode=OneWay}" Style="{DynamicResource FlyleafSlider}" Focusable="False" Margin="10,0,10,0" VerticalAlignment="Center" Value="{Binding Player.CurTime, Mode=TwoWay, Converter={StaticResource TicksToSeconds}}" Maximum="{Binding Player.Duration, Converter={StaticResource TicksToSeconds}}">
7577
<Slider.SelectionEnd>
7678
<MultiBinding Converter="{StaticResource SumConverter}">
@@ -79,7 +81,7 @@
7981
</MultiBinding>
8082
</Slider.SelectionEnd>
8183
</Slider>
82-
<TextBlock Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Player.Duration, Converter={StaticResource TicksToTime}}"/>
84+
<TextBlock Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Player.Duration, Converter={StaticResource TicksToTime}}" d:Text="00:00:00"/>
8385
</Grid>
8486

8587
<Grid Grid.Row="1" Margin="0,0,0,0">
@@ -199,7 +201,7 @@
199201
</Button>
200202

201203
<!--Volume Slider (Decibel)-->
202-
<Slider Grid.Column="4" Style="{DynamicResource FlyleafSlider}" Foreground="{DynamicResource SecondaryHueMidBrush}" Focusable="False" Margin="0,0,6,6" Width="100" VerticalAlignment="Bottom" Minimum="0" Maximum="{Binding Player.Config.Player.VolumeMax, Mode=OneWay}" Value="{Binding Player.Audio.Volume}"/>
204+
<Slider Grid.Column="4" Style="{DynamicResource FlyleafSlider}" Foreground="{DynamicResource SecondaryHueMidBrush}" Focusable="False" Margin="0,0,6,6" Width="100" VerticalAlignment="Bottom" Minimum="0" Maximum="{Binding Player.Config.Player.VolumeMax, Mode=OneWay}" d:Maximum="150" d:Value="75" Value="{Binding Player.Audio.Volume}"/>
203205

204206
<!--Open Settings Button-->
205207
<Button Grid.Column="5" Style="{StaticResource IconButton}" Content="{materialDesign:PackIcon Kind=SettingsOutline}" Command="{Binding OpenSettingsCmd}"/>

‎FlyleafLib/MediaFramework/MediaStream/AudioStream.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ public override void Refresh()
3131
SampleFormat = (AVSampleFormat) Enum.ToObject(typeof(AVSampleFormat), AVStream->codecpar->format);
3232
SampleFormatStr = av_get_sample_fmt_name(SampleFormat);
3333
SampleRate = AVStream->codecpar->sample_rate;
34+
35+
if (AVStream->codecpar->ch_layout.order == AVChannelOrder.AV_CHANNEL_ORDER_UNSPEC)
36+
av_channel_layout_default(&AVStream->codecpar->ch_layout, AVStream->codecpar->ch_layout.nb_channels);
37+
3438
ChannelLayout = AVStream->codecpar->ch_layout.u.mask;
3539
Channels = AVStream->codecpar->ch_layout.nb_channels;
3640
Bits = AVStream->codecpar->bits_per_coded_sample;

‎Samples/FlyleafPlayer (WPF Control) (WPF)/App.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ private EngineConfig DefaultEngineConfig()
4646
engineConfig.FFmpegHLSLiveSeek
4747
= true;
4848
engineConfig.UIRefresh = true;
49+
engineConfig.FFmpegDevices = true;
4950

5051
#if RELEASE
5152
engineConfig.LogOutput = "Flyleaf.FirstRun.log";
5253
engineConfig.LogLevel = LogLevel.Debug;
53-
engineConfig.FFmpegDevices = true;
5454
#else
5555
engineConfig.LogOutput = ":debug";
5656
engineConfig.LogLevel = LogLevel.Debug;

‎Samples/FlyleafPlayer (WPF Control) (WPF)/Dictionary.xaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33

44
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
5-
xmlns:flyleafLib="clr-namespace:FlyleafLib;assembly=FlyleafLib">
5+
xmlns:flyleafLib="clr-namespace:FlyleafLib;assembly=FlyleafLib"
6+
xmlns:flwpf="clr-namespace:FlyleafLib.Controls.WPF;assembly=FlyleafLib">
67

78
<ResourceDictionary.MergedDictionaries>
89
<ResourceDictionary Source="pack://application:,,,/FlyleafLib.Controls.WPF;component/Resources/MaterialDesign.xaml"/>
910
<ResourceDictionary Source="pack://application:,,,/FlyleafLib.Controls.WPF;component/Resources/Converters.xaml"/>
1011
<ResourceDictionary Source="pack://application:,,,/FlyleafLib.Controls.WPF;component/Resources/PopUpMenu.xaml"/>
1112
</ResourceDictionary.MergedDictionaries>
1213

14+
<flwpf:TicksToTimeSpanConverter x:Key="TicksToTimeSpan"/>
15+
1316
<!--Overriding FlyleafME's Popup Menu (Using FlyleafME's Tag to pass our DataContext) -->
1417
<ContextMenu x:Key="PopUpMenu" Style="{StaticResource FlyleafContextMenu}">
1518
<MenuItem Header="Open File" Command="{Binding OpenFileDialog}" Icon="{materialDesign:PackIcon FolderOutline}" />

‎Samples/FlyleafPlayer (WPF Control) (WPF)/MainWindow.xaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
mc:Ignorable="d"
1212
TextElement.FontWeight="Regular"
1313
TextElement.FontSize="13"
14-
TextOptions.TextFormattingMode="Ideal"
14+
TextOptions.TextFormattingMode="Ideal"
1515
TextOptions.TextRenderingMode="Auto"
1616

1717
Title="Flyleaf" WindowStyle="None" ResizeMode="NoResize" AllowsTransparency="True" Background="Transparent"
@@ -130,7 +130,7 @@
130130

131131
<Grid Grid.Row="1" x:Name="PART_ContextMenuOwner" ContextMenu="{StaticResource PopUpMenu}">
132132

133-
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Padding="4" Margin="10 -40 0 0" d:Text="00:00:00" FontWeight="Bold" FontSize="18" Text="{Binding Player.CurTime, Converter={StaticResource TicksToTime}}" Foreground="{DynamicResource SecondaryHueMidBrush}">
133+
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Padding="4" Margin="10 -40 0 0" d:Text="00:00:00.000 / 01:42:23.913" FontWeight="Bold" FontSize="18" Foreground="{DynamicResource SecondaryHueMidBrush}">
134134
<TextBlock.Background>
135135
<SolidColorBrush Color="{Binding Player.Config.Video.BackgroundColor}" Opacity="0.15"/>
136136
</TextBlock.Background>
@@ -144,6 +144,9 @@
144144
</Style.Triggers>
145145
</Style>
146146
</TextBlock.Style>
147+
<Run Text="{Binding Player.CurTime, Mode=OneWay, Converter={StaticResource TicksToTimeSpan}, StringFormat={}{0:hh\\:mm\\:ss\\.fff}}"/>
148+
<Run Text="/"/>
149+
<Run Text="{Binding Player.Duration, Mode=OneWay, Converter={StaticResource TicksToTimeSpan}, StringFormat={}{0:hh\\:mm\\:ss\\.fff}}"/>
147150
</TextBlock>
148151

149152
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Right" Padding="4" Margin="0 10 10 0" FontWeight="Bold" d:Text="Volume 50%" FontSize="16" Text="{Binding Tag.Msg}" Foreground="{DynamicResource SecondaryHueMidBrush}">

0 commit comments

Comments
 (0)