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

Unified Diff: chrome/gpu/gpu_video_decoder.cc

Issue 4113006: Rename UploadToVideoFrame to ConvertToVideoFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/gpu/gpu_video_decoder.h ('k') | chrome/gpu/gpu_video_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/gpu/gpu_video_decoder.cc
diff --git a/chrome/gpu/gpu_video_decoder.cc b/chrome/gpu/gpu_video_decoder.cc
index 27de22f7eb1a1e2da63c2112027c95b51dec1b4b..d16064c7f1e6af58d728606e90dedb1591285194 100644
--- a/chrome/gpu/gpu_video_decoder.cc
+++ b/chrome/gpu/gpu_video_decoder.cc
@@ -199,9 +199,10 @@ void GpuVideoDecoder::ReleaseAllVideoFrames() {
SendReleaseAllVideoFrames();
}
-void GpuVideoDecoder::UploadToVideoFrame(void* buffer,
- scoped_refptr<media::VideoFrame> frame,
- Task* task) {
+void GpuVideoDecoder::ConvertToVideoFrame(
+ void* buffer,
+ scoped_refptr<media::VideoFrame> frame,
+ Task* task) {
// This method is called by VideoDecodeEngine to upload a buffer to a
// VideoFrame. We should just delegate this to GpuVideoDevice which contains
// the actual implementation.
@@ -209,7 +210,7 @@ void GpuVideoDecoder::UploadToVideoFrame(void* buffer,
DCHECK(ret) << "Failed to switch context";
// Actually doing the upload on the main thread.
- ret = video_device_->UploadToVideoFrame(buffer, frame);
+ ret = video_device_->ConvertToVideoFrame(buffer, frame);
DCHECK(ret) << "Failed to upload video content to a VideoFrame.";
task->Run();
delete task;
« no previous file with comments | « chrome/gpu/gpu_video_decoder.h ('k') | chrome/gpu/gpu_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698