commit 22993e1a0c114122fc1b9de0fc74d4096ec868bd
author pbos <pbos@webrtc.org> Mon Oct 19 09:39:06 2015
committer Commit bot <commit-bot@chromium.org> Mon Oct 19 09:39:15 2015
tree 7512c1e0449b2abd4e8d9ef0051b9f8a6a6728a7
parent 4306fc70d778887d8a2ea71b6f4bc6a12d1d9447

Unify FrameType and VideoFrameType.

Prevents some heap allocation and frame-type conversion since interfaces
mismatch. Also it's less confusing to have one type for this.

BUG=webrtc:5042
R=magjed@webrtc.org, mflodman@webrtc.org, henrik.lundin@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1371043003

Cr-Commit-Position: refs/heads/master@{#10320}

webrtc/test/fake_encoder.h

diff --git a/webrtc/test/fake_encoder.h b/webrtc/test/fake_encoder.h
index 3dce336..dc3a1ae 100644
--- a/webrtc/test/fake_encoder.h
+++ b/webrtc/test/fake_encoder.h
@@ -33,7 +33,7 @@
                      size_t max_payload_size) override;
   int32_t Encode(const VideoFrame& input_image,
                  const CodecSpecificInfo* codec_specific_info,
-                 const std::vector<VideoFrameType>* frame_types) override;
+                 const std::vector<FrameType>* frame_types) override;
   int32_t RegisterEncodeCompleteCallback(
       EncodedImageCallback* callback) override;
   int32_t Release() override;
@@ -74,7 +74,7 @@
 
   int32_t Encode(const VideoFrame& input_image,
                  const CodecSpecificInfo* codec_specific_info,
-                 const std::vector<VideoFrameType>* frame_types) override;
+                 const std::vector<FrameType>* frame_types) override;
 
  private:
   const int delay_ms_;