commit 49e196af4060624d620297a6bc017699daa33550
author Peter Boström <pbos@webrtc.org> Fri Oct 23 15:58:18 2015 +0200
committer Peter Boström <pbos@webrtc.org> Fri Oct 23 13:58:27 2015 +0000
tree f55d90c1a762bea59fd47bce16c6fa33b3637ed6
parent a99069db6397ca9377ed473cdbfc6c4a53e22d98

Remove VideoFrameType aliases for FrameType.

No longer used in Chromium, so these can now be removed.

BUG=webrtc:5042
R=mflodman@webrtc.org
TBR=magjed@webrtc.org

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

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

talk/app/webrtc/java/jni/androidmediaencoder_jni.cc

diff --git a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
index 3bbf682..a69db8b 100644
--- a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
+++ b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
@@ -590,7 +590,7 @@
   render_times_ms_.push_back(input_frame.render_time_ms());
   frame_rtc_times_ms_.push_back(GetCurrentTimeMs());
 
-  bool key_frame = frame_types->front() != webrtc::kDeltaFrame;
+  bool key_frame = frame_types->front() != webrtc::kVideoFrameDelta;
   bool encode_status = jni->CallBooleanMethod(*j_media_codec_video_encoder_,
                                               j_encode_method_,
                                               key_frame,
@@ -769,7 +769,8 @@
       image->_encodedHeight = height_;
       image->_timeStamp = output_timestamp_;
       image->capture_time_ms_ = output_render_time_ms_;
-      image->_frameType = (key_frame ? webrtc::kKeyFrame : webrtc::kDeltaFrame);
+      image->_frameType =
+          (key_frame ? webrtc::kVideoFrameKey : webrtc::kVideoFrameDelta);
       image->_completeFrame = true;
 
       webrtc::CodecSpecificInfo info;