Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / media / base / videoframe.cc

diff --git a/src/third_party/libjingle/source/talk/media/base/videoframe.cc b/src/third_party/libjingle/source/talk/media/base/videoframe.cc
index cf5f852..1c5cfd8 100644 (file)
--- a/src/third_party/libjingle/source/talk/media/base/videoframe.cc
+++ b/src/third_party/libjingle/source/talk/media/base/videoframe.cc
@@ -35,17 +35,17 @@
 #include "libyuv/scale.h"
 #endif
 
-#include "talk/base/logging.h"
 #include "talk/media/base/videocommon.h"
+#include "webrtc/base/logging.h"
 
 namespace cricket {
 
 // Round to 2 pixels because Chroma channels are half size.
 #define ROUNDTO2(v) (v & ~1)
 
-talk_base::StreamResult VideoFrame::Write(talk_base::StreamInterface* stream,
+rtc::StreamResult VideoFrame::Write(rtc::StreamInterface* stream,
                                           int* error) {
-  talk_base::StreamResult result = talk_base::SR_SUCCESS;
+  rtc::StreamResult result = rtc::SR_SUCCESS;
   const uint8* src_y = GetYPlane();
   const uint8* src_u = GetUPlane();
   const uint8* src_v = GetVPlane();
@@ -62,21 +62,21 @@ talk_base::StreamResult VideoFrame::Write(talk_base::StreamInterface* stream,
   // Write Y.
   for (size_t row = 0; row < height; ++row) {
     result = stream->Write(src_y + row * y_pitch, width, NULL, error);
-    if (result != talk_base::SR_SUCCESS) {
+    if (result != rtc::SR_SUCCESS) {
       return result;
     }
   }
   // Write U.
   for (size_t row = 0; row < half_height; ++row) {
     result = stream->Write(src_u + row * u_pitch, half_width, NULL, error);
-    if (result != talk_base::SR_SUCCESS) {
+    if (result != rtc::SR_SUCCESS) {
       return result;
     }
   }
   // Write V.
   for (size_t row = 0; row < half_height; ++row) {
     result = stream->Write(src_v + row * v_pitch, half_width, NULL, error);
-    if (result != talk_base::SR_SUCCESS) {
+    if (result != rtc::SR_SUCCESS) {
       return result;
     }
   }