Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1653)

Unified Diff: media/formats/mp4/box_definitions.cc

Issue 2320043005: Read directly from 'senc' box when 'senc' box is present (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/test/data/README » ('j') | media/test/pipeline_integration_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mp4/box_definitions.cc
diff --git a/media/formats/mp4/box_definitions.cc b/media/formats/mp4/box_definitions.cc
index b5e9f86119f67158d83a44915c79bc860a2bc500..a11c8204a94bae5062563260821d75bcc8763f87 100644
--- a/media/formats/mp4/box_definitions.cc
+++ b/media/formats/mp4/box_definitions.cc
@@ -1211,7 +1211,8 @@ bool TrackFragment::Parse(BoxReader* reader) {
reader->MaybeReadChildren(&runs) &&
reader->MaybeReadChild(&auxiliary_offset) &&
reader->MaybeReadChild(&auxiliary_size) &&
- reader->MaybeReadChild(&sdtp));
+ reader->MaybeReadChild(&sdtp) &&
+ reader->MaybeReadChild(&sample_encryption));
kqyang 2016/09/15 22:06:32 This line loads 'senc' box if it is present. It
// There could be multiple SampleGroupDescription and SampleToGroup boxes with
// different grouping types. For common encryption, the relevant grouping type
« no previous file with comments | « no previous file | media/test/data/README » ('j') | media/test/pipeline_integration_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698