mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-13 11:39:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibMedia/Matroska: Make track entries ref-counted

Browse source 
These aren't particularly small objects, but we were still copying them
around all over the place. When TrackEntry contains data buffers, they
won't need to be copied as well.
This commit is contained in:
Zaggy1024 2024-06-19 17:09:15 -05:00 • committed by Andrew Kaster
commit 55fda2068b
Notes: sideshowbarker 2024-07-17 11:33:34 +09:00
4 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibMedia/Containers/Matroska/Document.h
View file

@ -46,7 +46,7 @@ private:
Optional<double> m_duration_unscaled; Optional<double> m_duration_unscaled;
}; };
class TrackEntry { class TrackEntry : public RefCounted<TrackEntry> {
public: public:
enum TrackType : u8 { enum TrackType : u8 {
Invalid = 0, Invalid = 0,

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

@ -136,7 +136,7 @@ DecoderErrorOr<Sample> MatroskaDemuxer::get_next_sample_for_track(Track track)
status.block = TRY(status.iterator.next_block()); status.block = TRY(status.iterator.next_block());
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++), Video::VideoSampleData(cicp));
} }
@ -148,7 +148,7 @@ DecoderErrorOr<Duration> MatroskaDemuxer::duration()
DecoderErrorOr<CodecID> MatroskaDemuxer::get_codec_id_for_track(Track track) DecoderErrorOr<CodecID> MatroskaDemuxer::get_codec_id_for_track(Track track)
{ {
auto codec_id = TRY(m_reader.track_for_track_number(track.identifier())).codec_id(); auto codec_id = TRY(m_reader.track_for_track_number(track.identifier()))->codec_id();
return get_codec_id_for_string(codec_id); return get_codec_id_for_string(codec_id);
} }

56
Userland/Libraries/LibMedia/Containers/Matroska/Reader.cpp
View file

