Index: content/common/gpu/media/v4l2_video_encode_accelerator.cc |
diff --git a/content/common/gpu/media/v4l2_video_encode_accelerator.cc b/content/common/gpu/media/v4l2_video_encode_accelerator.cc |
index 88c62669eaa55a1cd8f9ec9362c3d8346f27c49d..3719c29302205473b15da5f7c22c1e7af9f914f4 100644 |
--- a/content/common/gpu/media/v4l2_video_encode_accelerator.cc |
+++ b/content/common/gpu/media/v4l2_video_encode_accelerator.cc |
@@ -14,6 +14,7 @@ |
#include "base/numerics/safe_conversions.h" |
#include "base/thread_task_runner_handle.h" |
#include "base/trace_event/trace_event.h" |
+#include "content/common/gpu/media/shared_memory_region.h" |
#include "content/common/gpu/media/v4l2_video_encode_accelerator.h" |
#include "content/public/common/content_switches.h" |
#include "media/base/bitstream_buffer.h" |
@@ -48,11 +49,10 @@ |
namespace content { |
struct V4L2VideoEncodeAccelerator::BitstreamBufferRef { |
- BitstreamBufferRef(int32 id, scoped_ptr<base::SharedMemory> shm, size_t size) |
- : id(id), shm(shm.Pass()), size(size) {} |
+ BitstreamBufferRef(int32 id, scoped_ptr<SharedMemoryRegion> shm) |
+ : id(id), shm(shm.Pass()) {} |
Pawel Osciak
2015/12/31 02:05:54
std::move(shm) should work here.
Owen Lin
2016/01/04 08:54:17
Done.
|
const int32 id; |
- const scoped_ptr<base::SharedMemory> shm; |
- const size_t size; |
+ const scoped_ptr<SharedMemoryRegion> shm; |
}; |
V4L2VideoEncodeAccelerator::InputRecord::InputRecord() : at_device(false) { |
@@ -220,15 +220,14 @@ void V4L2VideoEncodeAccelerator::UseOutputBitstreamBuffer( |
return; |
} |
- scoped_ptr<base::SharedMemory> shm( |
- new base::SharedMemory(buffer.handle(), false)); |
- if (!shm->Map(buffer.size())) { |
+ scoped_ptr<SharedMemoryRegion> shm(new SharedMemoryRegion(buffer, false)); |
+ if (!shm->Map()) { |
NOTIFY_ERROR(kPlatformFailureError); |
return; |
} |
scoped_ptr<BitstreamBufferRef> buffer_ref( |
- new BitstreamBufferRef(buffer.id(), shm.Pass(), buffer.size())); |
+ new BitstreamBufferRef(buffer.id(), shm.Pass())); |
Pawel Osciak
2015/12/31 02:05:54
std::move(shm)
Owen Lin
2016/01/04 08:54:18
Done.
|
encoder_thread_.message_loop()->PostTask( |
FROM_HERE, |
base::Bind(&V4L2VideoEncodeAccelerator::UseOutputBitstreamBufferTask, |