From 8fc0c4c32ff6ba1dc0939c5ea34bc56e5b21cbc9 Mon Sep 17 00:00:00 2001 From: johan Date: Wed, 14 Dec 2016 04:12:57 -0800 Subject: [PATCH] Add vector to Base64 decoded data types. This is a prerequisite to decode fmtp sprop-parameter-sets into the right encoding for H264SpsPpsTracker. # Legal requires us to keep the original license header. NOPRESUBMIT=true BUG=webrtc:5948 Review-Url: https://codereview.webrtc.org/2539153002 Cr-Commit-Position: refs/heads/master@{#15604} --- webrtc/base/base64.cc | 13 +++++++++++-- webrtc/base/base64.h | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/webrtc/base/base64.cc b/webrtc/base/base64.cc index 116e5717a2..effc390f05 100644 --- a/webrtc/base/base64.cc +++ b/webrtc/base/base64.cc @@ -197,8 +197,17 @@ bool Base64::DecodeFromArray(const char* data, size_t len, DecodeFlags flags, bool Base64::DecodeFromArray(const char* data, size_t len, DecodeFlags flags, vector* result, size_t* data_used) { - return DecodeFromArrayTemplate >(data, len, flags, result, - data_used); + return DecodeFromArrayTemplate>(data, len, flags, result, + data_used); +} + +bool Base64::DecodeFromArray(const char* data, + size_t len, + DecodeFlags flags, + vector* result, + size_t* data_used) { + return DecodeFromArrayTemplate>(data, len, flags, result, + data_used); } template diff --git a/webrtc/base/base64.h b/webrtc/base/base64.h index d5a7dd84c9..4e646dcd4c 100644 --- a/webrtc/base/base64.h +++ b/webrtc/base/base64.h @@ -63,6 +63,11 @@ public: std::string* result, size_t* data_used); static bool DecodeFromArray(const char* data, size_t len, DecodeFlags flags, std::vector* result, size_t* data_used); + static bool DecodeFromArray(const char* data, + size_t len, + DecodeFlags flags, + std::vector* result, + size_t* data_used); // Convenience Methods static inline std::string Encode(const std::string& data) {