Move talk/media to webrtc/media

webrtc/media/base/cryptoparams.h

Index: webrtc/media/base/cryptoparams.h
diff --git a/webrtc/media/base/cryptoparams.h b/webrtc/media/base/cryptoparams.h
new file mode 100644
index 0000000000000000000000000000000000000000..dacce25a4ca9a0e49aa47a8a7ebf405c181ab009
--- /dev/null
+++ b/webrtc/media/base/cryptoparams.h
@@ -0,0 +1,39 @@
+/*
+ *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_MEDIA_BASE_CRYPTOPARAMS_H_
+#define WEBRTC_MEDIA_BASE_CRYPTOPARAMS_H_
+
+#include <string>
+
+namespace cricket {

[pthatcher1, 2016/01/27 01:34:09]

Some of these files show up as adds instead of moves.  Any idea why?

[Taylor Brandstetter, 2016/01/27 02:39:42]

In this case it's because the copyright header took up half the file, and it was
replaced with an updated one ("The WebRTC Project Authors" instead of "Google
Inc.").

Maybe we could update the copyright headers in a separate CL, so the file
history is retained?

[pthatcher, 2016/01/27 21:50:59]

If that's what it takes to keep the history intact, let's do it.

[kjellander_webrtc, 2016/02/04 21:52:10]

Good point, I changed the back again (since I wrote a script to do these changes
it was pretty easy).
I'll do a follow-up CL after landing this, with the license change.

+
+// Parameters for SRTP negotiation, as described in RFC 4568.
+struct CryptoParams {
+  CryptoParams() : tag(0) {}
+  CryptoParams(int t,
+               const std::string& cs,
+               const std::string& kp,
+               const std::string& sp)
+      : tag(t), cipher_suite(cs), key_params(kp), session_params(sp) {}
+
+  bool Matches(const CryptoParams& params) const {
+    return (tag == params.tag && cipher_suite == params.cipher_suite);
+  }
+
+  int tag;
+  std::string cipher_suite;
+  std::string key_params;
+  std::string session_params;
+};
+
+}  // namespace cricket
+
+#endif  // WEBRTC_MEDIA_BASE_CRYPTOPARAMS_H_