Index: media/formats/mp4/box_definitions.cc |
diff --git a/media/formats/mp4/box_definitions.cc b/media/formats/mp4/box_definitions.cc |
index a08cb26d560ca1b5e99ce066a269017af5d90a9e..93c1dd20266676ab2abdb7db5edd8e777cf34a74 100644 |
--- a/media/formats/mp4/box_definitions.cc |
+++ b/media/formats/mp4/box_definitions.cc |
@@ -657,12 +657,15 @@ Movie::~Movie() {} |
FourCC Movie::BoxType() const { return FOURCC_MOOV; } |
bool Movie::Parse(BoxReader* reader) { |
- return reader->ScanChildren() && |
- reader->ReadChild(&header) && |
- reader->ReadChildren(&tracks) && |
- // Media Source specific: 'mvex' required |
- reader->ReadChild(&extends) && |
- reader->MaybeReadChildren(&pssh); |
+ RCHECK(reader->ScanChildren() && reader->ReadChild(&header) && |
+ reader->ReadChildren(&tracks)); |
+ |
+ RCHECK_MEDIA_LOGGED(reader->ReadChild(&extends), reader->log_cb(), |
+ "Detected unfragmented MP4. Media Source Extensions " |
chcunningham
2015/05/15 17:19:33
Do we know that all scenarios of returning false f
wolenetz
2015/05/15 18:16:25
ReadChild() inspects the passed parameter's overri
|
+ "requires ISO BMFF moov to contain mvex to indicate that " |
+ "Movie Fragments are to be expected."); |
+ |
+ return reader->MaybeReadChildren(&pssh); |
} |
TrackFragmentDecodeTime::TrackFragmentDecodeTime() : decode_time(0) {} |