media/formats/mp4/mp4_stream_parser.cc - Issue 379983002: Fix AnnexB validation logic to work with encrypted content.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 379983002: Fix AnnexB validation logic to work with encrypted content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address CR comments and rebase Created 6 years, 5 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

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 8ec925cd0a67328386dc148cbe6dd67958cbe4dd..7ad3ccc38649a726fcbf1133507241fb809a73c3 100644

--- a/media/formats/mp4/mp4_stream_parser.cc

+++ b/media/formats/mp4/mp4_stream_parser.cc

@@ -383,8 +383,7 @@ bool MP4StreamParser::PrepareAVCBuffer(

RCHECK(AVC::InsertParamSetsAnnexB(avc_config, frame_buf, subsamples));

}

- // TODO(acolwell): Improve IsValidAnnexB() so it can handle encrypted content.

- DCHECK(runs_->is_encrypted() || AVC::IsValidAnnexB(*frame_buf));

+ DCHECK(AVC::IsValidAnnexB(*frame_buf, *subsamples));

return true;

}

« media/formats/mp4/avc.cc ('K') | « media/formats/mp4/avc_unittest.cc ('k') | no next file » | no next file with comments »