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_;