Feature/H265 Support

Examples/SimpleRtspPlayer/App.xaml.cs

@@ -1,9 +1,19 @@
-namespace SimpleRtspPlayer
+using SimpleRtspPlayer.GUI.Views;
+using System;
+using System.Windows;
+
+namespace SimpleRtspPlayer
 {
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
-    public partial class App
+    public partial class App : Application
     {
+        protected override void OnActivated(EventArgs e)
+        {
+            base.OnActivated(e);
+
+            //LoggerWindow.Instance.Show();
+        }
     }
 }

Examples/SimpleRtspPlayer/GUI/RealtimeVideoSource.cs

@@ -77,6 +77,8 @@ private FFmpegVideoCodecId DetectCodecId(RawVideoFrame videoFrame)
                 return FFmpegVideoCodecId.MJPEG;
             if (videoFrame is RawH264Frame)
                 return FFmpegVideoCodecId.H264;
+            if (videoFrame is RawH265Frame)
+                return FFmpegVideoCodecId.HEVC;
 
             throw new ArgumentOutOfRangeException(nameof(videoFrame));
         }

Examples/SimpleRtspPlayer/GUI/ViewModels/LoggerWindowViewModel.cs

@@ -0,0 +1,63 @@
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using Logger;
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows;
+using LoggerWindow = SimpleRtspPlayer.GUI.Views.LoggerWindow;
+
+namespace SimpleRtspPlayer.GUI.ViewModels
+{
+    public unsafe class LoggerWindowViewModel : ViewModelBase
+    {
+        private bool _canExecute = true;
+
+        public RelayCommand SaveLogToFileCommand { get; }
+        public RelayCommand ClearLogCommand { get; }
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate void LogDelegate(byte* data);
+
+        public static LogDelegate logDelegate;
+
+        public LoggerWindowViewModel()
+        {
+            PlayerLogger.fLogMethod = (s) => OnLogUpdated(s);
+            logDelegate = new LogDelegate(PlayerLogger.LogDllOutput);
+
+            SaveLogToFileCommand = new RelayCommand(OnSaveLogToFile, () => _canExecute);
+            ClearLogCommand = new RelayCommand(OnClearLog, () => _canExecute);
+        }
+
+        private void OnSaveLogToFile()
+        {
+            var path = $@"";
+            var logToSave = SimpleRtspPlayer.GUI.Views.LoggerWindow.Instance.logTextBox.Text;
+            var appendTextId = $"---------------  LogDate { DateTime.Now.Day }_{ DateTime.Now.Hour}_{ DateTime.Now.Minute}_{ DateTime.Now.Second} ---------------";
+
+            StringBuilder sb = new StringBuilder($"{ appendTextId }\n{ logToSave }");
+
+            if (!File.Exists(path))
+            {
+                File.WriteAllText(path, sb.ToString());
+            }
+
+            File.AppendAllText(path, sb.ToString());
+        }
+
+        private void OnClearLog()
+         => LoggerWindow.Instance.logTextBox.Clear();
+
+        private void OnLogUpdated(string info)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                LoggerWindow.Instance.logTextBox.AppendText($"{ info }\n");
+                LoggerWindow.Instance.logTextBox.CaretIndex = LoggerWindow.Instance.logTextBox.Text.Length;
+                LoggerWindow.Instance.logTextBox.ScrollToEnd();
+            });
+        }
+    }
+}

Examples/SimpleRtspPlayer/GUI/ViewModels/MainWindowViewModel.cs

@@ -1,11 +1,11 @@
-using System;
+using GalaSoft.MvvmLight.Command;
+using RtspClientSharp;
+using SimpleRtspPlayer.GUI.Models;
+using System;
 using System.ComponentModel;
 using System.Net;
 using System.Runtime.CompilerServices;
 using System.Windows;
