Index: media/formats/mp4/box_definitions.h |
diff --git a/media/formats/mp4/box_definitions.h b/media/formats/mp4/box_definitions.h |
index 9daa82e136c11e188854f377d741971f0b854ff8..de267d9cc462b933a67202009674ca2d00978de7 100644 |
--- a/media/formats/mp4/box_definitions.h |
+++ b/media/formats/mp4/box_definitions.h |
@@ -355,6 +355,40 @@ class MEDIA_EXPORT IndependentAndDisposableSamples : public Box { |
std::vector<SampleDependsOn> sample_depends_on_; |
}; |
+struct MEDIA_EXPORT CencSampleEncryptionInfoEntry { |
+ CencSampleEncryptionInfoEntry(); |
+ ~CencSampleEncryptionInfoEntry(); |
+ |
+ bool is_encrypted; |
+ uint8 iv_size; |
+ std::vector<uint8> key_id; |
+}; |
+ |
+struct MEDIA_EXPORT SampleGroupDescription : Box { |
xhwang
2014/05/01 19:11:28
Add comment that this is "sgpd" box.
kqyang
2014/05/01 20:26:35
Done.
|
+ DECLARE_BOX_METHODS(SampleGroupDescription); |
+ |
+ uint32 grouping_type; |
+ std::vector<CencSampleEncryptionInfoEntry> entries; |
+}; |
+ |
+struct MEDIA_EXPORT SampleToGroupEntry { |
+ enum GroupDescriptionIndexBase { |
+ kTrackGroupDescriptionIndexBase = 0, |
+ kFragmentGroupDescriptionIndexBase = 0x10000, |
+ }; |
+ |
+ uint32 sample_count; |
+ uint32 group_description_index; |
+}; |
+ |
+struct MEDIA_EXPORT SampleToGroup : Box { |
xhwang
2014/05/01 19:11:28
Add comment that this is a "sbgp" box.
kqyang
2014/05/01 20:26:35
Done.
|
+ DECLARE_BOX_METHODS(SampleToGroup); |
+ |
+ uint32 grouping_type; |
+ uint32 grouping_type_parameter; // Version 1 only. |
+ std::vector<SampleToGroupEntry> entries; |
+}; |
+ |
struct MEDIA_EXPORT TrackFragment : Box { |
DECLARE_BOX_METHODS(TrackFragment); |
@@ -364,6 +398,8 @@ struct MEDIA_EXPORT TrackFragment : Box { |
SampleAuxiliaryInformationOffset auxiliary_offset; |
SampleAuxiliaryInformationSize auxiliary_size; |
IndependentAndDisposableSamples sdtp; |
+ SampleGroupDescription sample_group_description; |
+ SampleToGroup sample_to_group; |
}; |
struct MEDIA_EXPORT MovieFragment : Box { |