OSSForks/ladybird
1
0
Fork 0
mirror of https://github.com/zebrajr/ladybird.git synced 2025-12-06 00:19:53 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

LibMedia: Store a name and language in Media::Track

Browse Source
This commit is contained in:
Zaggy1024 2025-10-08 15:21:55 -05:00 committed by Jelle Raaijmakers
parent e8238b4098
commit e11da1f85f
5 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Libraries/LibMedia/Containers/Matroska/Document.h
View File

@ -116,6 +116,8 @@ public:
void set_track_uid(u64 track_uid) { m_track_uid = track_uid; }
TrackType track_type() const { return m_track_type; }
void set_track_type(TrackType track_type) { m_track_type = track_type; }
String name() const { return m_name; }
void set_name(String const& name) { m_name = name; }
String language() const { return m_language; }
void set_language(String const& language) { m_language = language; }
String codec_id() const { return m_codec_id; }
@ -151,6 +153,7 @@ private:
u64 m_track_number { 0 };
u64 m_track_uid { 0 };
TrackType m_track_type { Invalid };
String m_name;
String m_language = "eng"_string;
String m_codec_id;
FixedArray<u8> m_codec_private_data;

5
Libraries/LibMedia/Containers/Matroska/MatroskaDemuxer.cpp
View File

@ -6,6 +6,7 @@
#include <AK/Assertions.h>
#include <AK/Debug.h>
#include <AK/Utf16String.h>
#include <LibMedia/CodedFrame.h>
#include <LibMedia/DecoderError.h>
@ -66,7 +67,9 @@ static TrackType track_type_from_matroska_track_type(TrackEntry::TrackType type)
static Track track_from_track_entry(TrackEntry const& track_entry)
{
Track track(track_type_from_matroska_track_type(track_entry.track_type()), track_entry.track_number());
auto name = Utf16String::from_utf8(track_entry.name());
auto language = Utf16String::from_utf8(track_entry.language());
Track track(track_type_from_matroska_track_type(track_entry.track_type()), track_entry.track_number(), name, language);
if (track.type() == TrackType::Video) {
auto video_track = track_entry.video_track();

7
Libraries/LibMedia/Containers/Matroska/Reader.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright (c) 2021, Hunter Salyer <thefalsehonesty@gmail.com>
* Copyright (c) 2022-2023, Gregory Bertilson <Zaggy1024@gmail.com>
* Copyright (c) 2022-2025, Gregory Bertilson <gregory@ladybird.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -50,6 +50,7 @@ constexpr u32 TRACK_ENTRY_ID = 0xAE;
constexpr u32 TRACK_NUMBER_ID = 0xD7;
constexpr u32 TRACK_UID_ID = 0x73C5;
constexpr u32 TRACK_TYPE_ID = 0x83;
constexpr u32 TRACK_NAME_ID = 0x536E;
constexpr u32 TRACK_LANGUAGE_ID = 0x22B59C;
constexpr u32 TRACK_CODEC_ID = 0x86;
constexpr u32 TRACK_CODEC_PRIVATE_ID = 0x63A2;
@ -476,6 +477,10 @@ static DecoderErrorOr<NonnullRefPtr<TrackEntry>> parse_track_entry(Streamer& str
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()));
break;
case TRACK_NAME_ID:
track_entry->set_name(DECODER_TRY_ALLOC(String::from_byte_string(TRY_READ(streamer.read_string()))));
dbgln_if(MATROSKA_TRACE_DEBUG, "Read Track's Name attribute: {}", track_entry->name());
break;
case TRACK_LANGUAGE_ID:
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());

10
Libraries/LibMedia/FFmpeg/FFmpegDemuxer.cpp
View File

@ -96,7 +96,15 @@ DecoderErrorOr<Track> FFmpegDemuxer::get_track_for_stream_index(u32 stream_index
auto& stream = *m_format_context->streams[stream_index];
auto type = track_type_from_ffmpeg_media_type(stream.codecpar->codec_type);
Track track(type, stream_index);
auto get_string_metadata = [&](char const* key) {
auto* name_entry = av_dict_get(stream.metadata, key, nullptr, 0);
if (name_entry == nullptr)
return Utf16String();
return Utf16String::from_utf8(StringView(name_entry->value, strlen(name_entry->value)));
};
auto name = get_string_metadata("title");
auto language = get_string_metadata("language");
Track track(type, stream_index, name, language);
if (type == TrackType::Video) {
track.set_video_data({

9
Libraries/LibMedia/Track.h
View File

@ -10,6 +10,7 @@
#include <AK/Time.h>
#include <AK/Traits.h>
#include <AK/Types.h>
#include <AK/Utf16String.h>
#include <AK/Variant.h>
namespace Media {
@ -28,9 +29,11 @@ class Track {
};
public:
Track(TrackType type, size_t identifier)
Track(TrackType type, size_t identifier, Utf16String const& name, Utf16String const& language)
: m_type(type)
, m_identifier(identifier)
, m_name(name)
, m_language(language)
{
switch (m_type) {
case TrackType::Video:
@ -44,6 +47,8 @@ public:
TrackType type() const { return m_type; }
size_t identifier() const { return m_identifier; }
Utf16String const& name() const { return m_name; }
Utf16String const& language() const { return m_language; }
void set_video_data(VideoData data)
{
@ -70,6 +75,8 @@ public:
private:
TrackType m_type { 0 };
size_t m_identifier { 0 };
Utf16String m_name;
Utf16String m_language;
Variant<Empty, VideoData> m_track_data;
};