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

Unified Diff: media/webm/webm_tracks_parser.cc

Issue 11088047: Support encrypted audio stream in demuxer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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/webm/webm_tracks_parser.cc
diff --git a/media/webm/webm_tracks_parser.cc b/media/webm/webm_tracks_parser.cc
index bf039bf77bde53870e56cc3d0564cebde0c74762..811406ae156841747cda2b2b4db07b9b26711c21 100644
--- a/media/webm/webm_tracks_parser.cc
+++ b/media/webm/webm_tracks_parser.cc
@@ -25,6 +25,15 @@ WebMTracksParser::WebMTracksParser()
WebMTracksParser::~WebMTracksParser() {}
+const std::string& WebMTracksParser::audio_encryption_key_id() const {
+ if (!audio_content_encodings_client_.get())
+ return EmptyString();
+
+ DCHECK(!audio_content_encodings_client_->content_encodings().empty());
+ return audio_content_encodings_client_->content_encodings()[0]->
acolwell GONE FROM CHROMIUM 2012/10/10 16:00:06 If you only ever use the first encoding, why don't
xhwang 2012/10/11 00:49:41 Done.
+ encryption_key_id();
+}
+
const std::string& WebMTracksParser::video_encryption_key_id() const {
if (!video_content_encodings_client_.get())
return EmptyString();
« media/webm/webm_cluster_parser_unittest.cc ('K') | « media/webm/webm_tracks_parser.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698