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

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

Issue 296983006: Disable AnnexB validation for encrypted content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mp4/mp4_stream_parser.cc
diff --git a/media/formats/mp4/mp4_stream_parser.cc b/media/formats/mp4/mp4_stream_parser.cc
index e2fb231d3fa9bc843f1d2a85a042f9129cb038ae..ceefcfa963a0b5840593f13ae52531fde824f6a2 100644
--- a/media/formats/mp4/mp4_stream_parser.cc
+++ b/media/formats/mp4/mp4_stream_parser.cc
@@ -366,7 +366,8 @@ bool MP4StreamParser::PrepareAVCBuffer(
RCHECK(AVC::InsertParamSetsAnnexB(avc_config, frame_buf, subsamples));
}
- DCHECK(AVC::IsValidAnnexB(*frame_buf));
+ // TODO(acolwell): Improve IsValidAnnexB() so it can handle encrypted content.
+ DCHECK(runs_->is_encrypted() || AVC::IsValidAnnexB(*frame_buf));
return true;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698