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

Side by Side Diff: webrtc/modules/video_render/android/video_render_opengles20.cc

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 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 } 371 }
372 } 372 }
373 } 373 }
374 374
375 void VideoRenderOpenGles20::UpdateTextures(const VideoFrame& frameToRender) { 375 void VideoRenderOpenGles20::UpdateTextures(const VideoFrame& frameToRender) {
376 const GLsizei width = frameToRender.width(); 376 const GLsizei width = frameToRender.width();
377 const GLsizei height = frameToRender.height(); 377 const GLsizei height = frameToRender.height();
378 378
379 glActiveTexture(GL_TEXTURE0); 379 glActiveTexture(GL_TEXTURE0);
380 glBindTexture(GL_TEXTURE_2D, _textureIds[0]); 380 glBindTexture(GL_TEXTURE_2D, _textureIds[0]);
381 GlTexSubImage2D(width, height, frameToRender.stride(kYPlane), 381 GlTexSubImage2D(width, height,
382 frameToRender.buffer(kYPlane)); 382 frameToRender.video_frame_buffer()->StrideY(),
383 frameToRender.video_frame_buffer()->DataY());
383 384
384 glActiveTexture(GL_TEXTURE1); 385 glActiveTexture(GL_TEXTURE1);
385 glBindTexture(GL_TEXTURE_2D, _textureIds[1]); 386 glBindTexture(GL_TEXTURE_2D, _textureIds[1]);
386 GlTexSubImage2D(width / 2, height / 2, frameToRender.stride(kUPlane), 387 GlTexSubImage2D(width / 2, height / 2,
387 frameToRender.buffer(kUPlane)); 388 frameToRender.video_frame_buffer()->StrideU(),
389 frameToRender.video_frame_buffer()->DataU());
388 390
389 glActiveTexture(GL_TEXTURE2); 391 glActiveTexture(GL_TEXTURE2);
390 glBindTexture(GL_TEXTURE_2D, _textureIds[2]); 392 glBindTexture(GL_TEXTURE_2D, _textureIds[2]);
391 GlTexSubImage2D(width / 2, height / 2, frameToRender.stride(kVPlane), 393 GlTexSubImage2D(width / 2, height / 2,
392 frameToRender.buffer(kVPlane)); 394 frameToRender.video_frame_buffer()->StrideV(),
395 frameToRender.video_frame_buffer()->DataV());
393 396
394 checkGlError("UpdateTextures"); 397 checkGlError("UpdateTextures");
395 } 398 }
396 399
397 } // namespace webrtc 400 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698