From 3cc11870362934f93dea477efcd767929d238b74 Mon Sep 17 00:00:00 2001
From: Zaggy1024 <Zaggy1024@gmail.com>
Date: Thu, 20 Jun 2024 23:09:53 -0500
Subject: [PATCH] LibMedia: Move VideoSampleData out of the Video namespace

---
 .../LibMedia/Containers/Matroska/MatroskaDemuxer.cpp         | 2 +-
 Userland/Libraries/LibMedia/PlaybackManager.cpp              | 2 +-
 Userland/Libraries/LibMedia/Sample.h                         | 5 +++--
 Userland/Libraries/LibMedia/{Video => }/VideoSampleData.h    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename Userland/Libraries/LibMedia/{Video => }/VideoSampleData.h (95%)

diff --git a/Userland/Libraries/LibMedia/Containers/Matroska/MatroskaDemuxer.cpp b/Userland/Libraries/LibMedia/Containers/Matroska/MatroskaDemuxer.cpp
index 9539c263dc5..e16b2da22aa 100644
--- a/Userland/Libraries/LibMedia/Containers/Matroska/MatroskaDemuxer.cpp
+++ b/Userland/Libraries/LibMedia/Containers/Matroska/MatroskaDemuxer.cpp
@@ -148,7 +148,7 @@ DecoderErrorOr<Sample> MatroskaDemuxer::get_next_sample_for_track(Track track)
         status.frame_index = 0;
     }
     auto cicp = TRY(m_reader.track_for_track_number(track.identifier()))->video_track()->color_format.to_cicp();
-    return Sample(status.block->timestamp(), status.block->frame(status.frame_index++), Video::VideoSampleData(cicp));
+    return Sample(status.block->timestamp(), status.block->frame(status.frame_index++), VideoSampleData(cicp));
 }
 
 DecoderErrorOr<Duration> MatroskaDemuxer::duration()
diff --git a/Userland/Libraries/LibMedia/PlaybackManager.cpp b/Userland/Libraries/LibMedia/PlaybackManager.cpp
index fd9afdce96f..1a28f32e31d 100644
--- a/Userland/Libraries/LibMedia/PlaybackManager.cpp
+++ b/Userland/Libraries/LibMedia/PlaybackManager.cpp
@@ -218,7 +218,7 @@ void PlaybackManager::decode_and_queue_one_sample()
                 break;
             }
             auto sample = sample_result.release_value();
-            container_cicp = sample.auxiliary_data().get<Video::VideoSampleData>().container_cicp();
+            container_cicp = sample.auxiliary_data().get<VideoSampleData>().container_cicp();
 
             // Submit the sample to the decoder.
             auto decode_result = m_decoder->receive_sample(sample.timestamp(), sample.data());
diff --git a/Userland/Libraries/LibMedia/Sample.h b/Userland/Libraries/LibMedia/Sample.h
index 7ce24e514d0..d03b08394cf 100644
--- a/Userland/Libraries/LibMedia/Sample.h
+++ b/Userland/Libraries/LibMedia/Sample.h
@@ -8,13 +8,14 @@
 
 #include <AK/ByteBuffer.h>
 #include <AK/Time.h>
-#include <LibMedia/Video/VideoSampleData.h>
+
+#include "VideoSampleData.h"
 
 namespace Media {
 
 class Sample final {
 public:
-    using AuxiliaryData = Variant<Video::VideoSampleData>;
+    using AuxiliaryData = Variant<VideoSampleData>;
 
     Sample(Duration timestamp, ReadonlyBytes data, AuxiliaryData auxiliary_data)
         : m_timestamp(timestamp)
diff --git a/Userland/Libraries/LibMedia/Video/VideoSampleData.h b/Userland/Libraries/LibMedia/VideoSampleData.h
similarity index 95%
rename from Userland/Libraries/LibMedia/Video/VideoSampleData.h
rename to Userland/Libraries/LibMedia/VideoSampleData.h
index a667b841918..7745d28ff93 100644
--- a/Userland/Libraries/LibMedia/Video/VideoSampleData.h
+++ b/Userland/Libraries/LibMedia/VideoSampleData.h
@@ -8,7 +8,7 @@
 
 #include <LibMedia/Color/CodingIndependentCodePoints.h>
 
-namespace Media::Video {
+namespace Media {
 
 class VideoSampleData {
 public: