commit b6c462d4e4e1f854ee487b5860a17a1243cf7aff
author Ilya Nikolaevskiy <ilnik@webrtc.org> Tue Jun 05 15:21:32 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Tue Jun 05 13:52:04 2018 +0000
tree 2c92523382776a251e7d460c1ff09c9d49b2d337
parent 5352ad7928710ea554890109be2821315f2b0566

Cleanup webrtc:: namespace from leaked TimingFrameFlags

Bug: webrtc:9351
Change-Id: Ifbc0a522bf13ab62a2e490b9f129eacfabe7796f
Reviewed-on: https://webrtc-review.googlesource.com/80961
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23520}

sdk/android/src/jni/androidmediaencoder.cc

diff --git a/sdk/android/src/jni/androidmediaencoder.cc b/sdk/android/src/jni/androidmediaencoder.cc
index 5492c32..860b069 100644
--- a/sdk/android/src/jni/androidmediaencoder.cc
+++ b/sdk/android/src/jni/androidmediaencoder.cc
@@ -1004,7 +1004,7 @@
       image->content_type_ = (codec_mode_ == VideoCodecMode::kScreensharing)
                                  ? VideoContentType::SCREENSHARE
                                  : VideoContentType::UNSPECIFIED;
-      image->timing_.flags = TimingFrameFlags::kInvalid;
+      image->timing_.flags = VideoSendTiming::kInvalid;
       image->_frameType = (key_frame ? kVideoFrameKey : kVideoFrameDelta);
       image->_completeFrame = true;
       CodecSpecificInfo info;

sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm

diff --git a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
index d9b103c..66e9b61 100644
--- a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
+++ b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
@@ -739,7 +739,7 @@
   frame.rotation = rotation;
   frame.contentType = (_mode == RTCVideoCodecModeScreensharing) ? RTCVideoContentTypeScreenshare :
                                                                   RTCVideoContentTypeUnspecified;
-  frame.flags = webrtc::TimingFrameFlags::kInvalid;
+  frame.flags = webrtc::VideoSendTiming::kInvalid;
 
   int qp;
   _h264BitstreamParser.ParseBitstream(buffer->data(), buffer->size());