Revert "Delete CodecNamesEq, replaced with absl::EqualsIgnoreCase"
This reverts commit 80cd25bcfb2264fa0f1192de942a6f063879dd42.
Reason for revert: Breaks downstream project
Original change's description:
> Delete CodecNamesEq, replaced with absl::EqualsIgnoreCase
>
> Bug: None
> Change-Id: I225fe1e16a3c96e5a03e3ae8fe975f368be7e6ad
> Reviewed-on: https://webrtc-review.googlesource.com/c/107303
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#25312}
TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org
No-Try: true
Bug: None
Change-Id: I77b66bc032e2d95d1bd408c6cdeceb4dcd511699
Reviewed-on: https://webrtc-review.googlesource.com/c/107643
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25317}
diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index 916e7da..129336b 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -82,7 +82,6 @@
"../../rtc_base:ptr_util",
"../../rtc_base/system:rtc_export",
"//third_party/abseil-cpp/absl/memory",
- "//third_party/abseil-cpp/absl/strings",
]
}
diff --git a/api/video_codecs/builtin_video_encoder_factory.cc b/api/video_codecs/builtin_video_encoder_factory.cc
index 1d0827c..ca389b9 100644
--- a/api/video_codecs/builtin_video_encoder_factory.cc
+++ b/api/video_codecs/builtin_video_encoder_factory.cc
@@ -13,7 +13,6 @@
#include <vector>
#include "absl/memory/memory.h"
-#include "absl/strings/match.h"
#include "api/video_codecs/sdp_video_format.h"
#include "media/base/codec.h"
#include "media/base/mediaconstants.h"
@@ -60,7 +59,7 @@
if (IsFormatSupported(internal_encoder_factory_->GetSupportedFormats(),
format)) {
internal_encoder =
- absl::EqualsIgnoreCase(format.name, cricket::kVp8CodecName)
+ cricket::CodecNamesEq(format.name.c_str(), cricket::kVp8CodecName)
? absl::make_unique<VP8EncoderSimulcastProxy>(
internal_encoder_factory_.get(), format)
: internal_encoder_factory_->CreateVideoEncoder(format);
diff --git a/api/video_codecs/video_codec.cc b/api/video_codecs/video_codec.cc
index 0819c82..ea8dfa7 100644
--- a/api/video_codecs/video_codec.cc
+++ b/api/video_codecs/video_codec.cc
@@ -115,6 +115,11 @@
static const char* kPayloadNameGeneric = "Generic";
static const char* kPayloadNameMultiplex = "Multiplex";
+// TODO(nisse): Delete this wrapper.
+static bool CodecNamesEq(const char* name1, const char* name2) {
+ return absl::EqualsIgnoreCase(name1, name2);
+}
+
const char* CodecTypeToPayloadString(VideoCodecType type) {
switch (type) {
case kVideoCodecVP8:
@@ -132,15 +137,15 @@
}
VideoCodecType PayloadStringToCodecType(const std::string& name) {
- if (absl::EqualsIgnoreCase(name, kPayloadNameVp8))
+ if (CodecNamesEq(name.c_str(), kPayloadNameVp8))
return kVideoCodecVP8;
- if (absl::EqualsIgnoreCase(name, kPayloadNameVp9))
+ if (CodecNamesEq(name.c_str(), kPayloadNameVp9))
return kVideoCodecVP9;
- if (absl::EqualsIgnoreCase(name, kPayloadNameH264))
+ if (CodecNamesEq(name.c_str(), kPayloadNameH264))
return kVideoCodecH264;
- if (absl::EqualsIgnoreCase(name, kPayloadNameI420))
+ if (CodecNamesEq(name.c_str(), kPayloadNameI420))
return kVideoCodecI420;
- if (absl::EqualsIgnoreCase(name, kPayloadNameMultiplex))
+ if (CodecNamesEq(name.c_str(), kPayloadNameMultiplex))
return kVideoCodecMultiplex;
return kVideoCodecGeneric;
}