Index: content/common/gpu/media/omx_video_decode_accelerator.h |
=================================================================== |
--- content/common/gpu/media/omx_video_decode_accelerator.h (revision 120554) |
+++ content/common/gpu/media/omx_video_decode_accelerator.h (working copy) |
@@ -19,8 +19,7 @@ |
#include "base/message_loop.h" |
#include "base/shared_memory.h" |
#include "media/video/video_decode_accelerator.h" |
-#include "third_party/angle/include/EGL/egl.h" |
-#include "third_party/angle/include/EGL/eglext.h" |
+#include "content/common/gpu/media/gles2_texture_to_egl_image_translator.h" |
Ami GONE FROM CHROMIUM
2012/02/18 00:00:25
Since only a pointer to the translator is held by
|
#include "third_party/openmax/il/OMX_Component.h" |
#include "third_party/openmax/il/OMX_Core.h" |
#include "third_party/openmax/il/OMX_Video.h" |
@@ -148,6 +147,9 @@ |
OMX_U32 output_port_; |
int output_buffers_at_component_; |
+ int width_ ; |
Ami GONE FROM CHROMIUM
2012/02/18 00:00:25
prefix both this and the next member to indicate t
|
+ int height_; |
+ |
// NOTE: someday there may be multiple contexts for a single decoder. But not |
// today. |
// TODO(fischman,vrk): handle lost contexts? |
@@ -179,10 +181,13 @@ |
// NOTE: all calls to this object *MUST* be executed in message_loop_. |
Client* client_; |
+ Gles2TextureToEglImageTranslator* texture2eglImage_translator_; |
Ami GONE FROM CHROMIUM
2012/02/18 00:00:25
we don't use '2' as a synonym for 'to', and what w
|
+ |
// These two members are only used during Initialization. |
Ami GONE FROM CHROMIUM
2012/02/18 00:00:25
s/two //
|
// OMX_AVCProfile requested during Initialization. |
uint32 profile_; |
bool component_name_is_nvidia_h264ext_; |
+ bool component_name_is_sec_h264ext_; |
// Method to handle events |
void EventHandlerCompleteTask(OMX_EVENTTYPE event, |