Skip to content

Commit

Permalink
Ignore linter where appropriate
Browse files Browse the repository at this point in the history
  • Loading branch information
oxve committed May 31, 2024
1 parent 2817bd8 commit d07b3ee
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 12 deletions.
26 changes: 20 additions & 6 deletions starboard/nplb/player_create_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -322,16 +322,23 @@ TEST_F(SbPlayerTest, MultiPlayer) {
constexpr SbPlayerOutputMode kOutputModes[] = {
kSbPlayerOutputModeDecodeToTexture, kSbPlayerOutputModePunchOut};

// clang-format off
constexpr SbMediaAudioCodec kAudioCodecs[] = {
kSbMediaAudioCodecNone,

kSbMediaAudioCodecAac, kSbMediaAudioCodecAc3, kSbMediaAudioCodecEac3,
kSbMediaAudioCodecOpus, kSbMediaAudioCodecVorbis, kSbMediaAudioCodecMp3,
kSbMediaAudioCodecFlac, kSbMediaAudioCodecPcm,
kSbMediaAudioCodecAac,
kSbMediaAudioCodecAc3,
kSbMediaAudioCodecEac3,
kSbMediaAudioCodecOpus,
kSbMediaAudioCodecVorbis,
kSbMediaAudioCodecMp3,
kSbMediaAudioCodecFlac,
kSbMediaAudioCodecPcm,
#if SB_API_VERSION >= 15
kSbMediaAudioCodecIamf,
#endif // SB_API_VERSION >= 15
};
// clang-format on

// TODO: turn this into a macro.
// Perform a check to determine if new audio codecs have been added to the
Expand All @@ -354,13 +361,20 @@ TEST_F(SbPlayerTest, MultiPlayer) {
break;
}

// clang-format off
constexpr SbMediaVideoCodec kVideoCodecs[] = {
kSbMediaVideoCodecNone,

kSbMediaVideoCodecH264, kSbMediaVideoCodecH265, kSbMediaVideoCodecMpeg2,
kSbMediaVideoCodecTheora, kSbMediaVideoCodecVc1, kSbMediaVideoCodecAv1,
kSbMediaVideoCodecVp8, kSbMediaVideoCodecVp9,
kSbMediaVideoCodecH264,
kSbMediaVideoCodecH265,
kSbMediaVideoCodecMpeg2,
kSbMediaVideoCodecTheora,
kSbMediaVideoCodecVc1,
kSbMediaVideoCodecAv1,
kSbMediaVideoCodecVp8,
kSbMediaVideoCodecVp9,
};
// clang-format on

// TODO: turn this into a macro.
// Perform a check to determine if new video codecs have been added to the
Expand Down
27 changes: 21 additions & 6 deletions starboard/nplb/player_get_preferred_output_mode_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,39 @@ TEST(SbPlayerGetPreferredOutputModeTest, SunnyDay) {
}

TEST(SbPlayerGetPreferredOutputModeTest, AllCodecs) {
// clang-format off
const SbMediaAudioCodec kAudioCodecs[] = {
kSbMediaAudioCodecNone, kSbMediaAudioCodecAac, kSbMediaAudioCodecAc3,
kSbMediaAudioCodecEac3, kSbMediaAudioCodecOpus, kSbMediaAudioCodecVorbis,
kSbMediaAudioCodecMp3, kSbMediaAudioCodecFlac, kSbMediaAudioCodecPcm,
kSbMediaAudioCodecNone,

kSbMediaAudioCodecAac,
kSbMediaAudioCodecAc3,
kSbMediaAudioCodecEac3,
kSbMediaAudioCodecOpus,
kSbMediaAudioCodecVorbis,
kSbMediaAudioCodecMp3,
kSbMediaAudioCodecFlac,
kSbMediaAudioCodecPcm,
#if SB_API_VERSION >= 15
kSbMediaAudioCodecIamf,
#endif // SB_API_VERSION >= 15
};
const SbMediaVideoCodec kVideoCodecs[] = {
kSbMediaVideoCodecNone, kSbMediaVideoCodecH264, kSbMediaVideoCodecH265,
kSbMediaVideoCodecMpeg2, kSbMediaVideoCodecTheora, kSbMediaVideoCodecVc1,
kSbMediaVideoCodecAv1, kSbMediaVideoCodecVp8, kSbMediaVideoCodecVp9,
kSbMediaVideoCodecNone,
kSbMediaVideoCodecH264,
kSbMediaVideoCodecH265,
kSbMediaVideoCodecMpeg2,
kSbMediaVideoCodecTheora,
kSbMediaVideoCodecVc1,
kSbMediaVideoCodecAv1,
kSbMediaVideoCodecVp8,
kSbMediaVideoCodecVp9,
};
const SbPlayerOutputMode kOutputModes[] = {
kSbPlayerOutputModeDecodeToTexture,
kSbPlayerOutputModePunchOut,
kSbPlayerOutputModeInvalid,
};
// clang-format on

for (SbMediaAudioCodec audio_codec : kAudioCodecs) {
for (SbMediaVideoCodec video_codec : kVideoCodecs) {
Expand Down

0 comments on commit d07b3ee

Please sign in to comment.