[XMP] Fixed error caused by incorrect audio allocation for FFMPEG

Author: Gliniak

src/xenia/apu/audio_media_player.cc

@@ -37,11 +37,11 @@ DEFINE_int32(xmp_default_volume, 70,
 namespace xe {
 namespace apu {
 
-int32_t InitializeAndOpenAvCodec(std::vector<uint8_t>* song_data,
+int32_t InitializeAndOpenAvCodec(std::span<uint8_t> song_data,
                                  AVFormatContext*& format_context,
                                  AVCodecContext*& av_context) {
   AVIOContext* io_ctx =
-      avio_alloc_context(song_data->data(), (int)song_data->size(), 0, nullptr,
+      avio_alloc_context(song_data.data(), (int)song_data.size(), 0, nullptr,
                          nullptr, nullptr, nullptr);
 
   format_context = avformat_alloc_context();
@@ -224,9 +224,8 @@ X_STATUS AudioMediaPlayer::Play(uint32_t playlist_handle, uint32_t song_handle,
 }
 
 void AudioMediaPlayer::Play() {
-  std::vector<uint8_t>* song_buffer = new std::vector<uint8_t>();
-
-  if (!LoadSongToMemory(song_buffer)) {
+  std::span<uint8_t> song_buffer = LoadSongToMemory();
+  if (song_buffer.empty()) {
     return;
   }
 
@@ -400,9 +399,9 @@ X_STATUS AudioMediaPlayer::Previous() {
   return X_STATUS_SUCCESS;
 }
 
-bool AudioMediaPlayer::LoadSongToMemory(std::vector<uint8_t>* buffer) {
+std::span<uint8_t> AudioMediaPlayer::LoadSongToMemory() {
   if (!active_song_) {
-    return false;
+    return {};
   }
 
   // Find file based on provided path?
@@ -414,16 +413,26 @@ bool AudioMediaPlayer::LoadSongToMemory(std::vector<uint8_t>* buffer) {
       &vfs_file, &file_action);
 
   if (result) {
-    return false;
+    return {};
+  }
+
+  std::span<uint8_t> buffer = {
+      static_cast<uint8_t*>(av_malloc(vfs_file->entry()->size())),
+      vfs_file->entry()->size()};
+
+  if (buffer.empty()) {
+    return {};
   }
 
-  buffer->resize(vfs_file->entry()->size());
   size_t bytes_read = 0;
-  result = vfs_file->ReadSync(
-      std::span<uint8_t>(buffer->data(), vfs_file->entry()->size()), 0,
-      &bytes_read);
+  result = vfs_file->ReadSync(buffer, 0, &bytes_read);
+  if (result != X_ERROR_SUCCESS) {
+    // Read failed. We need to manually release resources from av_malloc.
+    av_freep(buffer.data());
+    return {};
+  }
 
-  return !result;
+  return buffer;
 }
 
 void AudioMediaPlayer::AddPlaylist(uint32_t handle,

src/xenia/apu/audio_media_player.h

@@ -99,7 +99,7 @@ class AudioMediaPlayer {
 
   void Play();
   void WorkerThreadMain();
-  bool LoadSongToMemory(std::vector<uint8_t>* buffer);
+  std::span<uint8_t> LoadSongToMemory();
 
   XmpApp::State state_ = XmpApp::State::kIdle;
   XmpApp::PlaybackClient playback_client_ = XmpApp::PlaybackClient::kSystem;