Index: content/common/gpu/media/omx_video_decode_accelerator.h |
=================================================================== |
--- content/common/gpu/media/omx_video_decode_accelerator.h (revision 91551) |
+++ content/common/gpu/media/omx_video_decode_accelerator.h (working copy) |
@@ -52,10 +52,11 @@ |
// Helper struct for keeping track of the relationship between an OMX output |
// buffer and the GLESBuffer it points to. |
struct OutputPicture { |
- OutputPicture(media::GLESBuffer g_b, OMX_BUFFERHEADERTYPE* o_b_h) |
- : gles_buffer(g_b), omx_buffer_header(o_b_h) {} |
+ OutputPicture(media::GLESBuffer g_b, OMX_BUFFERHEADERTYPE* o_b_h, void* e_i) |
+ : gles_buffer(g_b), omx_buffer_header(o_b_h), egl_image(e_i) {} |
media::GLESBuffer gles_buffer; |
OMX_BUFFERHEADERTYPE* omx_buffer_header; |
+ void* egl_image; |
Ami GONE FROM CHROMIUM
2011/07/07 06:13:33
s/void*/EGLImageKHR/ here and above?
|
}; |
typedef std::map<int32, OutputPicture> OutputPictureById; |
@@ -135,8 +136,6 @@ |
// NOTE: all calls to this object *MUST* be executed in message_loop_. |
Client* client_; |
- std::vector<uint32> texture_ids_; |
- std::vector<uint32> context_ids_; |
// Method to handle events |
void EventHandlerCompleteTask(OMX_EVENTTYPE event, |
OMX_U32 data1, |