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

Unified Diff: media/mojo/services/media_type_converters.cc

Issue 820103002: Add |is_encrypted| in mojo AudioDecoderConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « media/mojo/interfaces/media_types.mojom ('k') | media/mojo/services/media_type_converters_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/media_type_converters.cc
diff --git a/media/mojo/services/media_type_converters.cc b/media/mojo/services/media_type_converters.cc
index 084661d26e7e79e2ee7cd0d1ca1ea4540991dba4..b037f98d991b0f420f58bf497820173506baedea 100644
--- a/media/mojo/services/media_type_converters.cc
+++ b/media/mojo/services/media_type_converters.cc
@@ -364,6 +364,7 @@ TypeConverter<AudioDecoderConfigPtr, media::AudioDecoderConfig>::Convert(
}
config->seek_preroll_usec = input.seek_preroll().InMicroseconds();
config->codec_delay = input.codec_delay();
+ config->is_encrypted = input.is_encrypted();
return config.Pass();
}
@@ -379,7 +380,7 @@ TypeConverter<media::AudioDecoderConfig, AudioDecoderConfigPtr>::Convert(
input->samples_per_second,
input->extra_data.size() ? &input->extra_data.front() : NULL,
input->extra_data.size(),
- false,
+ input->is_encrypted,
false,
base::TimeDelta::FromMicroseconds(input->seek_preroll_usec),
input->codec_delay);
« no previous file with comments | « media/mojo/interfaces/media_types.mojom ('k') | media/mojo/services/media_type_converters_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698