summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/common.gypi5
-rw-r--r--cc/layers/video_layer_impl.cc8
-rw-r--r--cc/resources/video_resource_updater.cc12
-rw-r--r--cc/resources/video_resource_updater.h4
-rw-r--r--content/browser/android/content_view_core_impl.cc8
-rw-r--r--content/browser/media/android/browser_media_player_manager.cc12
-rw-r--r--content/browser/media/android/browser_media_player_manager.h8
-rw-r--r--content/browser/web_contents/web_contents_view_android.cc4
-rw-r--r--content/browser/web_contents/web_contents_view_android.h4
-rw-r--r--content/common/media/media_player_messages_android.h5
-rw-r--r--content/renderer/media/android/renderer_media_player_manager.cc4
-rw-r--r--content/renderer/media/android/renderer_media_player_manager.h8
-rw-r--r--content/renderer/media/android/webmediaplayer_android.cc43
-rw-r--r--content/renderer/media/android/webmediaplayer_android.h19
-rw-r--r--media/base/video_frame.cc18
-rw-r--r--media/base/video_frame.h8
16 files changed, 88 insertions, 82 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 99b336a..be71642 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2145,7 +2145,10 @@
'defines': ['OS_CHROMEOS=1'],
}],
['google_tv==1', {
- 'defines': ['GOOGLE_TV=1'],
+ 'defines': [
+ 'GOOGLE_TV=1',
+ 'VIDEO_HOLE=1',
+ ],
}],
['use_xi2_mt!=0 and use_x11==1', {
'defines': ['USE_XI2_MT=<(use_xi2_mt)'],
diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc
index b48b20f..314fed6 100644
--- a/cc/layers/video_layer_impl.cc
+++ b/cc/layers/video_layer_impl.cc
@@ -18,9 +18,9 @@
#include "cc/trees/proxy.h"
#include "media/base/video_frame.h"
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
#include "cc/quads/solid_color_draw_quad.h"
-#endif
+#endif // defined(VIDEO_HOLE)
namespace cc {
@@ -245,7 +245,7 @@ void VideoLayerImpl::AppendQuads(QuadSink* quad_sink,
append_quads_data);
break;
}
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
// This block and other blocks wrapped around #if defined(GOOGLE_TV) is not
// maintained by the general compositor team. Please contact the following
// people instead:
@@ -266,7 +266,7 @@ void VideoLayerImpl::AppendQuads(QuadSink* quad_sink,
append_quads_data);
break;
}
-#endif
+#endif // defined(VIDEO_HOLE)
case VideoFrameExternalResources::NONE:
NOTIMPLEMENTED();
break;
diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc
index c67e0d2..4abeab1 100644
--- a/cc/resources/video_resource_updater.cc
+++ b/cc/resources/video_resource_updater.cc
@@ -71,9 +71,9 @@ bool VideoResourceUpdater::VerifyFrame(
case media::VideoFrame::YV16:
case media::VideoFrame::YV12J:
case media::VideoFrame::NATIVE_TEXTURE:
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
case media::VideoFrame::HOLE:
-#endif
+#endif // defined(VIDEO_HOLE)
return true;
// Unacceptable inputs. ¯\(°_o)/¯
@@ -109,9 +109,9 @@ static gfx::Size SoftwarePlaneDimension(
case media::VideoFrame::I420:
case media::VideoFrame::NATIVE_TEXTURE:
case media::VideoFrame::HISTOGRAM_MAX:
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
case media::VideoFrame::HOLE:
-#endif
+#endif // defined(VIDEO_HOLE)
NOTREACHED();
}
}
@@ -124,13 +124,13 @@ VideoFrameExternalResources VideoResourceUpdater::CreateForSoftwarePlanes(
const scoped_refptr<media::VideoFrame>& video_frame) {
media::VideoFrame::Format input_frame_format = video_frame->format();
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
if (input_frame_format == media::VideoFrame::HOLE) {
VideoFrameExternalResources external_resources;
external_resources.type = VideoFrameExternalResources::HOLE;
return external_resources;
}
-#endif
+#endif // defined(VIDEO_HOLE)
// Only YUV software video frames are supported.
DCHECK(input_frame_format == media::VideoFrame::YV12 ||
diff --git a/cc/resources/video_resource_updater.h b/cc/resources/video_resource_updater.h
index e3476d4..2a27739 100644
--- a/cc/resources/video_resource_updater.h
+++ b/cc/resources/video_resource_updater.h
@@ -37,11 +37,11 @@ class CC_EXPORT VideoFrameExternalResources {
STREAM_TEXTURE_RESOURCE,
IO_SURFACE,
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
// TODO(danakj): Implement this with a solid color layer instead of a video
// frame and video layer.
HOLE,
-#endif
+#endif // defined(VIDEO_HOLE)
// TODO(danakj): Remove this and abstract TextureMailbox into
// "ExternalResource" that can hold a hardware or software backing.
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 7fb557f..5b7fb8b 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -1284,27 +1284,27 @@ void ContentViewCoreImpl::AttachExternalVideoSurface(JNIEnv* env,
jobject obj,
jint player_id,
jobject jsurface) {
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
web_contents_->GetRenderViewHost());
if (rvhi && rvhi->media_player_manager()) {
rvhi->media_player_manager()->AttachExternalVideoSurface(
static_cast<int>(player_id), jsurface);
}
-#endif
+#endif // defined(VIDEO_HOLE)
}
void ContentViewCoreImpl::DetachExternalVideoSurface(JNIEnv* env,
jobject obj,
jint player_id) {
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
web_contents_->GetRenderViewHost());
if (rvhi && rvhi->media_player_manager()) {
rvhi->media_player_manager()->DetachExternalVideoSurface(
static_cast<int>(player_id));
}
-#endif
+#endif // defined(VIDEO_HOLE)
}
jboolean ContentViewCoreImpl::IsRenderWidgetHostViewReady(JNIEnv* env,
diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc
index 99b785f..43b93da 100644
--- a/content/browser/media/android/browser_media_player_manager.cc
+++ b/content/browser/media/android/browser_media_player_manager.cc
@@ -134,10 +134,10 @@ bool BrowserMediaPlayerManager::OnMessageReceived(const IPC::Message& msg) {
IPC_MESSAGE_HANDLER(MediaKeysHostMsg_CreateSession, OnCreateSession)
IPC_MESSAGE_HANDLER(MediaKeysHostMsg_UpdateSession, OnUpdateSession)
IPC_MESSAGE_HANDLER(MediaKeysHostMsg_ReleaseSession, OnReleaseSession)
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_NotifyExternalSurface,
OnNotifyExternalSurface)
-#endif
+#endif // defined(VIDEO_HOLE)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -409,7 +409,7 @@ void BrowserMediaPlayerManager::OnSessionError(
routing_id(), media_keys_id, session_id, error_code, system_code));
}
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
void BrowserMediaPlayerManager::AttachExternalVideoSurface(int player_id,
jobject surface) {
MediaPlayerAndroid* player = GetPlayer(player_id);
@@ -435,7 +435,7 @@ void BrowserMediaPlayerManager::OnNotifyExternalSurface(
if (view)
view->NotifyExternalSurface(player_id, is_request, rect);
}
-#endif
+#endif // defined(VIDEO_HOLE)
void BrowserMediaPlayerManager::DisableFullscreenEncryptedMediaPlayback() {
if (fullscreen_player_id_ == -1)
@@ -536,12 +536,12 @@ void BrowserMediaPlayerManager::OnReleaseResources(int player_id) {
if (player_id == fullscreen_player_id_)
fullscreen_player_is_released_ = true;
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
WebContentsViewAndroid* view =
static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
if (view)
view->NotifyExternalSurface(player_id, false, gfx::RectF());
-#endif
+#endif // defined(VIDEO_HOLE)
}
void BrowserMediaPlayerManager::OnDestroyPlayer(int player_id) {
diff --git a/content/browser/media/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h
index 36ed061..d407e7e 100644
--- a/content/browser/media/android/browser_media_player_manager.h
+++ b/content/browser/media/android/browser_media_player_manager.h
@@ -104,10 +104,10 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
media::MediaKeys::KeyError error_code,
int system_code) OVERRIDE;
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
void AttachExternalVideoSurface(int player_id, jobject surface);
void DetachExternalVideoSurface(int player_id);
-#endif
+#endif // defined(VIDEO_HOLE)
// Called to disble the current fullscreen playback if the video is encrypted.
// TODO(qinmin): remove this once we have the new fullscreen mode.
@@ -145,10 +145,10 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
void OnReleaseSession(int media_keys_id, uint32 session_id);
void OnSetMediaKeys(int player_id, int media_keys_id);
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
virtual void OnNotifyExternalSurface(
int player_id, bool is_request, const gfx::RectF& rect);
-#endif
+#endif // defined(VIDEO_HOLE)
// Adds a given player to the list.
void AddPlayer(media::MediaPlayerAndroid* player);
diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc
index f66b5ec..21fcf54 100644
--- a/content/browser/web_contents/web_contents_view_android.cc
+++ b/content/browser/web_contents/web_contents_view_android.cc
@@ -54,13 +54,13 @@ void WebContentsViewAndroid::SetContentViewCore(
}
}
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
void WebContentsViewAndroid::NotifyExternalSurface(
int player_id, bool is_request, const gfx::RectF& rect) {
if (content_view_core_)
content_view_core_->NotifyExternalSurface(player_id, is_request, rect);
}
-#endif
+#endif // defined(VIDEO_HOLE)
gfx::NativeView WebContentsViewAndroid::GetNativeView() const {
return content_view_core_ ? content_view_core_->GetViewAndroid() : NULL;
diff --git a/content/browser/web_contents/web_contents_view_android.h b/content/browser/web_contents/web_contents_view_android.h
index 849ca6d..48cfee9 100644
--- a/content/browser/web_contents/web_contents_view_android.h
+++ b/content/browser/web_contents/web_contents_view_android.h
@@ -29,11 +29,11 @@ class WebContentsViewAndroid : public WebContentsViewPort,
// by the UI frontend.
void SetContentViewCore(ContentViewCoreImpl* content_view_core);
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
void NotifyExternalSurface(int player_id,
bool is_request,
const gfx::RectF& rect);
-#endif
+#endif // defined(VIDEO_HOLE)
// WebContentsView implementation --------------------------------------------
virtual gfx::NativeView GetNativeView() const OVERRIDE;
diff --git a/content/common/media/media_player_messages_android.h b/content/common/media/media_player_messages_android.h
index 2477837..5addcf1 100644
--- a/content/common/media/media_player_messages_android.h
+++ b/content/common/media/media_player_messages_android.h
@@ -270,14 +270,13 @@ IPC_MESSAGE_CONTROL2(MediaPlayerHostMsg_DurationChanged,
int /* demuxer_client_id */,
base::TimeDelta /* duration */)
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
// Notify the player about the external surface, requesting it if necessary.
IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface,
int /* player_id */,
bool /* is_request */,
gfx::RectF /* rect */)
-
-#endif
+#endif // defined(VIDEO_HOLE)
// Messages for encrypted media extensions API ------------------------------
// TODO(xhwang): Move the following messages to a separate file.
diff --git a/content/renderer/media/android/renderer_media_player_manager.cc b/content/renderer/media/android/renderer_media_player_manager.cc
index 4767b17..9af1c31 100644
--- a/content/renderer/media/android/renderer_media_player_manager.cc
+++ b/content/renderer/media/android/renderer_media_player_manager.cc
@@ -390,7 +390,7 @@ bool RendererMediaPlayerManager::IsInFullscreen(blink::WebFrame* frame) {
return fullscreen_frame_ == frame;
}
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
void RendererMediaPlayerManager::RequestExternalSurface(
int player_id,
const gfx::RectF& geometry) {
@@ -426,6 +426,6 @@ void RendererMediaPlayerManager::RetrieveGeometryChanges(
}
}
}
-#endif
+#endif // defined(VIDEO_HOLE)
} // namespace content
diff --git a/content/renderer/media/android/renderer_media_player_manager.h b/content/renderer/media/android/renderer_media_player_manager.h
index 0965611..cf1a48f3 100644
--- a/content/renderer/media/android/renderer_media_player_manager.h
+++ b/content/renderer/media/android/renderer_media_player_manager.h
@@ -80,13 +80,13 @@ class RendererMediaPlayerManager : public RenderViewObserver {
// Requests the player to exit fullscreen.
void ExitFullscreen(int player_id);
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
// Requests an external surface for out-of-band compositing.
void RequestExternalSurface(int player_id, const gfx::RectF& geometry);
// RenderViewObserver overrides.
virtual void DidCommitCompositorFrame() OVERRIDE;
-#endif
+#endif // defined(VIDEO_HOLE)
// Encrypted media related methods.
void InitializeCDM(int media_keys_id,
@@ -132,10 +132,10 @@ class RendererMediaPlayerManager : public RenderViewObserver {
// Gets the pointer to ProxyMediaKeys given the |media_keys_id|.
ProxyMediaKeys* GetMediaKeys(int media_keys_id);
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
// Gets the list of media players with video geometry changes.
void RetrieveGeometryChanges(std::map<int, gfx::RectF>* changes);
-#endif
+#endif // defined(VIDEO_HOLE)
private:
// Message handlers.
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index 6a0d2fc..be5b6dc 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -139,12 +139,13 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid(
external_surface_threshold_ = -1;
}
}
+#endif // defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
// Defer stream texture creation until we are sure it's necessary.
- stream_id_ = 0;
needs_establish_peer_ = false;
current_frame_ = VideoFrame::CreateBlackFrame(gfx::Size(1, 1));
-#endif
+#endif // defined(VIDEO_HOLE)
TryCreateStreamTextureProxyIfNeeded();
if (blink::WebRuntimeFeatures::isPrefixedEncryptedMediaEnabled()) {
@@ -324,15 +325,17 @@ void WebMediaPlayerAndroid::DidLoadMediaInfo(
}
void WebMediaPlayerAndroid::play() {
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
if (hasVideo() && needs_external_surface_ &&
!manager_->IsInFullscreen(frame_)) {
DCHECK(!needs_establish_peer_);
manager_->RequestExternalSurface(player_id_, last_computed_rect_);
}
+#endif // defined(VIDEO_HOLE)
+#if defined(GOOGLE_TV)
if (audio_renderer_ && paused())
audio_renderer_->Play();
-#endif
+#endif // defined(GOOGLE_TV)
TryCreateStreamTextureProxyIfNeeded();
if (hasVideo() && needs_establish_peer_)
@@ -726,11 +729,15 @@ void WebMediaPlayerAndroid::OnVideoSizeChanged(int width, int height) {
if (natural_size_.width == width && natural_size_.height == height)
return;
+#if defined(VIDEO_HOLE)
+ bool has_surface_size_restriction = false;
#if defined(GOOGLE_TV)
- if ((external_surface_threshold_ >= 0 &&
- external_surface_threshold_ <= width * height) ||
- // Use H/W surface for MSE as the content is protected.
- media_source_delegate_) {
+ has_surface_size_restriction = external_surface_threshold_ >= 0 &&
+ external_surface_threshold_ <= width * height;
+#endif // defined(GOOGLE_TV)
+ // Use H/W surface for MSE as the content might be protected.
+ // TODO(qinmin): Change this so that only EME needs the H/W surface
+ if (media_source_delegate_ || has_surface_size_restriction) {
needs_external_surface_ = true;
if (!paused() && !manager_->IsInFullscreen(frame_))
manager_->RequestExternalSurface(player_id_, last_computed_rect_);
@@ -743,7 +750,7 @@ void WebMediaPlayerAndroid::OnVideoSizeChanged(int width, int height) {
EstablishSurfaceTexturePeer();
}
}
-#endif
+#endif // defined(VIDEO_HOLE)
natural_size_.width = width;
natural_size_.height = height;
@@ -790,10 +797,10 @@ void WebMediaPlayerAndroid::OnDidExitFullscreen() {
if (!paused() && needs_establish_peer_)
EstablishSurfaceTexturePeer();
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
if (!paused() && needs_external_surface_)
manager_->RequestExternalSurface(player_id_, last_computed_rect_);
-#endif
+#endif // defined(VIDEO_HOLE)
frame_->view()->willExitFullScreen();
frame_->view()->didExitFullScreen();
@@ -859,9 +866,9 @@ void WebMediaPlayerAndroid::OnPlayerReleased() {
if (!needs_external_surface_)
needs_establish_peer_ = true;
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
last_computed_rect_ = gfx::RectF();
-#endif
+#endif // defined(VIDEO_HOLE)
}
void WebMediaPlayerAndroid::ReleaseMediaResources() {
@@ -1008,8 +1015,8 @@ void WebMediaPlayerAndroid::DrawRemotePlaybackIcon() {
void WebMediaPlayerAndroid::ReallocateVideoFrame() {
if (needs_external_surface_) {
- // VideoFrame::CreateHoleFrame is only defined under GOOGLE_TV.
-#if defined(GOOGLE_TV)
+ // VideoFrame::CreateHoleFrame is only defined under VIDEO_HOLE.
+#if defined(VIDEO_HOLE)
if (!natural_size_.isEmpty()) {
scoped_refptr<VideoFrame> new_frame =
VideoFrame::CreateHoleFrame(natural_size_);
@@ -1018,8 +1025,8 @@ void WebMediaPlayerAndroid::ReallocateVideoFrame() {
client_->repaint();
}
#else
- NOTIMPLEMENTED() << "Hole punching not supported outside of Google TV";
-#endif
+ NOTIMPLEMENTED() << "Hole punching not supported without VIDEO_HOLE flag";
+#endif // defined(VIDEO_HOLE)
} else if (!is_remote_ && texture_id_) {
scoped_refptr<VideoFrame> new_frame = VideoFrame::WrapNativeTexture(
make_scoped_ptr(new VideoFrame::MailboxHolder(
@@ -1145,7 +1152,7 @@ void WebMediaPlayerAndroid::UpdatePlayingState(bool is_playing) {
delegate_->DidPause(this);
}
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
bool WebMediaPlayerAndroid::RetrieveGeometryChange(gfx::RectF* rect) {
if (!video_weblayer_)
return false;
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h
index fd6555e..40582ca 100644
--- a/content/renderer/media/android/webmediaplayer_android.h
+++ b/content/renderer/media/android/webmediaplayer_android.h
@@ -191,12 +191,12 @@ class WebMediaPlayerAndroid
// Detach the player from its manager.
void Detach();
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
// Retrieve geometry of the media player (i.e. location and size of the video
// frame) if changed. Returns true only if the geometry has been changed since
// the last call.
bool RetrieveGeometryChange(gfx::RectF* rect);
-#endif
+#endif // defined(VIDEO_HOLE)
virtual MediaKeyException generateKeyRequest(
const blink::WebString& key_system,
@@ -256,11 +256,6 @@ class WebMediaPlayerAndroid
// Requesting whether the surface texture peer needs to be reestablished.
void SetNeedsEstablishPeer(bool needs_establish_peer);
-#if defined(GOOGLE_TV)
- // Request external surface for out-of-band composition.
- void RequestExternalSurface();
-#endif
-
private:
void DrawRemotePlaybackIcon();
void ReallocateVideoFrame();
@@ -401,15 +396,17 @@ class WebMediaPlayerAndroid
scoped_ptr<webkit::WebLayerImpl> video_weblayer_;
+#if defined(VIDEO_HOLE)
+ // A rectangle represents the geometry of video frame, when computed last
+ // time.
+ gfx::RectF last_computed_rect_;
+#endif // defined(VIDEO_HOLE)
+
#if defined(GOOGLE_TV)
// Pixel threshold for external surface usage. Negative value means that the
// threshold is not defined, so that external surface is never used.
int external_surface_threshold_;
- // A rectangle represents the geometry of video frame, when computed last
- // time.
- gfx::RectF last_computed_rect_;
-
// Media Stream related fields.
media::Demuxer* demuxer_;
base::Closure destroy_demuxer_cb_;
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index 2593bf3..8a4eb3c 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -54,10 +54,10 @@ std::string VideoFrame::FormatToString(VideoFrame::Format format) {
return "I420";
case VideoFrame::NATIVE_TEXTURE:
return "NATIVE_TEXTURE";
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
case VideoFrame::HOLE:
return "HOLE";
-#endif
+#endif // defined(VIDEO_HOLE)
case VideoFrame::YV12A:
return "YV12A";
case VideoFrame::YV12J:
@@ -227,8 +227,8 @@ scoped_refptr<VideoFrame> VideoFrame::CreateBlackFrame(const gfx::Size& size) {
return CreateColorFrame(size, kBlackY, kBlackUV, kBlackUV, kZero);
}
-#if defined(GOOGLE_TV)
-// This block and other blocks wrapped around #if defined(GOOGLE_TV) is not
+#if defined(VIDEO_HOLE)
+// This block and other blocks wrapped around #if defined(VIDEO_HOLE) is not
// maintained by the general compositor team. Please contact the following
// people instead:
//
@@ -243,15 +243,15 @@ scoped_refptr<VideoFrame> VideoFrame::CreateHoleFrame(
VideoFrame::HOLE, size, gfx::Rect(size), size, base::TimeDelta(), false));
return frame;
}
-#endif
+#endif // defined(VIDEO_HOLE)
// static
size_t VideoFrame::NumPlanes(Format format) {
switch (format) {
case VideoFrame::NATIVE_TEXTURE:
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
case VideoFrame::HOLE:
-#endif
+#endif // defined(VIDEO_HOLE)
return 0;
case VideoFrame::YV12:
case VideoFrame::YV16:
@@ -328,9 +328,9 @@ size_t VideoFrame::PlaneAllocationSize(Format format,
case VideoFrame::UNKNOWN:
case VideoFrame::NATIVE_TEXTURE:
case VideoFrame::HISTOGRAM_MAX:
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
case VideoFrame::HOLE:
-#endif
+#endif // defined(VIDEO_HOLE)
break;
}
NOTREACHED() << "Unsupported video frame format/plane: "
diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index 8a63cd3..b51bfe9 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -44,9 +44,9 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
YV16 = 2, // 16bpp YVU planar 1x1 Y, 2x1 VU samples
I420 = 3, // 12bpp YVU planar 1x1 Y, 2x2 UV samples.
YV12A = 4, // 20bpp YUVA planar 1x1 Y, 2x2 VU, 1x1 A samples.
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
HOLE = 5, // Hole frame.
-#endif
+#endif // defined(VIDEO_HOLE)
NATIVE_TEXTURE = 6, // Native texture. Pixel-format agnostic.
YV12J = 7, // JPEG color range version of YV12
HISTOGRAM_MAX, // Must always be greatest.
@@ -188,10 +188,10 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
// equivalent of RGB(0,0,0).
static scoped_refptr<VideoFrame> CreateBlackFrame(const gfx::Size& size);
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
// Allocates a hole frame.
static scoped_refptr<VideoFrame> CreateHoleFrame(const gfx::Size& size);
-#endif
+#endif // defined(VIDEO_HOLE)
static size_t NumPlanes(Format format);
generated by cgit v1.1 at 2025-02-19 17:24:03 +0000