generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 72097588-> 72159069

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6799 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org
2014-07-29 17:36:52 +00:00
parent fc8b0871d9
commit d4e598d57a
509 changed files with 7114 additions and 7239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
talk/media/base/videoframe.cc
View File

@@ -35,7 +35,7 @@
#include "libyuv/scale.h"
#endif
#include "talk/base/logging.h"
#include "webrtc/base/logging.h"
#include "talk/media/base/videocommon.h"
namespace cricket {
@@ -43,9 +43,9 @@ 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;
}
}