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

Unified Diff: media/base/video_frame.h

Issue 850993002: gpu video: optimize HW video to SW canvas and implement it for WebRTC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android build fail Created 5 years, 10 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/renderer/media/webmediaplayer_ms.cc ('k') | media/base/video_frame.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_frame.h
diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index fc4a09d81fcc2b91c0aa06e71ab7db1a0f0991f9..b7f47b51fe9b04990597f10c561f492cbdcaa0a1 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -20,8 +20,6 @@
#include "base/mac/scoped_cftyperef.h"
#endif
-class SkBitmap;
-
namespace gpu {
struct MailboxHolder;
} // namespace gpu
@@ -93,10 +91,6 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
const gfx::Rect& visible_rect,
const gfx::Size& natural_size);
- // CB to write pixels from the texture backing this frame into the
- // |const SkBitmap&| parameter.
- typedef base::Callback<void(const SkBitmap&)> ReadPixelsCB;
-
// CB to be called on the mailbox backing this frame when the frame is
// destroyed.
typedef base::Callback<void(uint32)> ReleaseMailboxCB;
@@ -114,16 +108,8 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
const gfx::Rect& visible_rect,
const gfx::Size& natural_size,
base::TimeDelta timestamp,
- const ReadPixelsCB& read_pixels_cb,
bool allow_overlay);
-#if !defined(MEDIA_FOR_CAST_IOS)
- // Read pixels from the native texture backing |*this| and write
- // them to |pixels| as BGRA. |pixels| must point to a buffer at
- // least as large as 4 * visible_rect().size().GetArea().
- void ReadPixelsFromNativeTexture(const SkBitmap& pixels);
-#endif
-
// Wraps packed image data residing in a memory buffer with a VideoFrame.
// The image data resides in |data| and is assumed to be packed tightly in a
// buffer of logical dimensions |coded_size| with the appropriate bit depth
@@ -392,7 +378,6 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
// Native texture mailbox, if this is a NATIVE_TEXTURE frame.
const scoped_ptr<gpu::MailboxHolder> mailbox_holder_;
ReleaseMailboxCB mailbox_holder_release_cb_;
- ReadPixelsCB read_pixels_cb_;
// Shared memory handle, if this frame was allocated from shared memory.
base::SharedMemoryHandle shared_memory_handle_;
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.cc ('k') | media/base/video_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698