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

Unified Diff: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc

Issue 1024113003: Add multi-planar functions to GpuMemoryBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comment fix. Created 5 years, 9 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
Index: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
index 440dbfcec4b9b4ece5f37f28e43442902624c11b..a1d0e5c0d3fa67425b2b9c5aa2d8ccb0f3611381 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
@@ -68,7 +68,7 @@ GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(
handle.id, size, format, callback, native_window));
}
-void* GpuMemoryBufferImplSurfaceTexture::Map() {
+bool GpuMemoryBufferImplSurfaceTexture::Map(void** data) {
TRACE_EVENT0("gpu", "GpuMemoryBufferImplSurfaceTexture::Map");
DCHECK(!mapped_);
@@ -77,17 +77,18 @@ void* GpuMemoryBufferImplSurfaceTexture::Map() {
int status = ANativeWindow_lock(native_window_, &buffer, NULL);
if (status) {
VLOG(1) << "ANativeWindow_lock failed with error code: " << status;
- return NULL;
+ return false;
}
size_t stride_in_bytes = 0;
if (!StrideInBytes(buffer.stride, format_, &stride_in_bytes))
- return NULL;
+ return false;
DCHECK_LE(size_.width(), buffer.stride);
stride_ = stride_in_bytes;
mapped_ = true;
- return buffer.bits;
+ *data = buffer.bits;
+ return true;
}
void GpuMemoryBufferImplSurfaceTexture::Unmap() {
@@ -98,8 +99,8 @@ void GpuMemoryBufferImplSurfaceTexture::Unmap() {
mapped_ = false;
}
-uint32 GpuMemoryBufferImplSurfaceTexture::GetStride() const {
- return stride_;
+void GpuMemoryBufferImplSurfaceTexture::GetStride(uint32* stride) const {
+ *stride = stride_;
}
gfx::GpuMemoryBufferHandle GpuMemoryBufferImplSurfaceTexture::GetHandle()

Powered by Google App Engine
This is Rietveld 408576698