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

Side by Side Diff: media/renderers/skcanvas_video_renderer.cc

Issue 2101403005: media: Change auto to not deduce raw pointers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove comment Created 4 years, 5 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
« no previous file with comments | « media/mojo/services/mojo_cdm_service.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/renderers/skcanvas_video_renderer.h" 5 #include "media/renderers/skcanvas_video_renderer.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "gpu/GLES2/gl2extchromium.h" 10 #include "gpu/GLES2/gl2extchromium.h"
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 DCHECK(context_3d.gr_context); 370 DCHECK(context_3d.gr_context);
371 DCHECK(gl); 371 DCHECK(gl);
372 if (media::VideoFrame::NumPlanes(video_frame->format()) > 1) { 372 if (media::VideoFrame::NumPlanes(video_frame->format()) > 1) {
373 last_image_ = 373 last_image_ =
374 NewSkImageFromVideoFrameYUVTextures(video_frame.get(), context_3d); 374 NewSkImageFromVideoFrameYUVTextures(video_frame.get(), context_3d);
375 } else { 375 } else {
376 last_image_ = 376 last_image_ =
377 NewSkImageFromVideoFrameNative(video_frame.get(), context_3d); 377 NewSkImageFromVideoFrameNative(video_frame.get(), context_3d);
378 } 378 }
379 } else { 379 } else {
380 auto video_generator = new VideoImageGenerator(video_frame); 380 auto* video_generator = new VideoImageGenerator(video_frame);
381 last_image_ = SkImage::MakeFromGenerator(video_generator); 381 last_image_ = SkImage::MakeFromGenerator(video_generator);
382 } 382 }
383 if (!last_image_) // Couldn't create the SkImage. 383 if (!last_image_) // Couldn't create the SkImage.
384 return; 384 return;
385 last_timestamp_ = video_frame->timestamp(); 385 last_timestamp_ = video_frame->timestamp();
386 } 386 }
387 last_image_deleting_timer_.Reset(); 387 last_image_deleting_timer_.Reset();
388 388
389 paint.setXfermodeMode(mode); 389 paint.setXfermodeMode(mode);
390 paint.setFilterQuality(kLow_SkFilterQuality); 390 paint.setFilterQuality(kLow_SkFilterQuality);
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 } 679 }
680 680
681 void SkCanvasVideoRenderer::ResetCache() { 681 void SkCanvasVideoRenderer::ResetCache() {
682 DCHECK(thread_checker_.CalledOnValidThread()); 682 DCHECK(thread_checker_.CalledOnValidThread());
683 // Clear cached values. 683 // Clear cached values.
684 last_image_ = nullptr; 684 last_image_ = nullptr;
685 last_timestamp_ = kNoTimestamp(); 685 last_timestamp_ = kNoTimestamp();
686 } 686 }
687 687
688 } // namespace media 688 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_cdm_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698