| Index: cc/resources/video_resource_updater.cc
|
| diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc
|
| index c67e0d2617c718e76ad8c00c1821e3ae6dec679b..4abeab149d3c7d13b80651b6820f71358c74f81c 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 ||
|
|
|