Move base64.h to webrtc namespace
Bug: webrtc:42232595
Change-Id: Ie6ffbe9072d34e237b627ebab285c2fa183a7e15
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/380380
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Auto-Submit: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44081}
diff --git a/modules/desktop_capture/screen_capturer_integration_test.cc b/modules/desktop_capture/screen_capturer_integration_test.cc
index 13170bc..32ee38c 100644
--- a/modules/desktop_capture/screen_capturer_integration_test.cc
+++ b/modules/desktop_capture/screen_capturer_integration_test.cc
@@ -215,7 +215,7 @@
// been resolved.
else if (i == wait_capture_round - 1) {
std::string result;
- rtc::Base64::EncodeFromArray(
+ Base64::EncodeFromArray(
frame->data(), frame->size().height() * frame->stride(), &result);
std::cout << frame->size().width() << " x " << frame->size().height()
<< std::endl;
diff --git a/modules/video_coding/h264_sprop_parameter_sets.cc b/modules/video_coding/h264_sprop_parameter_sets.cc
index a64f888..d30b904 100644
--- a/modules/video_coding/h264_sprop_parameter_sets.cc
+++ b/modules/video_coding/h264_sprop_parameter_sets.cc
@@ -22,8 +22,8 @@
namespace {
bool DecodeAndConvert(const std::string& base64, std::vector<uint8_t>* binary) {
- return rtc::Base64::DecodeFromArray(base64.data(), base64.size(),
- rtc::Base64::DO_STRICT, binary, nullptr);
+ return webrtc::Base64::DecodeFromArray(
+ base64.data(), base64.size(), webrtc::Base64::DO_STRICT, binary, nullptr);
}
} // namespace
diff --git a/pc/legacy_stats_collector_unittest.cc b/pc/legacy_stats_collector_unittest.cc
index 2264baa..588225b 100644
--- a/pc/legacy_stats_collector_unittest.cc
+++ b/pc/legacy_stats_collector_unittest.cc
@@ -288,7 +288,7 @@
std::string der_base64;
EXPECT_TRUE(GetValue(report, StatsReport::kStatsValueNameDer, &der_base64));
- std::string der = rtc::Base64::Decode(der_base64, rtc::Base64::DO_STRICT);
+ std::string der = Base64::Decode(der_base64, Base64::DO_STRICT);
EXPECT_EQ(ders[i], der);
std::string fingerprint_algorithm;
diff --git a/rtc_base/base64_unittest.cc b/rtc_base/base64_unittest.cc
index 6722a1f..965b2ab 100644
--- a/rtc_base/base64_unittest.cc
+++ b/rtc_base/base64_unittest.cc
@@ -337,7 +337,7 @@
char* dest,
size_t szdest) {
std::string escaped;
- Base64::EncodeFromArray((const char*)src, szsrc, &escaped);
+ webrtc::Base64::EncodeFromArray((const char*)src, szsrc, &escaped);
memcpy(dest, escaped.data(), std::min(escaped.size(), szdest));
return escaped.size();
}
@@ -347,14 +347,15 @@
char* dest,
size_t szdest) {
std::string unescaped;
- EXPECT_TRUE(
- Base64::DecodeFromArray(src, szsrc, Base64::DO_LAX, &unescaped, nullptr));
+ EXPECT_TRUE(webrtc::Base64::DecodeFromArray(
+ src, szsrc, webrtc::Base64::DO_LAX, &unescaped, nullptr));
memcpy(dest, unescaped.data(), std::min(unescaped.size(), szdest));
return unescaped.size();
}
size_t Base64Unescape(const char* src, size_t szsrc, std::string* s) {
- EXPECT_TRUE(Base64::DecodeFromArray(src, szsrc, Base64::DO_LAX, s, nullptr));
+ EXPECT_TRUE(webrtc::Base64::DecodeFromArray(
+ src, szsrc, webrtc::Base64::DO_LAX, s, nullptr));
return s->size();
}
@@ -1365,11 +1366,11 @@
bool DecodeTest(const char* encoded,
size_t expect_unparsed,
const char* decoded,
- Base64::DecodeFlags flags) {
+ webrtc::Base64::DecodeFlags flags) {
std::string result;
size_t consumed = 0, encoded_len = strlen(encoded);
- bool success =
- Base64::DecodeFromArray(encoded, encoded_len, flags, &result, &consumed);
+ bool success = webrtc::Base64::DecodeFromArray(encoded, encoded_len, flags,
+ &result, &consumed);
size_t unparsed = encoded_len - consumed;
EXPECT_EQ(expect_unparsed, unparsed)
<< "\"" << encoded << "\" -> \"" << decoded << "\"";
@@ -1377,8 +1378,9 @@
return success;
}
-#define Flags(x, y, z) \
- Base64::DO_PARSE_##x | Base64::DO_PAD_##y | Base64::DO_TERM_##z
+#define Flags(x, y, z) \
+ webrtc::Base64::DO_PARSE_##x | webrtc::Base64::DO_PAD_##y | \
+ webrtc::Base64::DO_TERM_##z
TEST(Base64, DecodeParseOptions) {
// Trailing whitespace
@@ -1440,14 +1442,14 @@
// The table looks like this:
// "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
char next_char;
- EXPECT_TRUE(Base64::GetNextBase64Char('A', &next_char));
+ EXPECT_TRUE(webrtc::Base64::GetNextBase64Char('A', &next_char));
EXPECT_EQ('B', next_char);
- EXPECT_TRUE(Base64::GetNextBase64Char('Z', &next_char));
+ EXPECT_TRUE(webrtc::Base64::GetNextBase64Char('Z', &next_char));
EXPECT_EQ('a', next_char);
- EXPECT_TRUE(Base64::GetNextBase64Char('/', &next_char));
+ EXPECT_TRUE(webrtc::Base64::GetNextBase64Char('/', &next_char));
EXPECT_EQ('A', next_char);
- EXPECT_FALSE(Base64::GetNextBase64Char('&', &next_char));
- EXPECT_FALSE(Base64::GetNextBase64Char('Z', nullptr));
+ EXPECT_FALSE(webrtc::Base64::GetNextBase64Char('&', &next_char));
+ EXPECT_FALSE(webrtc::Base64::GetNextBase64Char('Z', nullptr));
}
} // namespace
diff --git a/rtc_base/ssl_certificate.cc b/rtc_base/ssl_certificate.cc
index d1fd57f..da87d1b 100644
--- a/rtc_base/ssl_certificate.cc
+++ b/rtc_base/ssl_certificate.cc
@@ -75,7 +75,8 @@
Buffer der_buffer;
ToDER(&der_buffer);
std::string der_base64;
- Base64::EncodeFromArray(der_buffer.data(), der_buffer.size(), &der_base64);
+ webrtc::Base64::EncodeFromArray(der_buffer.data(), der_buffer.size(),
+ &der_base64);
return std::make_unique<SSLCertificateStats>(std::move(fingerprint),
std::move(digest_algorithm),
diff --git a/rtc_base/ssl_identity.cc b/rtc_base/ssl_identity.cc
index 363dd4a..0f1cc97 100644
--- a/rtc_base/ssl_identity.cc
+++ b/rtc_base/ssl_identity.cc
@@ -185,8 +185,9 @@
return false;
}
std::string inner(pem_string.substr(body + 1, trailer - (body + 1)));
- *der = Base64::Decode(inner, Base64::DO_PARSE_WHITE | Base64::DO_PAD_ANY |
- Base64::DO_TERM_BUFFER);
+ *der = webrtc::Base64::Decode(inner, webrtc::Base64::DO_PARSE_WHITE |
+ webrtc::Base64::DO_PAD_ANY |
+ webrtc::Base64::DO_TERM_BUFFER);
return true;
}
@@ -197,7 +198,7 @@
result << "-----BEGIN " << pem_type << "-----\n";
std::string b64_encoded;
- Base64::EncodeFromArray(data, length, &b64_encoded);
+ webrtc::Base64::EncodeFromArray(data, length, &b64_encoded);
// Divide the Base-64 encoded data into 64-character chunks, as per 4.3.2.4
// of RFC 1421.
static const size_t kChunkSize = 64;
diff --git a/rtc_base/third_party/base64/base64.cc b/rtc_base/third_party/base64/base64.cc
index 9dc961a..cc579ad 100644
--- a/rtc_base/third_party/base64/base64.cc
+++ b/rtc_base/third_party/base64/base64.cc
@@ -23,7 +23,7 @@
using std::vector;
-namespace rtc {
+namespace webrtc {
static const char kPad = '=';
static const unsigned char pd = 0xFD; // Padding
@@ -276,4 +276,4 @@
return success;
}
-} // namespace rtc
+} // namespace webrtc
diff --git a/rtc_base/third_party/base64/base64.h b/rtc_base/third_party/base64/base64.h
index d4c1d8a..d81152c 100644
--- a/rtc_base/third_party/base64/base64.h
+++ b/rtc_base/third_party/base64/base64.h
@@ -19,7 +19,7 @@
#include "absl/strings/string_view.h"
-namespace rtc {
+namespace webrtc {
class Base64 {
public:
@@ -122,6 +122,12 @@
size_t* data_used);
};
+} // namespace webrtc
+
+// Re-export symbols from the webrtc namespace for backwards compatibility.
+// TODO(bugs.webrtc.org/4222596): Remove once all references are updated.
+namespace rtc {
+using ::webrtc::Base64;
} // namespace rtc
#endif /* RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ */
