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

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 3 years, 11 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/filters/source_buffer_stream.cc
diff --git a/media/filters/source_buffer_stream.cc b/media/filters/source_buffer_stream.cc
index fe3dbfea4fca61cd406a420363b5ea62b194e62b..25d2283c4a8541be2c22151b960fe700061b8bb5 100644
--- a/media/filters/source_buffer_stream.cc
+++ b/media/filters/source_buffer_stream.cc
@@ -1545,12 +1545,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])) {
@@ -1577,12 +1571,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