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

Unified Diff: media/formats/webm/webm_audio_client.cc

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mojo changes; Message->base::Pickle Created 4 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
Index: media/formats/webm/webm_audio_client.cc
diff --git a/media/formats/webm/webm_audio_client.cc b/media/formats/webm/webm_audio_client.cc
index fb6a723a4d2a3f65fe48a73f85a1127aac05edbb..5b1f36e248517193ae63bf7ab3cca3f30c905af8 100644
--- a/media/formats/webm/webm_audio_client.cc
+++ b/media/formats/webm/webm_audio_client.cc
@@ -6,6 +6,7 @@
#include "media/base/audio_decoder_config.h"
#include "media/base/channel_layout.h"
+#include "media/base/encryption_scheme.h"
#include "media/formats/webm/webm_constants.h"
namespace media {
@@ -78,16 +79,12 @@ bool WebMAudioClient::InitializeConfig(
base::Time::kNanosecondsPerSecond);
}
- config->Initialize(
- audio_codec,
- sample_format,
- channel_layout,
- samples_per_second,
- codec_private,
- is_encrypted,
- base::TimeDelta::FromMicroseconds(
- (seek_preroll != -1 ? seek_preroll : 0) / 1000),
- codec_delay_in_frames);
+ config->Initialize(audio_codec, sample_format, channel_layout,
+ samples_per_second, codec_private,
+ EncryptionScheme(is_encrypted),
ddorwin 2016/03/01 02:17:42 WebM is always CTR no pattern.
dougsteed 2016/03/02 18:07:53 Done.
+ base::TimeDelta::FromMicroseconds(
+ (seek_preroll != -1 ? seek_preroll : 0) / 1000),
+ codec_delay_in_frames);
return config->IsValidConfig();
}

Powered by Google App Engine
This is Rietveld 408576698