-using GalaSoft.MvvmLight.Command;
-using RtspClientSharp;
-using SimpleRtspPlayer.GUI.Models;
 
 namespace SimpleRtspPlayer.GUI.ViewModels
 {
@@ -19,8 +19,9 @@ class MainWindowViewModel : INotifyPropertyChanged
         private bool _startButtonEnabled = true;
         private bool _stopButtonEnabled;
 
-        public string DeviceAddress { get; set; } = "rtsp://184.72.239.149/vod/mp4:BigBuckBunny_115k.mov";
+        public LoggerWindowViewModel loggerViewModel;
 
+        public string DeviceAddress { get; set; } = "rtsp://184.72.239.149/vod/mp4:BigBuckBunny_115k.mov"; //Remove this comment before commit to the remote branch    
         public string Login { get; set; } = "admin";
         public string Password { get; set; } = "123456";
 
@@ -45,7 +46,7 @@ public string Status
         public MainWindowViewModel(IMainWindowModel mainWindowModel)
         {
             _mainWindowModel = mainWindowModel ?? throw new ArgumentNullException(nameof(mainWindowModel));
-            
+
             StartClickCommand = new RelayCommand(OnStartButtonClick, () => _startButtonEnabled);
             StopClickCommand = new RelayCommand(OnStopButtonClick, () => _stopButtonEnabled);
             ClosingCommand = new RelayCommand<CancelEventArgs>(OnClosing);
@@ -71,10 +72,10 @@ private void OnStartButtonClick()
 
             var credential = new NetworkCredential(Login, Password);
 
-            var connectionParameters = !string.IsNullOrEmpty(deviceUri.UserInfo) ? new ConnectionParameters(deviceUri) : 
+            var connectionParameters = !string.IsNullOrEmpty(deviceUri.UserInfo) ? new ConnectionParameters(deviceUri) :
                 new ConnectionParameters(deviceUri, credential);
 
-            connectionParameters.RtpTransport = RtpTransportProtocol.UDP;
+            connectionParameters.RtpTransport = RtpTransportProtocol.TCP;
             connectionParameters.CancelTimeout = TimeSpan.FromSeconds(1);
 
             _mainWindowModel.Start(connectionParameters);

Examples/SimpleRtspPlayer/GUI/Views/LoggerView.xaml

@@ -0,0 +1,25 @@
+<Window x:Class="SimpleRtspPlayer.GUI.Views.LoggerView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:SimpleRtspPlayer.GUI.Views"
+        mc:Ignorable="d"
+        Title="Logger" Height="450" Width="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="10"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="10"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="10"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="10"/>
+        </Grid.RowDefinitions>
+
+        <TextBox x:Name="logTextBox" Grid.Column="1" Grid.Row="1" TextWrapping="Wrap" IsReadOnly="True"/>
+
+    </Grid>
+</Window>

Examples/SimpleRtspPlayer/GUI/Views/LoggerView.xaml.cs

@@ -0,0 +1,17 @@
+using Logger;
+using System.Windows;
+
+namespace SimpleRtspPlayer.GUI.Views
+{
+    /// <summary>
+    /// Interaction logic for Logger.xaml
+    /// </summary>
+    public partial class LoggerView : Window
+    {
+        public LoggerView()
+        {
+            InitializeComponent();
+            PlayerLogger.fLogMethod = (s) => logTextBox.AppendText(s);
+        }
+    }
+}

Examples/SimpleRtspPlayer/GUI/Views/LoggerWindow.xaml

@@ -0,0 +1,30 @@
+<Window x:Class="SimpleRtspPlayer.GUI.Views.LoggerWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:viewmodels="clr-namespace:SimpleRtspPlayer.GUI.ViewModels" 
+        DataContext="{Binding LoggerWindowViewModel, Source={StaticResource ViewModelLocator}}"
+        mc:Ignorable="d"
+        Title="LoggerWindow" Height="450" Width="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="10"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="10"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="10"/>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="10"/>
+        </Grid.RowDefinitions>
+
+        <TextBox x:Name="logTextBox" Grid.Column="1" Grid.Row="1" TextWrapping="Wrap" IsReadOnly="True"
+                 HorizontalAlignment="Left" VerticalAlignment="Top" VerticalScrollBarVisibility="Auto" Width="760" Height="350"/>
+
+        <StackPanel Grid.Column="1" Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center">
+            <Button Content="Save to File" Width="200" Margin="4" Command="{Binding SaveLogToFileCommand}" />
+            <Button Content="Clear Log" Width="200" Margin="4" Command="{Binding ClearLogCommand}" />
+        </StackPanel>
+    </Grid>
+</Window>

Examples/SimpleRtspPlayer/GUI/Views/LoggerWindow.xaml.cs

@@ -0,0 +1,23 @@
+using System.Windows;
+
+namespace SimpleRtspPlayer.GUI.Views
+{
+    /// <summary>
+    /// Interaction logic for LoggerWindow.xaml
+    /// </summary>
+    public partial class LoggerWindow
+    {
+        public static LoggerWindow Instance { get; private set; }
+
+        static LoggerWindow()
+        {
+            Instance = new LoggerWindow();
+        }
+
+        private LoggerWindow()
+        {
+            InitializeComponent();
+        }
+
+    }
+}

Examples/SimpleRtspPlayer/GUI/Views/MainWindow.xaml

@@ -34,14 +34,18 @@
         </i:EventTrigger>
     </i:Interaction.Triggers>
     <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <views:VideoView Grid.Row="0" VideoSource="{Binding VideoSource}" />
+        <views:VideoView Grid.Column="0" Grid.Row="0" VideoSource="{Binding VideoSource}" />
         <Grid Grid.Row="1" Margin="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="2*" />
@@ -74,7 +78,7 @@
             <Button Content="Start" Width="200" Margin="4" Command="{Binding StartClickCommand}" />
             <Button Content="Stop" Width="200" Margin="4" Command="{Binding StopClickCommand}" />
         </StackPanel>
-        <TextBlock Margin="2" Grid.Row="3" Text="Supported codecs: H264/MJPEG; Use &quot;http:&#47;&#47;&quot; prefix in address to connect through HTTP tunnel" />
+        <TextBlock Margin="2" Grid.Row="3" Text="Supported codecs: H264/H265/MJPEG; Use &quot;http:&#47;&#47;&quot; prefix in address to connect through HTTP tunnel" />
         <TextBlock Margin="2" Grid.Row="4" Height="20" Background="LightGray" Text="{Binding Status}" />
     </Grid>
 </Window>

Examples/SimpleRtspPlayer/RawFramesDecoding/FFmpeg/FFmpegDecodedVideoScaler.cs

@@ -91,7 +91,7 @@ public static FFmpegDecodedVideoScaler Create(DecodedVideoFrameParameters decode
                 scaledWidth, scaledHeight, scaledFFmpegPixelFormat, scaleQuality, out var handle);
 
             if (resultCode != 0)
-                throw new DecoderException(@"An error occurred while creating scaler, code: {resultCode}");
+                throw new DecoderException($"An error occurred while creating scaler, code: {resultCode}");
 
             return new FFmpegDecodedVideoScaler(handle, scaledWidth, scaledHeight, scaledPixelFormat);
         }
@@ -126,7 +126,7 @@ private static FFmpegPixelFormat GetFFmpegPixelFormat(PixelFormat pixelFormat)
                 return FFmpegPixelFormat.BGRA;
             if (pixelFormat == PixelFormat.Grayscale)
                 return FFmpegPixelFormat.GRAY8;
-            if (pixelFormat == PixelFormat.Bgr24)
+                if (pixelFormat == PixelFormat.Bgr24)
                 return FFmpegPixelFormat.BGR24;
 
             throw new ArgumentOutOfRangeException(nameof(pixelFormat));

Examples/SimpleRtspPlayer/RawFramesDecoding/FFmpeg/FFmpegVideoDecoder.cs

@@ -1,9 +1,8 @@
-using System;
+using RtspClientSharp.RawFrames.Video;
+using SimpleRtspPlayer.RawFramesDecoding.DecodedFrames;
+using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using RtspClientSharp.RawFrames.Video;
-using SimpleRtspPlayer.RawFramesDecoding.DecodedFrames;
 
 namespace SimpleRtspPlayer.RawFramesDecoding.FFmpeg
 {
@@ -71,13 +70,39 @@ public unsafe IDecodedVideoFrame TryDecode(RawVideoFrame rawVideoFrame)
                         }
                     }
                 }
