Skip to content

Commit

Permalink
Cherry pick PR #3224: [media] Make HDR10+ side data type explicit (#3229
Browse files Browse the repository at this point in the history
)

Refer to the original PR: #3224

kMatroskaBlockAdditional is the only side data type supported by Cobalt
and its value happens to be 0. The setup of the SbPlayerSampleSideData
inside SbPlayerBridge didn't explicitly set the side data type, and
relies on the value of kMatroskaBlockAdditional is 0 as it
zero-initialized the struct.

Now the type is explicitly set.

b/276483058

Change-Id: I1d532d2537df02b3fc2af31dda8abb590c396d8e

Co-authored-by: xiaomings <[email protected]>
  • Loading branch information
cobalt-github-releaser-bot and xiaomings authored May 13, 2024
1 parent 866622b commit 67cfc33
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions cobalt/media/base/sbplayer_bridge.cc
Original file line number Diff line number Diff line change
Expand Up @@ -946,6 +946,7 @@ void SbPlayerBridge::WriteBuffersInternal(

if (buffer->side_data_size() > 0) {
// We only support at most one side data currently.
side_data->type = kMatroskaBlockAdditional;
side_data->data = buffer->side_data();
side_data->size = buffer->side_data_size();
sample_info.side_data = side_data;
Expand Down

0 comments on commit 67cfc33

Please sign in to comment.