Decode h264 fmtp sprop-parameter-sets to binary.

webrtc/modules/video_coding/h264_sprop_parameter_sets.cc

Index: webrtc/modules/video_coding/h264_sprop_parameter_sets.cc
diff --git a/webrtc/modules/video_coding/h264_sprop_parameter_sets.cc b/webrtc/modules/video_coding/h264_sprop_parameter_sets.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e59b243ae046c5f15f9622604cbead5d1ee29fe4
--- /dev/null
+++ b/webrtc/modules/video_coding/h264_sprop_parameter_sets.cc
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2016 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.
+ */
+
+#include "webrtc/modules/video_coding/h264_sprop_parameter_sets.h"
+
+#include "webrtc/base/base64.h"
+#include "webrtc/base/bitbuffer.h"
+#include "webrtc/base/bytebuffer.h"
+#include "webrtc/base/logging.h"
+
+namespace {
+
+bool DecodeAndConvert(const std::string& base64, std::vector<uint8_t>* binary) {
+  static constexpr rtc::Base64::DecodeFlags flags = rtc::Base64::DO_STRICT;

[sprang_webrtc, 2016/12/08 10:08:37]

nit: kDecodeFlags or DECODE_FLAGS

[johan, 2016/12/08 11:14:37]

This is used only once anyway. Going to inline this.

+  // TODO(johan): Directly decode to std::vector<uint8_t> when available.
+  std::vector<char> tmp;
+  bool success = rtc::Base64::DecodeFromArray(base64.data(), base64.size(),
+                                              flags, &tmp, nullptr);
+  if (!success) {
+    return false;
+  }
+  const uint8_t* data = reinterpret_cast<uint8_t*>(tmp.data());
+  binary->assign(data, data + tmp.size());
+  return success;
+}
+}  // namespace
+
+namespace webrtc {
+
+bool H264SpropParameterSets::DecodeSprop(const std::string& sprop) {
+  size_t separator_pos = sprop.find(',');
+  if ((separator_pos <= 0) || (separator_pos >= sprop.length() - 1)) {
+    LOG(LS_WARNING) << "Invalid seperator position " << separator_pos << " *"
+                    << sprop << "*";
+    return false;
+  }
+  std::string sps_str = sprop.substr(0, separator_pos);
+  std::string pps_str = sprop.substr(separator_pos + 1, std::string::npos);
+  if (!DecodeAndConvert(sps_str, &sps_)) {
+    LOG(LS_WARNING) << "Failed to decode sprop/sps *" << sprop << "*";
+    return false;
+  }
+  if (!DecodeAndConvert(pps_str, &pps_)) {
+    LOG(LS_WARNING) << "Failed to decode sprop/pps *" << sprop << "*";
+    return false;
+  }
+  return true;
+}
+
+}  // namespace webrtc