Skip to content

Commit 0e162da

Browse files
Improve starboard::shared::starboard::media::AvcParameterSets class to handle optional parameters (youtube#5590)
Improve starboard::shared::starboard::media::AvcParameterSets class to handle optional parameters b/392649786 Change-Id: Ib00588c227ce5b638cbc563e47a329092c19104c
1 parent 7eb1391 commit 0e162da

3 files changed

Lines changed: 46 additions & 0 deletions

File tree

‎starboard/shared/starboard/media/avc_util.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ AvcParameterSets::AvcParameterSets(Format format,
117117
combined_size_in_bytes_ += nalu.size();
118118
} else if (nalu[kAnnexBHeaderSizeInBytes] == kIdrStartCode) {
119119
break;
120+
} else if (nalu[kAnnexBHeaderSizeInBytes] == kAudStartCode) {
121+
combined_size_with_optionals_in_bytes_ += nalu.size();
120122
}
121123
}
122124
SB_LOG_IF(ERROR, first_sps_index_ == -1 || first_pps_index_ == -1)

‎starboard/shared/starboard/media/avc_util.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ class AvcParameterSets {
4848
static const uint8_t kIdrStartCode = 0x65;
4949
static const uint8_t kSpsStartCode = 0x67;
5050
static const uint8_t kPpsStartCode = 0x68;
51+
// optional nalu types
52+
static const uint8_t kAudStartCode = 0x09;
5153

5254
// Only |format == kAnnexB| is supported, which is checked in the ctor.
5355
AvcParameterSets(Format format, const uint8_t* data, size_t size);
@@ -83,6 +85,10 @@ class AvcParameterSets {
8385
}
8486
size_t combined_size_in_bytes() const { return combined_size_in_bytes_; }
8587

88+
size_t combined_size_in_bytes_with_optionals() const {
89+
return combined_size_in_bytes_ + combined_size_with_optionals_in_bytes_;
90+
}
91+
8692
std::vector<uint8_t> GetAllSpses() const;
8793
std::vector<uint8_t> GetAllPpses() const;
8894

@@ -98,6 +104,7 @@ class AvcParameterSets {
98104
int first_pps_index_ = -1;
99105
std::vector<std::vector<uint8_t>> parameter_sets_;
100106
size_t combined_size_in_bytes_ = 0;
107+
size_t combined_size_with_optionals_in_bytes_ = 0;
101108
};
102109

103110
// The function will fail only when the input doesn't start with an Annex B

‎starboard/shared/starboard/media/avc_util_test.cc‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ const uint8_t kSliceStartCode = 0x61;
3535
const uint8_t kIdrStartCode = AvcParameterSets::kIdrStartCode;
3636
const uint8_t kSpsStartCode = AvcParameterSets::kSpsStartCode;
3737
const uint8_t kPpsStartCode = AvcParameterSets::kPpsStartCode;
38+
const uint8_t kAudStartCode = AvcParameterSets::kAudStartCode;
3839

3940
const std::vector<uint8_t> kRawSlice = {kSliceStartCode, 0, 0, 1, 0, 0, 0};
4041
const std::vector<uint8_t> kRawIdr = {kIdrStartCode, 1, 2, 3, 4};
@@ -48,6 +49,7 @@ const std::vector<uint8_t> kIdrInAnnexB = {0, 0, 0, 1, kIdrStartCode,
4849
1, 2, 3, 4};
4950
const std::vector<uint8_t> kSliceInAnnexB = {0, 0, 0, 1, kSliceStartCode, 0, 0,
5051
1, 0, 0, 0};
52+
const std::vector<uint8_t> kAudInAnnexB = {0, 0, 0, 1, kAudStartCode, 0xe0};
5153

5254
std::vector<uint8_t> operator+(const std::vector<uint8_t>& left,
5355
const std::vector<uint8_t>& right) {
@@ -195,6 +197,14 @@ TEST(AvcParameterSetsTest, Ctor) {
195197
auto nalus_in_annex_b = kSpsInAnnexB + kPpsInAnnexB + kIdrInAnnexB;
196198
AvcParameterSets parameter_sets_5(kAnnexB, nalus_in_annex_b.data(),
197199
nalus_in_annex_b.size());
200+
201+
AvcParameterSets parameter_sets_6(kAnnexB, kAudInAnnexB.data(),
202+
kAudInAnnexB.size());
203+
auto nalus_in_annex_b_with_optional =
204+
kAudInAnnexB + kSpsInAnnexB + kPpsInAnnexB + kIdrInAnnexB;
205+
AvcParameterSets parameter_sets_7(kAnnexB,
206+
nalus_in_annex_b_with_optional.data(),
207+
nalus_in_annex_b_with_optional.size());
198208
}
199209

200210
TEST(AvcParameterSetsTest, SingleSpsAndPps) {
@@ -442,6 +452,33 @@ TEST(AvcParameterSetsTest, MultiNalusWithoutSpsPps) {
442452
}
443453
}
444454

455+
TEST(AvcParameterSetsTest, CombinedSize) {
456+
auto nalus_in_annex_b = kSpsInAnnexB + kPpsInAnnexB + kIdrInAnnexB;
457+
AvcParameterSets parameter_sets(kAnnexB, nalus_in_annex_b.data(),
458+
nalus_in_annex_b.size());
459+
ASSERT_TRUE(parameter_sets.combined_size_in_bytes() ==
460+
(kSpsInAnnexB.size() + kPpsInAnnexB.size()));
461+
}
462+
463+
TEST(AvcParameterSetsTest, CombinedSizeWithOptionalParameter) {
464+
auto aud_first = kAudInAnnexB + kSpsInAnnexB + kPpsInAnnexB + kIdrInAnnexB;
465+
AvcParameterSets parameter_sets_aud_first(kAnnexB, aud_first.data(),
466+
aud_first.size());
467+
ASSERT_TRUE(parameter_sets_aud_first.combined_size_in_bytes() ==
468+
(kSpsInAnnexB.size() + kPpsInAnnexB.size()));
469+
ASSERT_TRUE(
470+
parameter_sets_aud_first.combined_size_in_bytes_with_optionals() ==
471+
(kAudInAnnexB.size() + kSpsInAnnexB.size() + kPpsInAnnexB.size()));
472+
473+
auto aud_last = kPpsInAnnexB + kSpsInAnnexB + kAudInAnnexB + kIdrInAnnexB;
474+
AvcParameterSets parameter_sets(kAnnexB, aud_last.data(), aud_last.size());
475+
ASSERT_TRUE(parameter_sets.combined_size_in_bytes() ==
476+
(kPpsInAnnexB.size() + kSpsInAnnexB.size()));
477+
ASSERT_TRUE(
478+
parameter_sets.combined_size_in_bytes_with_optionals() ==
479+
(kPpsInAnnexB.size() + kSpsInAnnexB.size() + kAudInAnnexB.size()));
480+
}
481+
445482
TEST(AvcParameterSetsTest, ConvertAnnexBToAvcc) {
446483
{
447484
std::vector<uint8_t> raw_nalus[] = {kRawSlice, kRawIdr, kRawSps, kRawPps};

0 commit comments

Comments
 (0)