diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 00:06:33 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 00:06:33 +0000 |
| commit | e82c747e5c09beeba226f4d319c687f10f3c123d (patch) | |
| tree | 45c703437e8e86d5e97ddb9f1623c3aa59fd241c /webkit/glue/webvideoframe_impl.cc | |
| parent | 3955344f69f3dae30b674a030e48d7c749fbdcce (diff) | |
| download | chromium_src-e82c747e5c09beeba226f4d319c687f10f3c123d.zip chromium_src-e82c747e5c09beeba226f4d319c687f10f3c123d.tar.gz chromium_src-e82c747e5c09beeba226f4d319c687f10f3c123d.tar.bz2 | |
Clean up texture types in VideoFrame
A VideoFrame should only reveal it self as system memory or textures (GL or D3D).
All the implementation details should be hidden. This removed EGL image,
OMXBUFFERHEADERTYPE, D3D surface and MF buffer from video frame.
We should only have 3 different types of video frames:
1. System memory
Whether it is allocated by VideoFrame or is just memory mapped should fall
into this category. Memory can either be allocated internally or provided
externally.
2. GL texture
EGL image or just plain GL texture should fall into this area. Decode engines should do all the necessary operations to convert texture to GL textures.
3. D3D texture
Whether we are using Media Foundation or DxVA2, if we are on windows we
should convert everything to D3D texture and again all the operations
involved are done inside the decode engine.
BUG=53714
TEST=Tree is green. This is just API change.
Review URL: http://codereview.chromium.org/3303014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webvideoframe_impl.cc')
| -rw-r--r-- | webkit/glue/webvideoframe_impl.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/webkit/glue/webvideoframe_impl.cc b/webkit/glue/webvideoframe_impl.cc index 0cb9de7..e1195a7 100644 --- a/webkit/glue/webvideoframe_impl.cc +++ b/webkit/glue/webvideoframe_impl.cc @@ -42,10 +42,8 @@ COMPILE_ASSERT_MATCHING_ENUM(FormatEmpty, EMPTY); COMPILE_ASSERT_MATCHING_ENUM(FormatASCII, ASCII); COMPILE_ASSERT_MATCHING_ENUM(SurfaceTypeSystemMemory, TYPE_SYSTEM_MEMORY); -COMPILE_ASSERT_MATCHING_ENUM(SurfaceTypeOMXBufferHead, TYPE_OMXBUFFERHEAD); -COMPILE_ASSERT_MATCHING_ENUM(SurfaceTypeEGLImage, TYPE_EGL_IMAGE); -COMPILE_ASSERT_MATCHING_ENUM(SurfaceTypeMFBuffer, TYPE_MFBUFFER); -COMPILE_ASSERT_MATCHING_ENUM(SurfaceTypeDirect3DSurface, TYPE_DIRECT3DSURFACE); +// TODO(hclam): Add checks for newly added surface types like GL texture and +// D3D texture. WebVideoFrame::SurfaceType WebVideoFrameImpl::surfaceType() const { if (video_frame_.get()) |