mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-17 23:12:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibMedia: Move VideoSampleData out of the Video namespace

Browse source
This commit is contained in:
Zaggy1024 2024-06-20 23:09:53 -05:00 • committed by Andrew Kaster
commit 3cc1187036
Notes: sideshowbarker 2024-07-16 17:12:03 +09:00
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibMedia/Containers/Matroska/MatroskaDemuxer.cpp
View file

@ -148,7 +148,7 @@ DecoderErrorOr<Sample> MatroskaDemuxer::get_next_sample_for_track(Track track)
status.frame_index = 0; status.frame_index = 0;
} }
auto cicp = TRY(m_reader.track_for_track_number(track.identifier()))->video_track()->color_format.to_cicp(); 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() DecoderErrorOr<Duration> MatroskaDemuxer::duration()

2
Userland/Libraries/LibMedia/PlaybackManager.cpp
View file

@ -218,7 +218,7 @@ void PlaybackManager::decode_and_queue_one_sample()
break; break;
} }
auto sample = sample_result.release_value(); 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. // Submit the sample to the decoder.
auto decode_result = m_decoder->receive_sample(sample.timestamp(), sample.data()); auto decode_result = m_decoder->receive_sample(sample.timestamp(), sample.data());

5
Userland/Libraries/LibMedia/Sample.h
View file

@ -8,13 +8,14 @@
#include <AK/ByteBuffer.h> #include <AK/ByteBuffer.h>
#include <AK/Time.h> #include <AK/Time.h>
#include <LibMedia/Video/VideoSampleData.h>
#include "VideoSampleData.h"
namespace Media { namespace Media {
class Sample final { class Sample final {
public: public:
using AuxiliaryData = Variant<Video::VideoSampleData>; using AuxiliaryData = Variant<VideoSampleData>;
Sample(Duration timestamp, ReadonlyBytes data, AuxiliaryData auxiliary_data) Sample(Duration timestamp, ReadonlyBytes data, AuxiliaryData auxiliary_data)
: m_timestamp(timestamp) : m_timestamp(timestamp)

2
Userland/Libraries/LibMedia/Video/VideoSampleData.h → Userland/Libraries/LibMedia/VideoSampleData.h
View file

@ -8,7 +8,7 @@
#include <LibMedia/Color/CodingIndependentCodePoints.h> #include <LibMedia/Color/CodingIndependentCodePoints.h>
namespace Media::Video { namespace Media {
class VideoSampleData { class VideoSampleData {
public: public: