Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Unified Diff: content/gpu/omx_video_decode_accelerator.h

Issue 7034040: Updated video decoder IPC to use PPB_Buffer_Dev's new support for SharedMemory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CR response. Created 9 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/gpu_video_decode_accelerator.cc ('k') | content/gpu/omx_video_decode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/omx_video_decode_accelerator.h
diff --git a/content/gpu/omx_video_decode_accelerator.h b/content/gpu/omx_video_decode_accelerator.h
index 522f8faff87415fb106fcd61a99118993cdf8d23..ea4e6c25f1814ccb268ffab1133b4c185b9062cb 100644
--- a/content/gpu/omx_video_decode_accelerator.h
+++ b/content/gpu/omx_video_decode_accelerator.h
@@ -16,6 +16,7 @@
#include "base/callback.h"
#include "base/logging.h"
#include "base/message_loop.h"
+#include "base/shared_memory.h"
#include "media/video/video_decode_accelerator.h"
#include "third_party/openmax/il/OMX_Component.h"
#include "third_party/openmax/il/OMX_Core.h"
@@ -32,7 +33,7 @@ class OmxVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
const std::vector<uint32>& GetConfig(
const std::vector<uint32>& prototype_config);
bool Initialize(const std::vector<uint32>& config);
- bool Decode(media::BitstreamBuffer* bitstream_buffer,
+ bool Decode(const media::BitstreamBuffer& bitstream_buffer,
const media::VideoDecodeAcceleratorCallback& callback);
void AssignPictureBuffer(std::vector<PictureBuffer*> picture_buffers);
void ReusePictureBuffer(int32 picture_buffer_id);
@@ -129,8 +130,10 @@ class OmxVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
// void pointer to hold EGLImage handle.
void* egl_image_;
- typedef std::map<OMX_BUFFERHEADERTYPE*,
- media::VideoDecodeAcceleratorCallback> OMXBufferCallbackMap;
+ typedef std::map<
+ OMX_BUFFERHEADERTYPE*,
+ std::pair<base::SharedMemory*,
+ media::VideoDecodeAcceleratorCallback> > OMXBufferCallbackMap;
OMXBufferCallbackMap omx_buff_cb_;
// Method used the change the state of the port.
@@ -160,4 +163,3 @@ class OmxVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
};
#endif // CONTENT_GPU_OMX_VIDEO_DECODE_ACCELERATOR_H_
-
« no previous file with comments | « content/common/gpu/gpu_video_decode_accelerator.cc ('k') | content/gpu/omx_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698