media/base/video_frame.cc - Issue 581803003: Define a new media_cast component for iOS cast builds

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/base/video_frame.cc

Issue 581803003: Define a new media_cast component for iOS cast builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix cast_receiver and cast_sender dependency list; change how media_for_cast_ios builds media:share… Created 6 years, 3 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: media/base/video_frame.cc

diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc

index a7fe1a83144e983bd2ef37fc4c1a51fc5246c651..5f0d7282c6e01aedfe0861ee90e55e2cb319b7c1 100644

--- a/media/base/video_frame.cc

+++ b/media/base/video_frame.cc

@@ -14,7 +14,10 @@

#include "gpu/command_buffer/common/mailbox_holder.h"

#include "media/base/limits.h"

#include "media/base/video_util.h"

+#if !defined(MEDIA_FOR_CAST_IOS)

#include "third_party/skia/include/core/SkBitmap.h"

+#endif

namespace media {

@@ -181,11 +184,13 @@ scoped_refptr<VideoFrame> VideoFrame::WrapNativeTexture(

return frame;

}

+#if !defined(MEDIA_FOR_CAST_IOS)

void VideoFrame::ReadPixelsFromNativeTexture(const SkBitmap& pixels) {

DCHECK_EQ(format_, NATIVE_TEXTURE);

if (!read_pixels_cb_.is_null())

read_pixels_cb_.Run(pixels);

}

+#endif

// static

scoped_refptr<VideoFrame> VideoFrame::WrapExternalPackedMemory(

« no previous file with comments | « media/base/video_frame.h ('k') | media/cast/BUILD.gn » ('j') | no next file with comments »