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

Unified Diff: media/filters/ffmpeg_demuxer_unittest.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 comment 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
« no previous file with comments | « no previous file | media/filters/h264_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index bf72e29a17a91e45f673bf76c567b337b5a32ab5..76ccba2259a4f1faa417a68f9b6dd03e2b0b8f9c 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -875,8 +875,14 @@ static void ValidateAnnexB(DemuxerStream* stream,
return;
}
+ std::vector<SubsampleEntry> subsamples;
+
+ if (buffer->decrypt_config())
+ subsamples = buffer->decrypt_config()->subsamples();
+
bool is_valid =
- mp4::AVC::IsValidAnnexB(buffer->data(), buffer->data_size());
+ mp4::AVC::IsValidAnnexB(buffer->data(), buffer->data_size(),
+ subsamples);
EXPECT_TRUE(is_valid);
if (!is_valid) {
« no previous file with comments | « no previous file | media/filters/h264_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698