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

Unified Diff: media/filters/source_buffer_stream.cc

Issue 2543623003: media: Allow config change between clear and encrypted streams (Closed)
Patch Set: comments addressed Created 3 years, 10 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 | « media/filters/decrypting_video_decoder_unittest.cc ('k') | media/test/data/eme_player.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/source_buffer_stream.cc
diff --git a/media/filters/source_buffer_stream.cc b/media/filters/source_buffer_stream.cc
index 471ae384e353741144a6fef98bbff0ae53d8ec02..f6cb9d1ca7a0faae2ccf29d120e698d930787b34 100644
--- a/media/filters/source_buffer_stream.cc
+++ b/media/filters/source_buffer_stream.cc
@@ -1580,12 +1580,6 @@ bool SourceBufferStream::UpdateAudioConfig(const AudioDecoderConfig& config) {
return false;
}
- if (!audio_configs_[0].encryption_scheme().Matches(
- config.encryption_scheme())) {
- MEDIA_LOG(ERROR, media_log_) << "Audio encryption changes not allowed.";
- return false;
- }
-
// Check to see if the new config matches an existing one.
for (size_t i = 0; i < audio_configs_.size(); ++i) {
if (config.Matches(audio_configs_[i])) {
@@ -1612,12 +1606,6 @@ bool SourceBufferStream::UpdateVideoConfig(const VideoDecoderConfig& config) {
return false;
}
- if (!video_configs_[0].encryption_scheme().Matches(
- config.encryption_scheme())) {
- MEDIA_LOG(ERROR, media_log_) << "Video encryption changes not allowed.";
- return false;
- }
-
// Check to see if the new config matches an existing one.
for (size_t i = 0; i < video_configs_.size(); ++i) {
if (config.Matches(video_configs_[i])) {
« no previous file with comments | « media/filters/decrypting_video_decoder_unittest.cc ('k') | media/test/data/eme_player.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698