@@ -35,6 +35,7 @@ const uint8_t kSliceStartCode = 0x61;
3535const uint8_t kIdrStartCode = AvcParameterSets::kIdrStartCode ;
3636const uint8_t kSpsStartCode = AvcParameterSets::kSpsStartCode ;
3737const uint8_t kPpsStartCode = AvcParameterSets::kPpsStartCode ;
38+ const uint8_t kAudStartCode = AvcParameterSets::kAudStartCode ;
3839
3940const std::vector<uint8_t > kRawSlice = {kSliceStartCode , 0 , 0 , 1 , 0 , 0 , 0 };
4041const 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 };
4950const 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
5254std::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
200210TEST (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+
445482TEST (AvcParameterSetsTest, ConvertAnnexBToAvcc) {
446483 {
447484 std::vector<uint8_t > raw_nalus[] = {kRawSlice , kRawIdr , kRawSps , kRawPps };
0 commit comments