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

Unified Diff: media/cast/audio_receiver/audio_receiver.h

Issue 138843011: Cast: Adding helper crypto classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile issues Created 6 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
« no previous file with comments | « no previous file | media/cast/audio_receiver/audio_receiver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/audio_receiver/audio_receiver.h
diff --git a/media/cast/audio_receiver/audio_receiver.h b/media/cast/audio_receiver/audio_receiver.h
index 5c7016adace207d48c53e6a0597ccb1b37481599..74c41b92b134248b4091bc7e1a661cc3a2446cf1 100644
--- a/media/cast/audio_receiver/audio_receiver.h
+++ b/media/cast/audio_receiver/audio_receiver.h
@@ -18,11 +18,7 @@
#include "media/cast/cast_receiver.h"
#include "media/cast/rtcp/rtcp.h" // RtcpCastMessage
#include "media/cast/rtp_receiver/rtp_receiver_defines.h" // RtpCastHeader
-
-namespace crypto {
-class Encryptor;
-class SymmetricKey;
-}
+#include "media/cast/transport/utility/transport_encryption_handler.h"
namespace media {
namespace cast {
@@ -132,9 +128,7 @@ class AudioReceiver : public base::NonThreadSafe,
base::TimeDelta time_offset_;
base::TimeTicks time_first_incoming_packet_;
uint32 first_incoming_rtp_timestamp_;
- scoped_ptr<crypto::Encryptor> decryptor_;
- scoped_ptr<crypto::SymmetricKey> decryption_key_;
- std::string iv_mask_;
+ transport::TransportEncryptionHandler decryptor_;
base::TimeTicks last_playout_time_;
std::list<AudioFrameEncodedCallback> queued_encoded_callbacks_;
« no previous file with comments | « no previous file | media/cast/audio_receiver/audio_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698