Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(881)

Side by Side Diff: webrtc/media/base/fakevideorenderer.h

Issue 1921493004: Revert of Delete cricket::VideoFrame methods GetYPlane and GetYPitch. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 sigslot::signal1<const VideoFrame*> SignalRenderFrame; 75 sigslot::signal1<const VideoFrame*> SignalRenderFrame;
76 76
77 private: 77 private:
78 static bool CheckFrameColorYuv(uint8_t y_min, 78 static bool CheckFrameColorYuv(uint8_t y_min,
79 uint8_t y_max, 79 uint8_t y_max,
80 uint8_t u_min, 80 uint8_t u_min,
81 uint8_t u_max, 81 uint8_t u_max,
82 uint8_t v_min, 82 uint8_t v_min,
83 uint8_t v_max, 83 uint8_t v_max,
84 const cricket::VideoFrame* frame) { 84 const cricket::VideoFrame* frame) {
85 if (!frame || !frame->video_frame_buffer()) { 85 if (!frame) {
86 return false; 86 return false;
87 } 87 }
88 // Y 88 // Y
89 int y_width = frame->width(); 89 int y_width = frame->width();
90 int y_height = frame->height(); 90 int y_height = frame->height();
91 const uint8_t* y_plane = frame->video_frame_buffer()->DataY(); 91 const uint8_t* y_plane = frame->GetYPlane();
92 const uint8_t* y_pos = y_plane; 92 const uint8_t* y_pos = y_plane;
93 int32_t y_pitch = frame->video_frame_buffer()->StrideY(); 93 int32_t y_pitch = frame->GetYPitch();
94 for (int i = 0; i < y_height; ++i) { 94 for (int i = 0; i < y_height; ++i) {
95 for (int j = 0; j < y_width; ++j) { 95 for (int j = 0; j < y_width; ++j) {
96 uint8_t y_value = *(y_pos + j); 96 uint8_t y_value = *(y_pos + j);
97 if (y_value < y_min || y_value > y_max) { 97 if (y_value < y_min || y_value > y_max) {
98 return false; 98 return false;
99 } 99 }
100 } 100 }
101 y_pos += y_pitch; 101 y_pos += y_pitch;
102 } 102 }
103 // U and V 103 // U and V
104 int chroma_width = (frame->width() + 1)/2; 104 int chroma_width = (frame->width() + 1)/2;
105 int chroma_height = (frame->height() + 1)/2; 105 int chroma_height = (frame->height() + 1)/2;
106 const uint8_t* u_plane = frame->video_frame_buffer()->DataU(); 106 const uint8_t* u_plane = frame->GetUPlane();
107 const uint8_t* v_plane = frame->video_frame_buffer()->DataV(); 107 const uint8_t* v_plane = frame->GetVPlane();
108 const uint8_t* u_pos = u_plane; 108 const uint8_t* u_pos = u_plane;
109 const uint8_t* v_pos = v_plane; 109 const uint8_t* v_pos = v_plane;
110 int32_t u_pitch = frame->video_frame_buffer()->StrideU(); 110 int32_t u_pitch = frame->GetUPitch();
111 int32_t v_pitch = frame->video_frame_buffer()->StrideV(); 111 int32_t v_pitch = frame->GetVPitch();
112 for (int i = 0; i < chroma_height; ++i) { 112 for (int i = 0; i < chroma_height; ++i) {
113 for (int j = 0; j < chroma_width; ++j) { 113 for (int j = 0; j < chroma_width; ++j) {
114 uint8_t u_value = *(u_pos + j); 114 uint8_t u_value = *(u_pos + j);
115 if (u_value < u_min || u_value > u_max) { 115 if (u_value < u_min || u_value > u_max) {
116 return false; 116 return false;
117 } 117 }
118 uint8_t v_value = *(v_pos + j); 118 uint8_t v_value = *(v_pos + j);
119 if (v_value < v_min || v_value > v_max) { 119 if (v_value < v_min || v_value > v_max) {
120 return false; 120 return false;
121 } 121 }
(...skipping 10 matching lines...) Expand all
132 webrtc::VideoRotation rotation_; 132 webrtc::VideoRotation rotation_;
133 int64_t timestamp_; 133 int64_t timestamp_;
134 int num_rendered_frames_; 134 int num_rendered_frames_;
135 bool black_frame_; 135 bool black_frame_;
136 rtc::CriticalSection crit_; 136 rtc::CriticalSection crit_;
137 }; 137 };
138 138
139 } // namespace cricket 139 } // namespace cricket
140 140
141 #endif // WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_ 141 #endif // WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_
OLDNEW
« no previous file with comments | « webrtc/api/java/jni/peerconnection_jni.cc ('k') | webrtc/media/base/videobroadcaster_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698