From d3844565c4242cfeefe6a4098babaf9fe2081bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= <terelius@webrtc.org>
Date: Wed, 9 Aug 2023 17:07:42 +0200
Subject: [PATCH] Change FakeEncoder::kImplementationName from const char* to
 constexpr char*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: b/295113672
Change-Id: I33f447c907e807bd45a4379e39fc051625afd851
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/315260
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40531}
---
 test/fake_encoder.cc     | 1 -
 test/fake_encoder.h      | 2 +-
 test/fake_vp8_decoder.cc | 1 -
 test/fake_vp8_decoder.h  | 3 ++-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc
index f6a998f4e0..1afe1f8a0b 100644
--- a/test/fake_encoder.cc
+++ b/test/fake_encoder.cc
@@ -276,7 +276,6 @@ void FakeEncoder::SetRatesLocked(const RateControlParameters& parameters) {
   }
 }
 
-const char* FakeEncoder::kImplementationName = "fake_encoder";
 VideoEncoder::EncoderInfo FakeEncoder::GetEncoderInfo() const {
   EncoderInfo info;
   MutexLock lock(&mutex_);
diff --git a/test/fake_encoder.h b/test/fake_encoder.h
index 02eeee0633..b804f2ce35 100644
--- a/test/fake_encoder.h
+++ b/test/fake_encoder.h
@@ -65,7 +65,7 @@ class FakeEncoder : public VideoEncoder {
   int GetNumInitializations() const RTC_LOCKS_EXCLUDED(mutex_);
   const VideoCodec& config() const RTC_LOCKS_EXCLUDED(mutex_);
 
-  static const char* kImplementationName;
+  static constexpr char kImplementationName[] = "fake_encoder";
 
  protected:
   struct FrameInfo {
diff --git a/test/fake_vp8_decoder.cc b/test/fake_vp8_decoder.cc
index 4c2f55a668..137614a853 100644
--- a/test/fake_vp8_decoder.cc
+++ b/test/fake_vp8_decoder.cc
@@ -77,7 +77,6 @@ int32_t FakeVp8Decoder::Release() {
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
-const char* FakeVp8Decoder::kImplementationName = "fake_vp8_decoder";
 VideoDecoder::DecoderInfo FakeVp8Decoder::GetDecoderInfo() const {
   DecoderInfo info;
   info.implementation_name = kImplementationName;
diff --git a/test/fake_vp8_decoder.h b/test/fake_vp8_decoder.h
index 391ee374d4..a73922e6e1 100644
--- a/test/fake_vp8_decoder.h
+++ b/test/fake_vp8_decoder.h
@@ -38,7 +38,8 @@ class FakeVp8Decoder : public VideoDecoder {
 
   DecoderInfo GetDecoderInfo() const override;
   const char* ImplementationName() const override;
-  static const char* kImplementationName;
+
+  static constexpr char kImplementationName[] = "fake_vp8_decoder";
 
  private:
   DecodedImageCallback* callback_;