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

Unified Diff: media/filters/source_buffer_stream.cc

Issue 2543623003: media: Allow config change between clear and encrypted streams (Closed)
Patch Set: media: Allow config change between clear and encrypted streams Created 4 years 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/filters/source_buffer_stream.cc
diff --git a/media/filters/source_buffer_stream.cc b/media/filters/source_buffer_stream.cc
index 82fe81f1f26b327420c16937386caab7fbfeec4e..4c7e8c1afc327f203049bf914684ac57e42b4bcb 100644
--- a/media/filters/source_buffer_stream.cc
+++ b/media/filters/source_buffer_stream.cc
@@ -1533,12 +1533,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])) {
@@ -1565,12 +1559,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])) {

Powered by Google App Engine
This is Rietveld 408576698