Merge branch 'main' into experimental/sharding

youtube · Jan 10, 2025 · 6cbffe0 · 6cbffe0
2 parents 2477e90 + 58fc967
commit 6cbffe0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -7,6 +7,7 @@
 
 /.github/  # no owners
 /cobalt/  # no owners
+/media/base/starboard/  # no owners
 /media/starboard/  # no owners
 /starboard/  # no owners
 /components/viz/service/display/starboard/  # no owners

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,6 +9,7 @@ files: |
     (?x)^(
         .github/|
         cobalt/|
+        media/base/starboard/|
         media/starboard/|
         starboard/|
         components/viz/service/display/starboard/|

diff --git a/media/base/demuxer_memory_limit_starboard.cc → ...arboard/demuxer_memory_limit_starboard.cc b/media/base/demuxer_memory_limit_starboard.cc → ...arboard/demuxer_memory_limit_starboard.cc
@@ -18,10 +18,10 @@
 
 #include "media/base/demuxer_memory_limit.h"
 
+#include "base/logging.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/starboard_utils.h"
 #include "media/base/video_codecs.h"
-#include "base/logging.h"
 
 namespace media {
 
@@ -30,10 +30,9 @@ size_t GetDemuxerStreamAudioMemoryLimit(
   return DecoderBuffer::Allocator::GetInstance()->GetAudioBufferBudget();
 }
 
-size_t GetDemuxerStreamVideoMemoryLimit(
-    Demuxer::DemuxerTypes /*demuxer_type*/,
-    const VideoDecoderConfig* video_config,
-    const std::string& mime_type) {
+size_t GetDemuxerStreamVideoMemoryLimit(Demuxer::DemuxerTypes /*demuxer_type*/,
+                                        const VideoDecoderConfig* video_config,
+                                        const std::string& mime_type) {
   return static_cast<size_t>(
       GetSbMediaVideoBufferBudget(video_config, mime_type));
 }