diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-30 00:46:54 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-30 00:46:54 +0000 |
| commit | c7526b25874021a49c043e30decf9cefdd5b966a (patch) | |
| tree | f910149ba11fbcdf0230b33e19a242d0449a4683 /chrome/renderer/media | |
| parent | 382c29360b39b2117a74a10985b01a39ca8d524b (diff) | |
| download | chromium_src-c7526b25874021a49c043e30decf9cefdd5b966a.zip chromium_src-c7526b25874021a49c043e30decf9cefdd5b966a.tar.gz chromium_src-c7526b25874021a49c043e30decf9cefdd5b966a.tar.bz2 | |
Rename UploadToVideoFrame to ConvertToVideoFrame.
(Note: This was a TODO for hclam).
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/4113006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/media')
| -rw-r--r-- | chrome/renderer/media/gles2_video_decode_context.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/media/gles2_video_decode_context.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/renderer/media/gles2_video_decode_context.cc b/chrome/renderer/media/gles2_video_decode_context.cc index e32e22b..9712313 100644 --- a/chrome/renderer/media/gles2_video_decode_context.cc +++ b/chrome/renderer/media/gles2_video_decode_context.cc @@ -98,7 +98,7 @@ void Gles2VideoDecodeContext::ReleaseAllVideoFrames() { frames_.clear(); } -void Gles2VideoDecodeContext::UploadToVideoFrame( +void Gles2VideoDecodeContext::ConvertToVideoFrame( void* buffer, scoped_refptr<media::VideoFrame> frame, Task* task) { DCHECK(memory_mapped_); // TODO(hclam): Implement. diff --git a/chrome/renderer/media/gles2_video_decode_context.h b/chrome/renderer/media/gles2_video_decode_context.h index 3b8c649..3fe9889 100644 --- a/chrome/renderer/media/gles2_video_decode_context.h +++ b/chrome/renderer/media/gles2_video_decode_context.h @@ -37,7 +37,7 @@ class Context; // bwith the GPU process). An additional step of uploading the content to // video memory is needed. Since VideoDecodeEngine is unaware of the video // memory, this upload operation is performed by calling -// UploadToVideoFrame(). +// ConvertToVideoFrame(). // // After the content is uploaded to video memory, WebKit will see the video // frame as textures and will perform the necessary operations for @@ -86,9 +86,9 @@ class Gles2VideoDecodeContext : public media::VideoDecodeContext { media::VideoFrame::Format format, std::vector<scoped_refptr<media::VideoFrame> >* frames_out, Task* task); virtual void ReleaseAllVideoFrames(); - virtual void UploadToVideoFrame(void* buffer, - scoped_refptr<media::VideoFrame> frame, - Task* task); + virtual void ConvertToVideoFrame(void* buffer, + scoped_refptr<media::VideoFrame> frame, + Task* task); virtual void Destroy(Task* task); // Accessor of the current mode of this decode context. |