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

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

Issue 2320043005: Read directly from 'senc' box when 'senc' box is present (Closed)
Patch Set: git cl format Created 4 years, 2 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') | no next file with comments »
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..fba3c941b7da74dbb96da5dc4a96c68af10fd7f8 100644
--- a/media/formats/mp4/box_definitions.cc
+++ b/media/formats/mp4/box_definitions.cc
@@ -1204,14 +1204,13 @@ TrackFragment::~TrackFragment() {}
FourCC TrackFragment::BoxType() const { return FOURCC_TRAF; }
bool TrackFragment::Parse(BoxReader* reader) {
- RCHECK(reader->ScanChildren() &&
- reader->ReadChild(&header) &&
+ RCHECK(reader->ScanChildren() && reader->ReadChild(&header) &&
// Media Source specific: 'tfdt' required
- reader->ReadChild(&decode_time) &&
- reader->MaybeReadChildren(&runs) &&
+ reader->ReadChild(&decode_time) && reader->MaybeReadChildren(&runs) &&
reader->MaybeReadChild(&auxiliary_offset) &&
reader->MaybeReadChild(&auxiliary_size) &&
- reader->MaybeReadChild(&sdtp));
+ reader->MaybeReadChild(&sdtp) &&
+ reader->MaybeReadChild(&sample_encryption));
// 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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698