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

Side by Side Diff: webrtc/modules/video_render/ios/open_gles20.mm

Issue 1900673002: Delete webrtc::VideoFrame methods buffer and stride. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Update H.264 video_toolbox encoder. 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 } 309 }
310 } 310 }
311 } 311 }
312 312
313 void OpenGles20::UpdateTextures(const VideoFrame& frame) { 313 void OpenGles20::UpdateTextures(const VideoFrame& frame) {
314 const GLsizei width = frame.width(); 314 const GLsizei width = frame.width();
315 const GLsizei height = frame.height(); 315 const GLsizei height = frame.height();
316 316
317 glActiveTexture(GL_TEXTURE0); 317 glActiveTexture(GL_TEXTURE0);
318 glBindTexture(GL_TEXTURE_2D, texture_ids_[0]); 318 glBindTexture(GL_TEXTURE_2D, texture_ids_[0]);
319 GlTexSubImage2D(width, height, frame.stride(kYPlane), frame.buffer(kYPlane)); 319 GlTexSubImage2D(width, height,
320 frame.video_frame_buffer()->StrideY(),
321 frame.video_frame_buffer()->DataY());
320 322
321 glActiveTexture(GL_TEXTURE1); 323 glActiveTexture(GL_TEXTURE1);
322 glBindTexture(GL_TEXTURE_2D, texture_ids_[1]); 324 glBindTexture(GL_TEXTURE_2D, texture_ids_[1]);
323 GlTexSubImage2D( 325 GlTexSubImage2D(width / 2, height / 2,
324 width / 2, height / 2, frame.stride(kUPlane), frame.buffer(kUPlane)); 326 frame.video_frame_buffer()->StrideU(),
327 frame.video_frame_buffer()->DataU());
325 328
326 glActiveTexture(GL_TEXTURE2); 329 glActiveTexture(GL_TEXTURE2);
327 glBindTexture(GL_TEXTURE_2D, texture_ids_[2]); 330 glBindTexture(GL_TEXTURE_2D, texture_ids_[2]);
328 GlTexSubImage2D( 331 GlTexSubImage2D(width / 2, height / 2,
329 width / 2, height / 2, frame.stride(kVPlane), frame.buffer(kVPlane)); 332 frame.video_frame_buffer()->StrideV(),
333 frame.video_frame_buffer()->DataV());
330 } 334 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698