+                else if (rawVideoFrame is RawH265IFrame rawH265IFrame)
+                {
+                    if (rawH265IFrame.ParametersBytesSegment.Array != null &&
+                        !_extraData.SequenceEqual(rawH265IFrame.ParametersBytesSegment))
+                    {
+                        if (_extraData.Length != rawH265IFrame.ParametersBytesSegment.Count)
+                            _extraData = new byte[rawH265IFrame.ParametersBytesSegment.Count];
+
+                        Buffer.BlockCopy(rawH265IFrame.ParametersBytesSegment.Array, rawH265IFrame.ParametersBytesSegment.Offset,
+                            _extraData, 0, rawH265IFrame.ParametersBytesSegment.Count);
+
+                        fixed (byte* initDataPtr = &_extraData[0])
+                        {
+                            resultCode = FFmpegVideoPInvoke.SetVideoDecoderExtraData(_decoderHandle,
+                                (IntPtr)initDataPtr, _extraData.Length);
+
+                            if (resultCode != 0)
+                                throw new DecoderException(
+                                    $"An error occurred while setting video extra data, {_videoCodecId} codec, code: {resultCode}");
+                        }
+                    }
+                }
+
+                char* resultString = null;
 
                 resultCode = FFmpegVideoPInvoke.DecodeFrame(_decoderHandle, (IntPtr)rawBufferPtr,
                     rawVideoFrame.FrameSegment.Count,
                     out int width, out int height, out FFmpegPixelFormat pixelFormat);
 
                 if (resultCode != 0)
