Skip to content

Commit 1c84121

Browse files
committed
Remove COBALT_MEDIA_ENABLE_SIDE_DATA
Chromium m114 has same side_data() as in old Cobalt. We can simply remove COBALT_MEDIA_ENABLE_SIDE_DATA to enable hdr10+. b/375059645
1 parent c969605 commit 1c84121

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

media/starboard/BUILD.gn

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ source_set("starboard") {
3939
# TODO(b/326654546): Revisit max video input size
4040
"COBALT_MEDIA_ENABLE_PLAYER_SET_MAX_VIDEO_INPUT_SIZE=0",
4141

42-
# TODO(b/375059645): Revisit side data (aka hdr10+) support
43-
"COBALT_MEDIA_ENABLE_SIDE_DATA=0",
44-
4542
# TODO(b/375234428): Revisit startup latency tracking
4643
"COBALT_MEDIA_ENABLE_STARTUP_LATENCY_TRACKING=0",
4744

media/starboard/sbplayer_bridge.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -940,18 +940,15 @@ void SbPlayerBridge::WriteBuffersInternal(
940940

941941
gathered_sbplayer_sample_infos_side_data.push_back(
942942
SbPlayerSampleSideData());
943-
#if COBALT_MEDIA_ENABLE_SIDE_DATA
944943
SbPlayerSampleSideData* side_data =
945944
&gathered_sbplayer_sample_infos_side_data[i];
946-
#endif // COBALT_MEDIA_ENABLE_SIDE_DATA
947945

948946
PlayerSampleInfo sample_info = {};
949947
sample_info.type = sample_type;
950948
sample_info.buffer = buffer->data();
951949
sample_info.buffer_size = buffer->data_size();
952950
sample_info.timestamp = buffer->timestamp().InMicroseconds();
953951

954-
#if COBALT_MEDIA_ENABLE_SIDE_DATA
955952
if (buffer->side_data_size() > 0) {
956953
// We only support at most one side data currently.
957954
side_data->type = kMatroskaBlockAdditional;
@@ -960,7 +957,6 @@ void SbPlayerBridge::WriteBuffersInternal(
960957
sample_info.side_data = side_data;
961958
sample_info.side_data_count = 1;
962959
}
963-
#endif // COBALT_MEDIA_ENABLE_SIDE_DATA
964960

965961
if (sample_type == kSbMediaTypeAudio) {
966962
DCHECK(audio_stream_info);

0 commit comments

Comments
 (0)