content/common/gpu/media/fake_gl_video_device.cc - Issue 6793054: Moved code that runs in both the browser and GPU process from content/gpu to content/common/gpu.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/common/gpu/media/fake_gl_video_device.cc

Issue 6793054: Moved code that runs in both the browser and GPU process from content/gpu to content/common/gpu. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 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 | Annotate | Revision Log

« no previous file with comments | « content/common/gpu/media/fake_gl_video_device.h ('k') | content/common/gpu/media/mft_angle_video_device.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "content/gpu/media/fake_gl_video_device.h"	5 #include "content/common/gpu/media/fake_gl_video_device.h"

6	6

7 #include "media/base/video_frame.h"	7 #include "media/base/video_frame.h"

8 #include "ui/gfx/gl/gl_bindings.h"	8 #include "ui/gfx/gl/gl_bindings.h"

9	9

10 void* FakeGlVideoDevice::GetDevice() {	10 void* FakeGlVideoDevice::GetDevice() {

11 // No actual hardware device should be used.	11 // No actual hardware device should be used.

12 return NULL;	12 return NULL;

13 }	13 }

14	14

15 bool FakeGlVideoDevice::CreateVideoFrameFromGlTextures(	15 bool FakeGlVideoDevice::CreateVideoFrameFromGlTextures(

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
49 reinterpret_cast<media::VideoFrame*>(buffer));	49 reinterpret_cast<media::VideoFrame*>(buffer));

50 DCHECK_EQ(frame->width(), frame_to_upload->width());	50 DCHECK_EQ(frame->width(), frame_to_upload->width());

51 DCHECK_EQ(frame->height(), frame_to_upload->height());	51 DCHECK_EQ(frame->height(), frame_to_upload->height());

52 DCHECK_EQ(frame->format(), frame_to_upload->format());	52 DCHECK_EQ(frame->format(), frame_to_upload->format());

53 glTexImage2D(	53 glTexImage2D(

54 GL_TEXTURE_2D, 0, GL_RGBA, frame_to_upload->width(),	54 GL_TEXTURE_2D, 0, GL_RGBA, frame_to_upload->width(),

55 frame_to_upload->height(), 0, GL_RGBA,	55 frame_to_upload->height(), 0, GL_RGBA,

56 GL_UNSIGNED_BYTE, frame_to_upload->data(media::VideoFrame::kRGBPlane));	56 GL_UNSIGNED_BYTE, frame_to_upload->data(media::VideoFrame::kRGBPlane));

57 return true;	57 return true;

58 }	58 }

OLD	NEW