Merge 'feature/media-upstream-update' into 'main' #3000
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git-subtree-dir: skia git-subtree-split: fed499399d3f44d3a7957549d493bf30a5d8c867
b/331639918
…upstream-update Change-Id: I6f31fc639b8aa0a84d2a26a470093b4b7db111f7
…upstream-update (#2821)
git-subtree-dir: media git-subtree-split: fed499399d3f44d3a7957549d493bf30a5d8c867 Change-Id: Ief5e96d93ba31b8bdb565e25274aba2460d05cae
b/319697087
git-subtree-dir: ui/gfx git-subtree-split: fed499399d3f44d3a7957549d493bf30a5d8c867 Change-Id: Ic42aa925fffd2cf947d9323f99dc917521b0faf3
b/319697087
…upstream-update Change-Id: I428640dd8e86617b96b8a152ea69bd0471dacffd
…upstream-update (#2927)
This change removes the //media directory in preparation for an update to Chromium media m114. https://chromium.googlesource.com/chromium/src/+/refs/tags/114.0.5735.331/media/ b/319697087
git-subtree-dir: media git-subtree-split: fed499399d3f44d3a7957549d493bf30a5d8c867
Imports the Chromium media directory at tag 114.0.5735.331. The directory is unmodified except for the addition of a METADATA file. https://chromium.googlesource.com/chromium/src/+/refs/tags/114.0.5735.331/media/ b/319697087
Imports the Chromium media directory at tag 114.0.5735.331. The directory is unmodified except for the addition of a METADATA file. https://chromium.googlesource.com/chromium/src/+/refs/tags/114.0.5735.331/media/ b/319697087
This change modifies the `//media` directory to allow it to build with Cobalt. These modifications are guarded with `#if defined(STARBOARD)`. This change also includes the following changes: 1. Applies upstream Chromium changes to support IAMF audio. These changes are not guarded. 2. Creates new build targets for `//ui/gfx` and includes them in the build. Remaining gaps: - MediaLog is stubbed out. We should remove the customization and enable it. Tracked in b/230916218 - //skia and //ui/gfx have minor customizations that allow them to build with Cobalt. Most or all of these should be removed once //third_party/skia is updated to match Chromium. - `PipelineStatusCB` is planned to be replaced with `PipelineStatusCallback`. We should update Cobalt media to use only `PipelineStatusCallback`. Tracked in b/335673619 b/319697087
osagie98
requested review from
jasonzhangxx,
kaidokert,
xiaomings and
andrewsavage1
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #3000 +/- ##
==========================================
- Coverage 58.91% 55.67% -3.25%
==========================================
Files 1822 1744 -78
Lines 88753 82068 -6685
==========================================
- Hits 52289 45688 -6601
+ Misses 36464 36380 -84 ☔ View full report in Codecov by Sentry. |
Datadog ReportBranch report: ✅ 0 Failed, 33952 Passed, 6 Skipped, 20m 47.45s Wall Time |
osagie98
changed the title
xiaomings
approved these changes
Apr 18, 2024
Removes the function GetD65PrimariesFromToXYZD50Matrix() from the build
as it breaks older toolchain builds.
b/319697087
andrewsavage1
approved these changes
Apr 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merges the feature/media-upstream-update branch to main.
See the major commits to feature/media-upstream-update:
//skiafrom Chromium m114: Import chromium skia #2816//ui/gfxto match Chromium m114: Update ui/gfx to Chromium tag 114.0.5735.331 #2844//mediato match Chromium m114: Import Chromium media from tag 114.0.5735.331 #2960b/319697087