commit 87e2d785a0ae7a1ac6c711e110d82114aedba890
author Niels Möller <nisse@webrtc.org> Thu Mar 07 09:18:23 2019
committer Commit Bot <commit-bot@chromium.org> Thu Mar 07 10:12:57 2019
tree d5f0117bedfa70e19ce3e2d13270af521abc7761
parent 0b69826ffbf74d58fc26834c56aeb57a8ab7ce1c

Prepare for splitting FrameType into AudioFrameType and VideoFrameType

This cl deprecates the FrameType enum, and adds aliases AudioFrameType
and VideoFrameType.

After downstream usage is updated, the enums will be separated
and be moved out of common_types.h.

Bug: webrtc:6883
Change-Id: I2aaf660169da45f22574b4cbb16aea8522cc07a6
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/123184
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27011}

test/fake_encoder.cc

diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc
index 67fc839..5e7131c 100644
--- a/test/fake_encoder.cc
+++ b/test/fake_encoder.cc
@@ -82,7 +82,7 @@
 
 int32_t FakeEncoder::Encode(const VideoFrame& input_image,
                             const CodecSpecificInfo* /*codec_specific_info*/,
-                            const std::vector<FrameType>* frame_types) {
+                            const std::vector<VideoFrameType>* frame_types) {
   unsigned char max_framerate;
   unsigned char num_simulcast_streams;
   SimulcastStream simulcast_streams[kMaxSimulcastStreams];
@@ -161,7 +161,7 @@
 }
 
 FakeEncoder::FrameInfo FakeEncoder::NextFrame(
-    const std::vector<FrameType>* frame_types,
+    const std::vector<VideoFrameType>* frame_types,
     bool keyframe,
     uint8_t num_simulcast_streams,
     const VideoBitrateAllocation& target_bitrate,
@@ -171,7 +171,7 @@
   frame_info.keyframe = keyframe;
 
   if (frame_types) {
-    for (FrameType frame_type : *frame_types) {
+    for (VideoFrameType frame_type : *frame_types) {
       if (frame_type == kVideoFrameKey) {
         frame_info.keyframe = true;
         break;
@@ -356,7 +356,7 @@
 
 int32_t DelayedEncoder::Encode(const VideoFrame& input_image,
                                const CodecSpecificInfo* codec_specific_info,
-                               const std::vector<FrameType>* frame_types) {
+                               const std::vector<VideoFrameType>* frame_types) {
   RTC_DCHECK_CALLED_SEQUENTIALLY(&sequence_checker_);
 
   SleepMs(delay_ms_);
@@ -390,7 +390,7 @@
   EncodeTask(MultithreadedFakeH264Encoder* encoder,
              const VideoFrame& input_image,
              const CodecSpecificInfo* codec_specific_info,
-             const std::vector<FrameType>* frame_types)
+             const std::vector<VideoFrameType>* frame_types)
       : encoder_(encoder),
         input_image_(input_image),
         codec_specific_info_(),
@@ -409,13 +409,13 @@
   MultithreadedFakeH264Encoder* const encoder_;
   VideoFrame input_image_;
   CodecSpecificInfo codec_specific_info_;
-  std::vector<FrameType> frame_types_;
+  std::vector<VideoFrameType> frame_types_;
 };
 
 int32_t MultithreadedFakeH264Encoder::Encode(
     const VideoFrame& input_image,
     const CodecSpecificInfo* codec_specific_info,
-    const std::vector<FrameType>* frame_types) {
+    const std::vector<VideoFrameType>* frame_types) {
   RTC_DCHECK_CALLED_SEQUENTIALLY(&sequence_checker_);
 
   std::unique_ptr<rtc::TaskQueue>& queue =
@@ -434,7 +434,7 @@
 int32_t MultithreadedFakeH264Encoder::EncodeCallback(
     const VideoFrame& input_image,
     const CodecSpecificInfo* codec_specific_info,
-    const std::vector<FrameType>* frame_types) {
+    const std::vector<VideoFrameType>* frame_types) {
   return FakeH264Encoder::Encode(input_image, codec_specific_info, frame_types);
 }