-                    return null;
+                    throw new DecoderException(
+                        $"An error occurred while trying to decode the frames, { _videoCodecId } codec, code: { resultCode }");
+
 
                 if (_currentFrameParameters.Width != width || _currentFrameParameters.Height != height ||
                     _currentFrameParameters.PixelFormat != pixelFormat)

Examples/SimpleRtspPlayer/RawFramesDecoding/FFmpeg/FFmpegVideoPInvoke.cs

@@ -3,10 +3,12 @@
 
 namespace SimpleRtspPlayer.RawFramesDecoding.FFmpeg
 {
+    // enum AVCodecID at https://ffmpeg.org/doxygen/3.2/group__lavc__core.html#gaadca229ad2c20e060a14fec08a5cc7ce
     enum FFmpegVideoCodecId
     {
         MJPEG = 7,
-        H264 = 27
+        H264 = 27,
+        HEVC = 173
     }
 
     [Flags]
@@ -24,6 +26,7 @@ enum FFmpegPixelFormat
         None = -1,
         BGR24 = 3,
         GRAY8 = 8,
+        YUVJ420P = 12,
         BGRA = 28
     }
 
@@ -45,6 +48,15 @@ static class FFmpegVideoPInvoke
         public static extern int DecodeFrame(IntPtr handle, IntPtr rawBuffer, int rawBufferLength, out int frameWidth,
             out int frameHeight, out FFmpegPixelFormat framePixelFormat);
 
+        [DllImport(LibraryName, EntryPoint = "custom_alloc", CallingConvention = CallingConvention.Cdecl)]
+        public static unsafe extern void* Malloc(int buffer_size);
+
+        [DllImport(LibraryName, EntryPoint = "free_buff", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void Free(IntPtr buffer);
+
+        [DllImport(LibraryName, EntryPoint = "custom_free", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void CustomFree(IntPtr buff);
+
         [DllImport(LibraryName, EntryPoint = "scale_decoded_video_frame", CallingConvention = CallingConvention.Cdecl)]
         public static extern int ScaleDecodedVideoFrame(IntPtr handle, IntPtr scalerHandle, IntPtr scaledBuffer,
             int scaledBufferStride);