Basic refactor to let VideoDecoder decoder Audio/Video at the same time

ppy · Sep 21, 2024 · 9781021 · 9781021
1 parent eefb825
commit 9781021
Show file tree

Hide file tree

Showing 3 changed files with 218 additions and 131 deletions.
diff --git a/osu.Framework/Audio/SDL3AudioDecoderManager.cs b/osu.Framework/Audio/SDL3AudioDecoderManager.cs
@@ -524,9 +524,9 @@ protected override int LoadFromStreamInternal(out byte[] decoded)
                             SDL3.SDL_AUDIO_ISFLOAT(AudioSpec.format), SDL3.SDL_AUDIO_BITSIZE(AudioSpec.format), SDL3.SDL_AUDIO_ISSIGNED(AudioSpec.format));
 
                         ffmpeg.PrepareDecoding();
-                        ffmpeg.RecreateCodecContext();
+                        ffmpeg.OpenAudioStream();
 
-                        Bitrate = (int)ffmpeg.Bitrate;
+                        Bitrate = (int)ffmpeg.AudioBitrate;
                         Length = ffmpeg.Duration;
                         ByteLength = (long)Math.Ceiling(ffmpeg.Duration / 1000.0d * AudioSpec.freq) * AudioSpec.channels * (SDL3.SDL_AUDIO_BITSIZE(AudioSpec.format) / 8); // FIXME
 

diff --git a/osu.Framework/Graphics/Video/FFmpegFuncs.cs b/osu.Framework/Graphics/Video/FFmpegFuncs.cs
@@ -110,6 +110,8 @@ public unsafe class FFmpegFuncs
 
         public delegate long AvGetDefaultChannelLayoutDelegate(int nbChannels);
 
+        public delegate AVCodec* AvCodecFindDecoderDelegate(AVCodecID id);
+
         #endregion
 
         [CanBeNull]
@@ -163,6 +165,7 @@ public unsafe class FFmpegFuncs
         public SwrGetDelayDelegate swr_get_delay;
         public AvSamplesGetBufferSizeDelegate av_samples_get_buffer_size;
         public AvGetDefaultChannelLayoutDelegate av_get_default_channel_layout;
+        public AvCodecFindDecoderDelegate avcodec_find_decoder;
 
         // Touching AutoGen.ffmpeg or its LibraryLoader in any way on non-Desktop platforms
         // will cause it to throw in static constructor, which can't be bypassed.