diff --git a/api/video_codecs/video_codec.cc b/api/video_codecs/video_codec.cc
index f429996..c5d9ea9 100644
--- a/api/video_codecs/video_codec.cc
+++ b/api/video_codecs/video_codec.cc
@@ -79,7 +79,7 @@
       numberOfSimulcastStreams(0),
       simulcastStream(),
       spatialLayers(),
-      mode(kRealtimeVideo),
+      mode(VideoCodecMode::kRealtimeVideo),
       expect_encode_from_texture(false),
       timing_frame_thresholds({0, 0}),
       codec_specific_() {}
diff --git a/api/video_codecs/video_codec.h b/api/video_codecs/video_codec.h
index e8c1def..5b4ebb2 100644
--- a/api/video_codecs/video_codec.h
+++ b/api/video_codecs/video_codec.h
@@ -21,7 +21,7 @@
 // away from slowly.
 
 // Video codec
-enum VideoCodecComplexity {
+enum class VideoCodecComplexity {
   kComplexityNormal = 0,
   kComplexityHigh = 1,
   kComplexityHigher = 2,
@@ -95,7 +95,7 @@
   VideoCodecH264 H264;
 };
 
-enum VideoCodecMode { kRealtimeVideo, kScreensharing };
+enum class VideoCodecMode { kRealtimeVideo, kScreensharing };
 
 // Common video codec properties
 class VideoCodec {
diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc
index 140bd0c..ab06022 100644
--- a/media/engine/simulcast_encoder_adapter.cc
+++ b/media/engine/simulcast_encoder_adapter.cc
@@ -471,7 +471,8 @@
     // kComplexityHigher, which maps to cpu_used = -4.
     int pixels_per_frame = stream_codec->width * stream_codec->height;
     if (pixels_per_frame < 352 * 288) {
-      stream_codec->VP8()->complexity = webrtc::kComplexityHigher;
+      stream_codec->VP8()->complexity =
+          webrtc::VideoCodecComplexity::kComplexityHigher;
     }
     // Turn off denoising for all streams but the highest resolution.
     stream_codec->VP8()->denoisingOn = false;
diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc
index b5b2445..9625b31 100644
--- a/media/engine/simulcast_encoder_adapter_unittest.cc
+++ b/media/engine/simulcast_encoder_adapter_unittest.cc
@@ -407,7 +407,8 @@
     // stream 0, the lowest resolution stream.
     InitRefCodec(0, &ref_codec);
     ref_codec.qpMax = 45;
-    ref_codec.VP8()->complexity = webrtc::kComplexityHigher;
+    ref_codec.VP8()->complexity =
+        webrtc::VideoCodecComplexity::kComplexityHigher;
     ref_codec.VP8()->denoisingOn = false;
     ref_codec.startBitrate = 100;  // Should equal to the target bitrate.
     VerifyCodec(ref_codec, 0);
diff --git a/media/engine/webrtcvideoengine_unittest.cc b/media/engine/webrtcvideoengine_unittest.cc
index 765eebc..2cb2b20 100644
--- a/media/engine/webrtcvideoengine_unittest.cc
+++ b/media/engine/webrtcvideoengine_unittest.cc
@@ -1101,7 +1101,7 @@
             capturer.Start(capturer.GetSupportedFormats()->front()));
   EXPECT_TRUE(capturer.CaptureFrame());
   ASSERT_TRUE(encoder_factory_->WaitForCreatedVideoEncoders(1));
-  EXPECT_EQ(webrtc::kRealtimeVideo,
+  EXPECT_EQ(webrtc::VideoCodecMode::kRealtimeVideo,
             encoder_factory_->encoders().back()->GetCodecSettings().mode);
 
   EXPECT_TRUE(channel->SetVideoSend(kSsrc, &options, &capturer));
@@ -1116,7 +1116,7 @@
   // adapter case, this will result in two calls since InitEncode triggers a
   // a new instance.
   ASSERT_TRUE(encoder_factory_->WaitForCreatedVideoEncoders(2));
-  EXPECT_EQ(webrtc::kScreensharing,
+  EXPECT_EQ(webrtc::VideoCodecMode::kScreensharing,
             encoder_factory_->encoders().back()->GetCodecSettings().mode);
 
   EXPECT_TRUE(channel->SetVideoSend(kSsrc, &options, &capturer));
@@ -1131,7 +1131,7 @@
   // a non |is_screencast| option just to verify it doesn't affect recreation.
   EXPECT_TRUE(capturer.CaptureFrame());
   ASSERT_TRUE(encoder_factory_->WaitForCreatedVideoEncoders(3));
-  EXPECT_EQ(webrtc::kRealtimeVideo,
+  EXPECT_EQ(webrtc::VideoCodecMode::kRealtimeVideo,
             encoder_factory_->encoders().back()->GetCodecSettings().mode);
 
   // Remove stream previously added to free the external encoder instance.
diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/modules/video_coding/codecs/h264/h264_encoder_impl.cc
index a8b1678..67c5abc 100644
--- a/modules/video_coding/codecs/h264/h264_encoder_impl.cc
+++ b/modules/video_coding/codecs/h264/h264_encoder_impl.cc
@@ -164,7 +164,7 @@
       max_frame_rate_(0.0f),
       target_bps_(0),
       max_bps_(0),
-      mode_(kRealtimeVideo),
+      mode_(VideoCodecMode::kRealtimeVideo),
       frame_dropping_on_(false),
       key_frame_interval_(0),
       packetization_mode_(H264PacketizationMode::SingleNalUnit),
@@ -373,7 +373,7 @@
   encoded_image_.ntp_time_ms_ = input_frame.ntp_time_ms();
   encoded_image_.capture_time_ms_ = input_frame.render_time_ms();
   encoded_image_.rotation_ = input_frame.rotation();
-  encoded_image_.content_type_ = (mode_ == kScreensharing)
+  encoded_image_.content_type_ = (mode_ == VideoCodecMode::kScreensharing)
                                      ? VideoContentType::SCREENSHARE
                                      : VideoContentType::UNSPECIFIED;
   encoded_image_.timing_.flags = VideoSendTiming::kInvalid;
@@ -419,9 +419,9 @@
   RTC_DCHECK(openh264_encoder_);
   SEncParamExt encoder_params;
   openh264_encoder_->GetDefaultParams(&encoder_params);
-  if (mode_ == kRealtimeVideo) {
+  if (mode_ == VideoCodecMode::kRealtimeVideo) {
     encoder_params.iUsageType = CAMERA_VIDEO_REAL_TIME;
-  } else if (mode_ == kScreensharing) {
+  } else if (mode_ == VideoCodecMode::kScreensharing) {
     encoder_params.iUsageType = SCREEN_CONTENT_REAL_TIME;
   } else {
     RTC_NOTREACHED();
diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
index 67f7a4c..5ac6986 100644
--- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
@@ -87,7 +87,7 @@
   rtc::SimpleStringBuilder ss(buf);
   switch (codec.codecType) {
     case kVideoCodecVP8:
-      ss << "complexity: " << codec.VP8().complexity;
+      ss << "complexity: " << static_cast<int>(codec.VP8().complexity);
       ss << "\nnum_temporal_layers: "
          << static_cast<int>(codec.VP8().numberOfTemporalLayers);
       ss << "\ndenoising: " << codec.VP8().denoisingOn;
@@ -96,7 +96,7 @@
       ss << "\nkey_frame_interval: " << codec.VP8().keyFrameInterval;
       break;
     case kVideoCodecVP9:
-      ss << "complexity: " << codec.VP9().complexity;
+      ss << "complexity: " << static_cast<int>(codec.VP9().complexity);
       ss << "\nnum_temporal_layers: "
          << static_cast<int>(codec.VP9().numberOfTemporalLayers);
       ss << "\nnum_spatial_layers: "
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
index 44f1b29..0f8bc75 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
@@ -473,13 +473,13 @@
 
   // Allow the user to set the complexity for the base stream.
   switch (inst->VP8().complexity) {
-    case kComplexityHigh:
+    case VideoCodecComplexity::kComplexityHigh:
       cpu_speed_[0] = -5;
       break;
-    case kComplexityHigher:
+    case VideoCodecComplexity::kComplexityHigher:
       cpu_speed_[0] = -4;
       break;
-    case kComplexityMax:
+    case VideoCodecComplexity::kComplexityMax:
       cpu_speed_[0] = -3;
       break;
     default:
@@ -661,7 +661,7 @@
   for (size_t i = 0; i < encoders_.size(); ++i) {
     // Allow more screen content to be detected as static.
     vpx_codec_control(&(encoders_[i]), VP8E_SET_STATIC_THRESHOLD,
-                      codec_.mode == kScreensharing ? 300 : 1);
+                      codec_.mode == VideoCodecMode::kScreensharing ? 300 : 1);
     vpx_codec_control(&(encoders_[i]), VP8E_SET_CPUUSED, cpu_speed_[i]);
     vpx_codec_control(&(encoders_[i]), VP8E_SET_TOKEN_PARTITIONS,
                       static_cast<vp8e_token_partitions>(kTokenPartitions));
@@ -670,7 +670,7 @@
     // VP8E_SET_SCREEN_CONTENT_MODE 2 = screen content with more aggressive
     // rate control (drop frames on large target bitrate overshoot)
     vpx_codec_control(&(encoders_[i]), VP8E_SET_SCREEN_CONTENT_MODE,
-                      codec_.mode == kScreensharing ? 2 : 0);
+                      codec_.mode == VideoCodecMode::kScreensharing ? 2 : 0);
     // Apply boost on golden frames (has only effect when resilience is off).
     if (use_gf_boost_ && configurations_[0].g_error_resilient == 0) {
       int gf_boost_percent;
@@ -778,7 +778,8 @@
   if (send_key_frame) {
     // Adapt the size of the key frame when in screenshare with 1 temporal
     // layer.
-    if (encoders_.size() == 1 && codec_.mode == kScreensharing &&
+    if (encoders_.size() == 1 &&
+        codec_.mode == VideoCodecMode::kScreensharing &&
         codec_.VP8()->numberOfTemporalLayers <= 1) {
       const uint32_t forceKeyFrameIntraTh = 100;
       vpx_codec_control(&(encoders_[0]), VP8E_SET_MAX_INTRA_BITRATE_PCT,
@@ -925,8 +926,9 @@
         input_image.render_time_ms();
     encoded_images_[encoder_idx].rotation_ = input_image.rotation();
     encoded_images_[encoder_idx].content_type_ =
-        (codec_.mode == kScreensharing) ? VideoContentType::SCREENSHARE
-                                        : VideoContentType::UNSPECIFIED;
+        (codec_.mode == VideoCodecMode::kScreensharing)
+            ? VideoContentType::SCREENSHARE
+            : VideoContentType::UNSPECIFIED;
     encoded_images_[encoder_idx].timing_.flags = VideoSendTiming::kInvalid;
 
     int qp = -1;
@@ -947,7 +949,7 @@
         encoded_images_[encoder_idx].qp_ = qp_128;
         encoded_complete_callback_->OnEncodedImage(encoded_images_[encoder_idx],
                                                    &codec_specific, &frag_info);
-      } else if (codec_.mode == kScreensharing) {
+      } else if (codec_.mode == VideoCodecMode::kScreensharing) {
         result = WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT;
       }
     }
diff --git a/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc
index d3f135c..6eea837 100644
--- a/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc
+++ b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc
@@ -134,7 +134,8 @@
     // Legacy temporal-layered only screenshare, or simulcast screenshare
     // with legacy mode for simulcast stream 0.
     const bool conference_screenshare_mode =
-        codec_.mode == kScreensharing && codec_.targetBitrate > 0 &&
+        codec_.mode == VideoCodecMode::kScreensharing &&
+        codec_.targetBitrate > 0 &&
         ((num_spatial_streams == 1 && num_temporal_streams == 2) ||  // Legacy.
          (num_spatial_streams > 1 && simulcast_id == 0));  // Simulcast.
     if (conference_screenshare_mode) {
diff --git a/modules/video_coding/codecs/vp8/temporal_layers.cc b/modules/video_coding/codecs/vp8/temporal_layers.cc
index 3ecd0fe..67401cd 100644
--- a/modules/video_coding/codecs/vp8/temporal_layers.cc
+++ b/modules/video_coding/codecs/vp8/temporal_layers.cc
@@ -40,7 +40,7 @@
 }
 
 bool IsConferenceModeScreenshare(const VideoCodec& codec) {
-  if (codec.mode != kScreensharing) {
+  if (codec.mode != VideoCodecMode::kScreensharing) {
     return false;
   }
   return NumTemporalLayers(codec, 0) == 2;
diff --git a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
index a47b391..207a078 100644
--- a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
+++ b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
@@ -50,7 +50,7 @@
     codec_settings->VP8()->denoisingOn = true;
     codec_settings->VP8()->frameDroppingOn = false;
     codec_settings->VP8()->automaticResizeOn = false;
-    codec_settings->VP8()->complexity = kComplexityNormal;
+    codec_settings->VP8()->complexity = VideoCodecComplexity::kComplexityNormal;
   }
 
   void EncodeAndWaitForFrame(const VideoFrame& input_frame,
diff --git a/modules/video_coding/codecs/vp9/svc_rate_allocator.cc b/modules/video_coding/codecs/vp9/svc_rate_allocator.cc
index 17d529a..9b846ad 100644
--- a/modules/video_coding/codecs/vp9/svc_rate_allocator.cc
+++ b/modules/video_coding/codecs/vp9/svc_rate_allocator.cc
@@ -38,7 +38,7 @@
     VideoBitrateAllocation bitrate_allocation;
     bitrate_allocation.SetBitrate(0, 0, total_bitrate_bps);
     return bitrate_allocation;
-  } else if (codec_.mode == kRealtimeVideo) {
+  } else if (codec_.mode == VideoCodecMode::kRealtimeVideo) {
     return GetAllocationNormalVideo(total_bitrate_bps);
   } else {
     return GetAllocationScreenSharing(total_bitrate_bps);
diff --git a/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc b/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc
index 7058baf..1b6aa10 100644
--- a/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc
+++ b/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc
@@ -25,7 +25,8 @@
   codec.width = width;
   codec.height = height;
   codec.codecType = kVideoCodecVP9;
-  codec.mode = is_screen_sharing ? kScreensharing : kRealtimeVideo;
+  codec.mode = is_screen_sharing ? VideoCodecMode::kScreensharing
+                                 : VideoCodecMode::kRealtimeVideo;
 
   std::vector<SpatialLayer> spatial_layers =
       GetSvcConfig(width, height, num_spatial_layers, num_temporal_layers,
diff --git a/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc b/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc
index 639ff7c..09bd36d 100644
--- a/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc
+++ b/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc
@@ -434,7 +434,7 @@
     // to reduce execution time.
     codec_settings->width = 64;
     codec_settings->height = 64;
-    codec_settings->mode = kScreensharing;
+    codec_settings->mode = VideoCodecMode::kScreensharing;
   }
 };
 
diff --git a/modules/video_coding/codecs/vp9/vp9_impl.cc b/modules/video_coding/codecs/vp9/vp9_impl.cc
index 625289d..29c47cb 100644
--- a/modules/video_coding/codecs/vp9/vp9_impl.cc
+++ b/modules/video_coding/codecs/vp9/vp9_impl.cc
@@ -287,7 +287,7 @@
 
   // Init framerate controller.
   output_framerate_.Reset();
-  if (codec_.mode == kScreensharing) {
+  if (codec_.mode == VideoCodecMode::kScreensharing) {
     target_framerate_fps_ = kMaxScreenSharingFramerateFps;
   } else {
     target_framerate_fps_.reset();
@@ -538,7 +538,7 @@
                     inst->VP9().denoisingOn ? 1 : 0);
 #endif
 
-  if (codec_.mode == kScreensharing) {
+  if (codec_.mode == VideoCodecMode::kScreensharing) {
     // Adjust internal parameters to screen content.
     vpx_codec_control(encoder_, VP9E_SET_TUNE_CONTENT, 1);
   }
@@ -580,7 +580,7 @@
     }
   }
 
-  if (kScreensharing == codec_.mode && !force_key_frame_) {
+  if (VideoCodecMode::kScreensharing == codec_.mode && !force_key_frame_) {
     if (DropFrame(input_image.timestamp())) {
       return WEBRTC_VIDEO_CODEC_OK;
     }
@@ -881,7 +881,7 @@
   encoded_image_._timeStamp = input_image_->timestamp();
   encoded_image_.capture_time_ms_ = input_image_->render_time_ms();
   encoded_image_.rotation_ = input_image_->rotation();
-  encoded_image_.content_type_ = (codec_.mode == kScreensharing)
+  encoded_image_.content_type_ = (codec_.mode == VideoCodecMode::kScreensharing)
                                      ? VideoContentType::SCREENSHARE
                                      : VideoContentType::UNSPECIFIED;
   encoded_image_._encodedHeight =
diff --git a/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc
index 29ad4a8..8be04cd 100644
--- a/modules/video_coding/video_codec_initializer.cc
+++ b/modules/video_coding/video_codec_initializer.cc
@@ -82,10 +82,10 @@
 
   switch (config.content_type) {
     case VideoEncoderConfig::ContentType::kRealtimeVideo:
-      video_codec.mode = kRealtimeVideo;
+      video_codec.mode = VideoCodecMode::kRealtimeVideo;
       break;
     case VideoEncoderConfig::ContentType::kScreen:
-      video_codec.mode = kScreensharing;
+      video_codec.mode = VideoCodecMode::kScreensharing;
       if (!streams.empty() && streams[0].num_temporal_layers == 2u) {
         video_codec.targetBitrate = streams[0].target_bitrate_bps / 1000;
       }
@@ -203,10 +203,11 @@
         // Layering is set explicitly.
         spatial_layers = config.spatial_layers;
       } else {
-        spatial_layers = GetSvcConfig(video_codec.width, video_codec.height,
-                                      video_codec.VP9()->numberOfSpatialLayers,
-                                      video_codec.VP9()->numberOfTemporalLayers,
-                                      video_codec.mode == kScreensharing);
+        spatial_layers =
+            GetSvcConfig(video_codec.width, video_codec.height,
+                         video_codec.VP9()->numberOfSpatialLayers,
+                         video_codec.VP9()->numberOfTemporalLayers,
+                         video_codec.mode == VideoCodecMode::kScreensharing);
 
         const bool no_spatial_layering = (spatial_layers.size() == 1);
         if (no_spatial_layering) {
diff --git a/modules/video_coding/video_sender.cc b/modules/video_coding/video_sender.cc
index c8150a8..ec24a97 100644
--- a/modules/video_coding/video_sender.cc
+++ b/modules/video_coding/video_sender.cc
@@ -92,7 +92,7 @@
 
   // If we have screensharing and we have layers, we disable frame dropper.
   bool disable_frame_dropper =
-      numLayers > 1 && sendCodec->mode == kScreensharing;
+      numLayers > 1 && sendCodec->mode == VideoCodecMode::kScreensharing;
   if (disable_frame_dropper) {
     _mediaOpt.EnableFrameDropper(false);
   } else if (frame_dropper_enabled_) {
diff --git a/sdk/android/src/jni/androidmediaencoder.cc b/sdk/android/src/jni/androidmediaencoder.cc
index 860b069..b10fcb2 100644
--- a/sdk/android/src/jni/androidmediaencoder.cc
+++ b/sdk/android/src/jni/androidmediaencoder.cc
@@ -614,7 +614,7 @@
   }
 
   bool send_key_frame = false;
-  if (codec_mode_ == kRealtimeVideo) {
+  if (codec_mode_ == VideoCodecMode::kRealtimeVideo) {
     ++frames_received_since_last_key_;
     int64_t now_ms = rtc::TimeMillis();
     if (last_frame_received_ms_ != -1 &&
diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc
index c8d13cb..7f7e695 100644
--- a/test/fake_encoder.cc
+++ b/test/fake_encoder.cc
@@ -150,7 +150,7 @@
     encoded._encodedWidth = simulcast_streams[i].width;
     encoded._encodedHeight = simulcast_streams[i].height;
     encoded.rotation_ = input_image.rotation();
-    encoded.content_type_ = (mode == kScreensharing)
+    encoded.content_type_ = (mode == VideoCodecMode::kScreensharing)
                                 ? VideoContentType::SCREENSHARE
                                 : VideoContentType::UNSPECIFIED;
     specifics.codec_name = ImplementationName();