Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick PR #3118: Remove some Cobalt customizations from //media #3134

Merged
merged 1 commit into from
May 1, 2024
Merged

Cherry pick PR #3118: Remove some Cobalt customizations from //media #3134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion media/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ config("media_config") {
]
}

defines = [ "MEDIA_IMPLEMENTATION" ]
defines = [ "IS_MEDIA_IMPL" ]
}

config("media_config_public") {
Expand Down Expand Up @@ -82,6 +82,8 @@ component("media") {
"base/encryption_pattern.h",
"base/encryption_scheme.cc",
"base/encryption_scheme.h",
"base/media_client.cc",
"base/media_client.h",
"base/media_log.h",
"base/media_resource.cc",
"base/media_resource.h",
Expand Down
2 changes: 0 additions & 2 deletions media/base/media_switches.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,12 +452,10 @@ enum class kCrosGlobalMediaControlsPinOptions {
kHeuristic,
};

#if !defined(STARBOARD)
// Feature param used to force default pin/unpin for global media controls in
// CrOS.
MEDIA_EXPORT extern const base::FeatureParam<kCrosGlobalMediaControlsPinOptions>
kCrosGlobalMediaControlsPinParam;
#endif // !defined(STARBOARD)

// Return bitmask of audio formats supported by EDID.
MEDIA_EXPORT uint32_t GetPassthroughAudioFormats();
Expand Down
4 changes: 0 additions & 4 deletions media/base/supported_types.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,18 +326,14 @@ bool IsAACSupported(const AudioType& type) {
} // namespace

bool IsSupportedAudioType(const AudioType& type) {
#if !defined(STARBOARD)
if (auto* media_client = GetMediaClient())
return media_client->IsSupportedAudioType(type);
#endif // !defined(STARBOARD)
return IsDefaultSupportedAudioType(type);
}

bool IsSupportedVideoType(const VideoType& type) {
#if !defined(STARBOARD)
if (auto* media_client = GetMediaClient())
return media_client->IsSupportedVideoType(type);
#endif // !defined(STARBOARD)
return IsDefaultSupportedVideoType(type);
}

Expand Down
Loading