diff options
-rw-r--r-- | cc/resources/video_resource_updater.cc | 2 | ||||
-rw-r--r-- | media/base/video_frame.cc | 8 | ||||
-rw-r--r-- | media/base/video_types.cc | 4 | ||||
-rw-r--r-- | media/base/video_types.h | 2 | ||||
-rw-r--r-- | media/blink/skcanvas_video_renderer.cc | 2 | ||||
-rw-r--r-- | media/blink/video_frame_compositor.cc | 2 | ||||
-rw-r--r-- | media/cast/test/utility/video_utility.cc | 5 | ||||
-rw-r--r-- | media/mojo/services/media_type_converters.cc | 2 | ||||
-rw-r--r-- | media/video/gpu_memory_buffer_video_frame_pool.cc | 2 |
9 files changed, 1 insertions, 28 deletions
diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc index e5a6c5f..9650777 100644 --- a/cc/resources/video_resource_updater.cc +++ b/cc/resources/video_resource_updater.cc @@ -405,9 +405,7 @@ VideoFrameExternalResources VideoResourceUpdater::CreateForHardwarePlanes( case media::PIXEL_FORMAT_I420: external_resources.type = VideoFrameExternalResources::YUV_RESOURCE; break; -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) case media::PIXEL_FORMAT_NV12: -#endif case media::PIXEL_FORMAT_YV12: case media::PIXEL_FORMAT_YV16: case media::PIXEL_FORMAT_YV24: diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc index f80f9aa..0b513a8 100644 --- a/media/base/video_frame.cc +++ b/media/base/video_frame.cc @@ -86,9 +86,7 @@ static gfx::Size SampleSize(VideoPixelFormat format, size_t plane) { case PIXEL_FORMAT_YV12: case PIXEL_FORMAT_I420: case PIXEL_FORMAT_YV12A: -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) case PIXEL_FORMAT_NV12: -#endif return gfx::Size(2, 2); case PIXEL_FORMAT_UNKNOWN: @@ -119,12 +117,8 @@ static int BytesPerElement(VideoPixelFormat format, size_t plane) { DCHECK(IsValidPlane(plane, format)); if (format == PIXEL_FORMAT_ARGB || format == PIXEL_FORMAT_XRGB) return 4; - -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) if (format == PIXEL_FORMAT_NV12 && plane == VideoFrame::kUVPlane) return 2; -#endif - return 1; } @@ -510,10 +504,8 @@ size_t VideoFrame::NumPlanes(VideoPixelFormat format) { case PIXEL_FORMAT_ARGB: case PIXEL_FORMAT_XRGB: return 1; -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) case PIXEL_FORMAT_NV12: return 2; -#endif case PIXEL_FORMAT_YV12: case PIXEL_FORMAT_YV16: case PIXEL_FORMAT_I420: diff --git a/media/base/video_types.cc b/media/base/video_types.cc index b42356b..a8a43fe 100644 --- a/media/base/video_types.cc +++ b/media/base/video_types.cc @@ -26,10 +26,8 @@ std::string VideoPixelFormatToString(VideoPixelFormat format) { return "PIXEL_FORMAT_ARGB"; case PIXEL_FORMAT_XRGB: return "PIXEL_FORMAT_XRGB"; -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) case PIXEL_FORMAT_NV12: return "PIXEL_FORMAT_NV12"; -#endif } NOTREACHED() << "Invalid VideoPixelFormat provided: " << format; return ""; @@ -42,9 +40,7 @@ bool IsYuvPlanar(VideoPixelFormat format) { case PIXEL_FORMAT_YV16: case PIXEL_FORMAT_YV12A: case PIXEL_FORMAT_YV24: -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) case PIXEL_FORMAT_NV12: -#endif return true; case PIXEL_FORMAT_UNKNOWN: diff --git a/media/base/video_types.h b/media/base/video_types.h index 427f6e1..cc586b9 100644 --- a/media/base/video_types.h +++ b/media/base/video_types.h @@ -23,10 +23,8 @@ enum VideoPixelFormat { PIXEL_FORMAT_YV16 = 3, // 16bpp YVU planar 1x1 Y, 2x1 VU samples. PIXEL_FORMAT_YV12A = 4, // 20bpp YUVA planar 1x1 Y, 2x2 VU, 1x1 A samples. PIXEL_FORMAT_YV24 = 5, // 24bpp YUV planar, no subsampling. -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) PIXEL_FORMAT_NV12 = 6, // 12bpp with Y plane followed by a 2x2 interleaved UV plane. -#endif PIXEL_FORMAT_ARGB = 7, // 32bpp ARGB, 1 plane. PIXEL_FORMAT_XRGB = 8, // 24bpp XRGB, 1 plane. // Please update UMA histogram enumeration when adding new formats here. diff --git a/media/blink/skcanvas_video_renderer.cc b/media/blink/skcanvas_video_renderer.cc index db711dc..c7a1175 100644 --- a/media/blink/skcanvas_video_renderer.cc +++ b/media/blink/skcanvas_video_renderer.cc @@ -528,9 +528,7 @@ void SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels( video_frame->visible_rect().height()); #endif break; -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) case PIXEL_FORMAT_NV12: -#endif case PIXEL_FORMAT_ARGB: case PIXEL_FORMAT_XRGB: case PIXEL_FORMAT_UNKNOWN: diff --git a/media/blink/video_frame_compositor.cc b/media/blink/video_frame_compositor.cc index 3cdf980b..1821b4b 100644 --- a/media/blink/video_frame_compositor.cc +++ b/media/blink/video_frame_compositor.cc @@ -24,9 +24,7 @@ static bool IsOpaque(const scoped_refptr<VideoFrame>& frame) { case PIXEL_FORMAT_I420: case PIXEL_FORMAT_YV16: case PIXEL_FORMAT_YV24: -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) case PIXEL_FORMAT_NV12: -#endif case PIXEL_FORMAT_XRGB: return true; case PIXEL_FORMAT_YV12A: diff --git a/media/cast/test/utility/video_utility.cc b/media/cast/test/utility/video_utility.cc index 3de60f4..a11de5f 100644 --- a/media/cast/test/utility/video_utility.cc +++ b/media/cast/test/utility/video_utility.cc @@ -77,7 +77,6 @@ void PopulateVideoFrame(VideoFrame* frame, int start_value) { } const int half_height = (height + 1) / 2; -#if defined(OS_MACOSX) if (frame->format() == PIXEL_FORMAT_NV12) { const int stride_uv = frame->stride(VideoFrame::kUVPlane); uint8* uv_plane = frame->data(VideoFrame::kUVPlane); @@ -92,9 +91,7 @@ void PopulateVideoFrame(VideoFrame* frame, int start_value) { uv_plane += 2; } } - } else -#endif - { + } else { DCHECK(frame->format() == PIXEL_FORMAT_I420 || frame->format() == PIXEL_FORMAT_YV12); const int stride_u = frame->stride(VideoFrame::kUPlane); diff --git a/media/mojo/services/media_type_converters.cc b/media/mojo/services/media_type_converters.cc index c071351..add6f3e 100644 --- a/media/mojo/services/media_type_converters.cc +++ b/media/mojo/services/media_type_converters.cc @@ -137,9 +137,7 @@ ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_I420, VIDEO_FORMAT_I420); ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_YV16, VIDEO_FORMAT_YV16); ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_YV12A, VIDEO_FORMAT_YV12A); ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_YV24, VIDEO_FORMAT_YV24); -#if defined(OS_MACOSX) ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_NV12, VIDEO_FORMAT_NV12); -#endif ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_ARGB, VIDEO_FORMAT_ARGB); ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_XRGB, VIDEO_FORMAT_XRGB); ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_MAX, VIDEO_FORMAT_FORMAT_MAX); diff --git a/media/video/gpu_memory_buffer_video_frame_pool.cc b/media/video/gpu_memory_buffer_video_frame_pool.cc index 14679ed..2d6e57d 100644 --- a/media/video/gpu_memory_buffer_video_frame_pool.cc +++ b/media/video/gpu_memory_buffer_video_frame_pool.cc @@ -341,9 +341,7 @@ GpuMemoryBufferVideoFramePool::MaybeCreateHardwareFrame( case PIXEL_FORMAT_YV12A: case PIXEL_FORMAT_YV16: case PIXEL_FORMAT_YV24: -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) case PIXEL_FORMAT_NV12: -#endif case PIXEL_FORMAT_ARGB: case PIXEL_FORMAT_XRGB: case PIXEL_FORMAT_UNKNOWN: |