@ -455,44 +455,44 @@ static DecoderErrorOr<TrackEntry::AudioTrack> parse_audio_track_information(Stre
return audio_track; return audio_track;
} }
static DecoderErrorOr<TrackEntry> parse_track_entry(Streamer& streamer) static DecoderErrorOr<NonnullRefPtr<TrackEntry>> parse_track_entry(Streamer& streamer)
{ {
TrackEntry track_entry; auto track_entry = DECODER_TRY_ALLOC(try_make_ref_counted<TrackEntry>());
TRY(parse_master_element(streamer, "Track"sv, [&](u64 element_id) -> DecoderErrorOr<IterationDecision> { TRY(parse_master_element(streamer, "Track"sv, [&](u64 element_id) -> DecoderErrorOr<IterationDecision> {
switch (element_id) { switch (element_id) {
case TRACK_NUMBER_ID: case TRACK_NUMBER_ID:
track_entry.set_track_number(TRY_READ(streamer.read_u64())); track_entry->set_track_number(TRY_READ(streamer.read_u64()));
dbgln_if(MATROSKA_TRACE_DEBUG, "Read TrackNumber attribute: {}", track_entry.track_number()); dbgln_if(MATROSKA_TRACE_DEBUG, "Read TrackNumber attribute: {}", track_entry->track_number());
break; break;
case TRACK_UID_ID: case TRACK_UID_ID:
track_entry.set_track_uid(TRY_READ(streamer.read_u64())); track_entry->set_track_uid(TRY_READ(streamer.read_u64()));
dbgln_if(MATROSKA_TRACE_DEBUG, "Read TrackUID attribute: {}", track_entry.track_uid()); dbgln_if(MATROSKA_TRACE_DEBUG, "Read TrackUID attribute: {}", track_entry->track_uid());
break; break;
case TRACK_TYPE_ID: case TRACK_TYPE_ID:
track_entry.set_track_type(static_cast<TrackEntry::TrackType>(TRY_READ(streamer.read_u64()))); track_entry->set_track_type(static_cast<TrackEntry::TrackType>(TRY_READ(streamer.read_u64())));
dbgln_if(MATROSKA_TRACE_DEBUG, "Read TrackType attribute: {}", to_underlying(track_entry.track_type())); dbgln_if(MATROSKA_TRACE_DEBUG, "Read TrackType attribute: {}", to_underlying(track_entry->track_type()));
break; break;
case TRACK_LANGUAGE_ID: case TRACK_LANGUAGE_ID:
track_entry.set_language(DECODER_TRY_ALLOC(String::from_byte_string(TRY_READ(streamer.read_string())))); track_entry->set_language(DECODER_TRY_ALLOC(String::from_byte_string(TRY_READ(streamer.read_string()))));
dbgln_if(MATROSKA_TRACE_DEBUG, "Read Track's Language attribute: {}", track_entry.language()); dbgln_if(MATROSKA_TRACE_DEBUG, "Read Track's Language attribute: {}", track_entry->language());
break; break;
case TRACK_CODEC_ID: case TRACK_CODEC_ID:
track_entry.set_codec_id(DECODER_TRY_ALLOC(String::from_byte_string(TRY_READ(streamer.read_string())))); track_entry->set_codec_id(DECODER_TRY_ALLOC(String::from_byte_string(TRY_READ(streamer.read_string()))));
dbgln_if(MATROSKA_TRACE_DEBUG, "Read Track's CodecID attribute: {}", track_entry.codec_id()); dbgln_if(MATROSKA_TRACE_DEBUG, "Read Track's CodecID attribute: {}", track_entry->codec_id());
break; break;
case TRACK_TIMESTAMP_SCALE_ID: case TRACK_TIMESTAMP_SCALE_ID:
track_entry.set_timestamp_scale(TRY_READ(streamer.read_float())); track_entry->set_timestamp_scale(TRY_READ(streamer.read_float()));
dbgln_if(MATROSKA_TRACE_DEBUG, "Read Track's TrackTimestampScale attribute: {}", track_entry.timestamp_scale()); dbgln_if(MATROSKA_TRACE_DEBUG, "Read Track's TrackTimestampScale attribute: {}", track_entry->timestamp_scale());
break; break;
case TRACK_OFFSET_ID: case TRACK_OFFSET_ID:
track_entry.set_timestamp_offset(TRY_READ(streamer.read_variable_size_signed_integer())); track_entry->set_timestamp_offset(TRY_READ(streamer.read_variable_size_signed_integer()));
dbgln_if(MATROSKA_TRACE_DEBUG, "Read Track's TrackOffset attribute: {}", track_entry.timestamp_offset()); dbgln_if(MATROSKA_TRACE_DEBUG, "Read Track's TrackOffset attribute: {}", track_entry->timestamp_offset());
break; break;
case TRACK_VIDEO_ID: case TRACK_VIDEO_ID:
track_entry.set_video_track(TRY(parse_video_track_information(streamer))); track_entry->set_video_track(TRY(parse_video_track_information(streamer)));
break; break;
case TRACK_AUDIO_ID: case TRACK_AUDIO_ID:
track_entry.set_audio_track(TRY(parse_audio_track_information(streamer))); track_entry->set_audio_track(TRY(parse_audio_track_information(streamer)));
break; break;
default: default:
TRY_READ(streamer.read_unknown_element()); TRY_READ(streamer.read_unknown_element());
@ -509,8 +509,8 @@ DecoderErrorOr<void> Reader::parse_tracks(Streamer& streamer)
TRY(parse_master_element(streamer, "Tracks"sv, [&](u64 element_id) -> DecoderErrorOr<IterationDecision> { TRY(parse_master_element(streamer, "Tracks"sv, [&](u64 element_id) -> DecoderErrorOr<IterationDecision> {
if (element_id == TRACK_ENTRY_ID) { if (element_id == TRACK_ENTRY_ID) {
auto track_entry = TRY(parse_track_entry(streamer)); auto track_entry = TRY(parse_track_entry(streamer));
dbgln_if(MATROSKA_DEBUG, "Parsed track {}", track_entry.track_number()); dbgln_if(MATROSKA_DEBUG, "Parsed track {}", track_entry->track_number());
DECODER_TRY_ALLOC(m_tracks.try_set(track_entry.track_number(), track_entry)); DECODER_TRY_ALLOC(m_tracks.try_set(track_entry->track_number(), track_entry));
} else { } else {
TRY_READ(streamer.read_unknown_element()); TRY_READ(streamer.read_unknown_element());
} }
@ -540,13 +540,13 @@ DecoderErrorOr<void> Reader::for_each_track_of_type(TrackEntry::TrackType type,
}); });
} }
DecoderErrorOr<TrackEntry> Reader::track_for_track_number(u64 track_number) DecoderErrorOr<NonnullRefPtr<TrackEntry>> Reader::track_for_track_number(u64 track_number)
{ {
TRY(ensure_tracks_are_parsed()); TRY(ensure_tracks_are_parsed());
auto optional_track_entry = m_tracks.get(track_number); auto optional_track_entry = m_tracks.get(track_number);
if (!optional_track_entry.has_value()) if (!optional_track_entry.has_value())
return DecoderError::format(DecoderErrorCategory::Invalid, "No track found with number {}", track_number); return DecoderError::format(DecoderErrorCategory::Invalid, "No track found with number {}", track_number);
return optional_track_entry.release_value(); return *optional_track_entry.release_value();
} }
DecoderErrorOr<size_t> Reader::track_count() DecoderErrorOr<size_t> Reader::track_count()
@ -589,7 +589,7 @@ static DecoderErrorOr<Cluster> parse_cluster(Streamer& streamer, u64 timestamp_s
return cluster; return cluster;
} }
static DecoderErrorOr<Block> parse_simple_block(Streamer& streamer, Duration cluster_timestamp, u64 segment_timestamp_scale, TrackEntry track) static DecoderErrorOr<Block> parse_simple_block(Streamer& streamer, Duration cluster_timestamp, u64 segment_timestamp_scale, TrackEntry const& track)
{ {
Block block; Block block;
@ -819,7 +819,7 @@ DecoderErrorOr<void> Reader::ensure_cues_are_parsed()
DecoderErrorOr<void> Reader::seek_to_cue_for_timestamp(SampleIterator& iterator, Duration const& timestamp) DecoderErrorOr<void> Reader::seek_to_cue_for_timestamp(SampleIterator& iterator, Duration const& timestamp)
{ {
auto const& cue_points = MUST(cue_points_for_track(iterator.m_track.track_number())).release_value(); auto const& cue_points = MUST(cue_points_for_track(iterator.m_track->track_number())).release_value();
// Take a guess at where in the cues the timestamp will be and correct from there. // Take a guess at where in the cues the timestamp will be and correct from there.
auto duration = TRY(segment_information()).duration(); auto duration = TRY(segment_information()).duration();
@ -900,7 +900,7 @@ DecoderErrorOr<bool> Reader::has_cues_for_track(u64 track_number)
DecoderErrorOr<SampleIterator> Reader::seek_to_random_access_point(SampleIterator iterator, Duration timestamp) DecoderErrorOr<SampleIterator> Reader::seek_to_random_access_point(SampleIterator iterator, Duration timestamp)
{ {
if (TRY(has_cues_for_track(iterator.m_track.track_number()))) { if (TRY(has_cues_for_track(iterator.m_track->track_number()))) {
TRY(seek_to_cue_for_timestamp(iterator, timestamp)); TRY(seek_to_cue_for_timestamp(iterator, timestamp));
VERIFY(iterator.last_timestamp().has_value()); VERIFY(iterator.last_timestamp().has_value());
return iterator; return iterator;
@ -908,7 +908,7 @@ DecoderErrorOr<SampleIterator> Reader::seek_to_random_access_point(SampleIterato
if (!iterator.last_timestamp().has_value() || timestamp < iterator.last_timestamp().value()) { if (!iterator.last_timestamp().has_value() || timestamp < iterator.last_timestamp().value()) {
// If the timestamp is before the iterator's current position, then we need to start from the beginning of the Segment. // If the timestamp is before the iterator's current position, then we need to start from the beginning of the Segment.
iterator = TRY(create_sample_iterator(iterator.m_track.track_number())); iterator = TRY(create_sample_iterator(iterator.m_track->track_number()));
TRY(search_clusters_for_keyframe_before_timestamp(iterator, timestamp)); TRY(search_clusters_for_keyframe_before_timestamp(iterator, timestamp));
return iterator; return iterator;
} }
@ -948,7 +948,7 @@ DecoderErrorOr<Block> SampleIterator::next_block()
} else if (element_id == SIMPLE_BLOCK_ID) { } else if (element_id == SIMPLE_BLOCK_ID) {
dbgln_if(MATROSKA_TRACE_DEBUG, " Iterator is parsing new block."); dbgln_if(MATROSKA_TRACE_DEBUG, " Iterator is parsing new block.");
auto candidate_block = TRY(parse_simple_block(streamer, m_current_cluster->timestamp(), m_segment_timestamp_scale, m_track)); auto candidate_block = TRY(parse_simple_block(streamer, m_current_cluster->timestamp(), m_segment_timestamp_scale, m_track));
if (candidate_block.track_number() == m_track.track_number()) if (candidate_block.track_number() == m_track->track_number())
block = move(candidate_block); block = move(candidate_block);
} else { } else {
dbgln_if(MATROSKA_TRACE_DEBUG, " Iterator is skipping unknown element with ID {:#010x}.", element_id); dbgln_if(MATROSKA_TRACE_DEBUG, " Iterator is skipping unknown element with ID {:#010x}.", element_id);
@ -969,7 +969,7 @@ DecoderErrorOr<Block> SampleIterator::next_block()
DecoderErrorOr<void> SampleIterator::seek_to_cue_point(CuePoint const& cue_point) DecoderErrorOr<void> SampleIterator::seek_to_cue_point(CuePoint const& cue_point)
{ {
// This is a private function. The position getter can return optional, but the caller should already know that this track has a position. // This is a private function. The position getter can return optional, but the caller should already know that this track has a position.
auto const& cue_position = cue_point.position_for_track(m_track.track_number()).release_value(); auto const& cue_position = cue_point.position_for_track(m_track->track_number()).release_value();
Streamer streamer { m_data }; Streamer streamer { m_data };
TRY_READ(streamer.seek_to_position(cue_position.cluster_position())); TRY_READ(streamer.seek_to_position(cue_position.cluster_position()));

10
Userland/Libraries/LibMedia/Containers/Matroska/Reader.h
View file

@ -35,7 +35,7 @@ public:
DecoderErrorOr<void> for_each_track(TrackEntryCallback); DecoderErrorOr<void> for_each_track(TrackEntryCallback);
DecoderErrorOr<void> for_each_track_of_type(TrackEntry::TrackType, TrackEntryCallback); DecoderErrorOr<void> for_each_track_of_type(TrackEntry::TrackType, TrackEntryCallback);
DecoderErrorOr<TrackEntry> track_for_track_number(u64); DecoderErrorOr<NonnullRefPtr<TrackEntry>> track_for_track_number(u64);
DecoderErrorOr<size_t> track_count(); DecoderErrorOr<size_t> track_count();
DecoderErrorOr<SampleIterator> create_sample_iterator(u64 track_number); DecoderErrorOr<SampleIterator> create_sample_iterator(u64 track_number);
@ -73,7 +73,7 @@ private:
Optional<SegmentInformation> m_segment_information; Optional<SegmentInformation> m_segment_information;
OrderedHashMap<u64, TrackEntry> m_tracks; OrderedHashMap<u64, NonnullRefPtr<TrackEntry>> m_tracks;
// The vectors must be sorted by timestamp at all times. // The vectors must be sorted by timestamp at all times.
HashMap<u64, Vector<CuePoint>> m_cues; HashMap<u64, Vector<CuePoint>> m_cues;
@ -89,10 +89,10 @@ public:
private: private:
friend class Reader; friend class Reader;
SampleIterator(RefPtr<Core::SharedMappedFile> file, ReadonlyBytes data, TrackEntry track, u64 timestamp_scale, size_t position) SampleIterator(RefPtr<Core::SharedMappedFile> file, ReadonlyBytes data, TrackEntry& track, u64 timestamp_scale, size_t position)
: m_file(move(file)) : m_file(move(file))
, m_data(data) , m_data(data)
, m_track(move(track)) , m_track(track)
, m_segment_timestamp_scale(timestamp_scale) , m_segment_timestamp_scale(timestamp_scale)
, m_position(position) , m_position(position)
{ {
@ -102,7 +102,7 @@ private:
RefPtr<Core::SharedMappedFile> m_file; RefPtr<Core::SharedMappedFile> m_file;
ReadonlyBytes m_data; ReadonlyBytes m_data;
TrackEntry m_track; NonnullRefPtr<TrackEntry> m_track;
u64 m_segment_timestamp_scale { 0 }; u64 m_segment_timestamp_scale { 0 };
// Must always point to an element ID or the end of the stream. // Must always point to an element ID or the end of the stream.