Commit e46874e8 authored by Miguel Casas's avatar Miguel Casas Committed by Commit Bot

VideoPixelFormat: remove unused PIXEL_FORMAT_I422

This CL removes the superfluous PIXEL_FORMAT_I422, synonym of the
older PIXEL_FORMAT_YV16.

This format was landed in crrev.com/2571163002 with a comment that
"Apart from how the buffer is allocated the format is basically
idential to I422 (a.k.a YU16).", but I can't see any difference
from the code, i.e. both PIXEL_FORMAT_YV16 and PIXEL_FORMAT_I422
are treated the same everywhere.

Note that usually we should not roll back VideoPixelFormat's
PIXEL_FORMAT_MAX but PIXEL_FORMAT_I422 was never added to enums.xml,
so UMA knows nothing about it [1], and we can just pretend it was
never there and was never logged [2] (it'd be logged as some hash
name)

[1] https://cs.chromium.org/chromium/src/tools/metrics/histograms/enums.xml?type=cs&q=histograms+enums.xml+y16&sq=package:chromium&l=43271
[2] https://uma.googleplex.com/timeline_v2?sid=deaff528e0268c7d0fdaa405130a075f

TBR=reveman@chromium.org for the autochange in video_resource_updater.cc

Bug: 795424
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I9e5d52d8013bc4f6d237c8274ceb63327d78fa30
Reviewed-on: https://chromium-review.googlesource.com/830769
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524549}
parent d438ad2d
...@@ -99,7 +99,6 @@ VideoFrameExternalResources::ResourceType ExternalResourceTypeForHardwarePlanes( ...@@ -99,7 +99,6 @@ VideoFrameExternalResources::ResourceType ExternalResourceTypeForHardwarePlanes(
case media::PIXEL_FORMAT_YUV444P12: case media::PIXEL_FORMAT_YUV444P12:
case media::PIXEL_FORMAT_Y8: case media::PIXEL_FORMAT_Y8:
case media::PIXEL_FORMAT_Y16: case media::PIXEL_FORMAT_Y16:
case media::PIXEL_FORMAT_I422:
case media::PIXEL_FORMAT_UNKNOWN: case media::PIXEL_FORMAT_UNKNOWN:
break; break;
} }
......
...@@ -133,7 +133,6 @@ bool RequiresEvenSizeAllocation(VideoPixelFormat format) { ...@@ -133,7 +133,6 @@ bool RequiresEvenSizeAllocation(VideoPixelFormat format) {
case PIXEL_FORMAT_YUV444P12: case PIXEL_FORMAT_YUV444P12:
case PIXEL_FORMAT_YV12A: case PIXEL_FORMAT_YV12A:
case PIXEL_FORMAT_UYVY: case PIXEL_FORMAT_UYVY:
case PIXEL_FORMAT_I422:
return true; return true;
case PIXEL_FORMAT_UNKNOWN: case PIXEL_FORMAT_UNKNOWN:
break; break;
...@@ -168,7 +167,7 @@ bool VideoFrame::IsValidConfig(VideoPixelFormat format, ...@@ -168,7 +167,7 @@ bool VideoFrame::IsValidConfig(VideoPixelFormat format,
return true; return true;
// Make sure new formats are properly accounted for in the method. // Make sure new formats are properly accounted for in the method.
static_assert(PIXEL_FORMAT_MAX == 27, static_assert(PIXEL_FORMAT_MAX == 26,
"Added pixel format, please review IsValidConfig()"); "Added pixel format, please review IsValidConfig()");
if (format == PIXEL_FORMAT_UNKNOWN) { if (format == PIXEL_FORMAT_UNKNOWN) {
...@@ -538,7 +537,6 @@ size_t VideoFrame::NumPlanes(VideoPixelFormat format) { ...@@ -538,7 +537,6 @@ size_t VideoFrame::NumPlanes(VideoPixelFormat format) {
case PIXEL_FORMAT_YUV420P12: case PIXEL_FORMAT_YUV420P12:
case PIXEL_FORMAT_YUV422P12: case PIXEL_FORMAT_YUV422P12:
case PIXEL_FORMAT_YUV444P12: case PIXEL_FORMAT_YUV444P12:
case PIXEL_FORMAT_I422:
return 3; return 3;
case PIXEL_FORMAT_YV12A: case PIXEL_FORMAT_YV12A:
return 4; return 4;
...@@ -852,7 +850,6 @@ int VideoFrame::BitsPerChannel(VideoPixelFormat format) { ...@@ -852,7 +850,6 @@ int VideoFrame::BitsPerChannel(VideoPixelFormat format) {
case media::PIXEL_FORMAT_MJPEG: case media::PIXEL_FORMAT_MJPEG:
case media::PIXEL_FORMAT_MT21: case media::PIXEL_FORMAT_MT21:
case media::PIXEL_FORMAT_Y8: case media::PIXEL_FORMAT_Y8:
case media::PIXEL_FORMAT_I422:
bits_per_channel = 8; bits_per_channel = 8;
break; break;
case media::PIXEL_FORMAT_YUV420P9: case media::PIXEL_FORMAT_YUV420P9:
...@@ -1109,7 +1106,6 @@ gfx::Size VideoFrame::SampleSize(VideoPixelFormat format, size_t plane) { ...@@ -1109,7 +1106,6 @@ gfx::Size VideoFrame::SampleSize(VideoPixelFormat format, size_t plane) {
return gfx::Size(1, 1); return gfx::Size(1, 1);
case PIXEL_FORMAT_YV16: case PIXEL_FORMAT_YV16:
case PIXEL_FORMAT_I422:
case PIXEL_FORMAT_YUV422P9: case PIXEL_FORMAT_YUV422P9:
case PIXEL_FORMAT_YUV422P10: case PIXEL_FORMAT_YUV422P10:
case PIXEL_FORMAT_YUV422P12: case PIXEL_FORMAT_YUV422P12:
...@@ -1178,7 +1174,6 @@ int VideoFrame::BytesPerElement(VideoPixelFormat format, size_t plane) { ...@@ -1178,7 +1174,6 @@ int VideoFrame::BytesPerElement(VideoPixelFormat format, size_t plane) {
case PIXEL_FORMAT_YV12A: case PIXEL_FORMAT_YV12A:
case PIXEL_FORMAT_YV24: case PIXEL_FORMAT_YV24:
case PIXEL_FORMAT_Y8: case PIXEL_FORMAT_Y8:
case PIXEL_FORMAT_I422:
return 1; return 1;
case PIXEL_FORMAT_MJPEG: case PIXEL_FORMAT_MJPEG:
return 0; return 0;
......
...@@ -464,7 +464,6 @@ TEST(VideoFrame, AllocationSize_OddSize) { ...@@ -464,7 +464,6 @@ TEST(VideoFrame, AllocationSize_OddSize) {
case PIXEL_FORMAT_UYVY: case PIXEL_FORMAT_UYVY:
case PIXEL_FORMAT_YUY2: case PIXEL_FORMAT_YUY2:
case PIXEL_FORMAT_YV16: case PIXEL_FORMAT_YV16:
case PIXEL_FORMAT_I422:
EXPECT_EQ(48u, allocation_size) << VideoPixelFormatToString(format); EXPECT_EQ(48u, allocation_size) << VideoPixelFormatToString(format);
break; break;
case PIXEL_FORMAT_YV12: case PIXEL_FORMAT_YV12:
......
...@@ -64,8 +64,6 @@ std::string VideoPixelFormatToString(VideoPixelFormat format) { ...@@ -64,8 +64,6 @@ std::string VideoPixelFormatToString(VideoPixelFormat format) {
return "PIXEL_FORMAT_Y8"; return "PIXEL_FORMAT_Y8";
case PIXEL_FORMAT_Y16: case PIXEL_FORMAT_Y16:
return "PIXEL_FORMAT_Y16"; return "PIXEL_FORMAT_Y16";
case PIXEL_FORMAT_I422:
return "PIXEL_FORMAT_I422";
} }
NOTREACHED() << "Invalid VideoPixelFormat provided: " << format; NOTREACHED() << "Invalid VideoPixelFormat provided: " << format;
return ""; return "";
...@@ -90,7 +88,6 @@ bool IsYuvPlanar(VideoPixelFormat format) { ...@@ -90,7 +88,6 @@ bool IsYuvPlanar(VideoPixelFormat format) {
case PIXEL_FORMAT_YUV420P12: case PIXEL_FORMAT_YUV420P12:
case PIXEL_FORMAT_YUV422P12: case PIXEL_FORMAT_YUV422P12:
case PIXEL_FORMAT_YUV444P12: case PIXEL_FORMAT_YUV444P12:
case PIXEL_FORMAT_I422:
return true; return true;
case PIXEL_FORMAT_UNKNOWN: case PIXEL_FORMAT_UNKNOWN:
...@@ -134,7 +131,6 @@ bool IsOpaque(VideoPixelFormat format) { ...@@ -134,7 +131,6 @@ bool IsOpaque(VideoPixelFormat format) {
case PIXEL_FORMAT_YUV444P12: case PIXEL_FORMAT_YUV444P12:
case PIXEL_FORMAT_Y8: case PIXEL_FORMAT_Y8:
case PIXEL_FORMAT_Y16: case PIXEL_FORMAT_Y16:
case PIXEL_FORMAT_I422:
return true; return true;
case PIXEL_FORMAT_YV12A: case PIXEL_FORMAT_YV12A:
case PIXEL_FORMAT_ARGB: case PIXEL_FORMAT_ARGB:
......
...@@ -66,12 +66,9 @@ enum VideoPixelFormat { ...@@ -66,12 +66,9 @@ enum VideoPixelFormat {
PIXEL_FORMAT_Y8 = 25, // single 8bpp plane. PIXEL_FORMAT_Y8 = 25, // single 8bpp plane.
PIXEL_FORMAT_Y16 = 26, // single 16bpp plane. PIXEL_FORMAT_Y16 = 26, // single 16bpp plane.
PIXEL_FORMAT_I422 =
27, // 16bpp YUV planar 1x1 Y, 2x1 UV samples, a.k.a. YU16.
// Please update UMA histogram enumeration when adding new formats here. // Please update UMA histogram enumeration when adding new formats here.
PIXEL_FORMAT_MAX = PIXEL_FORMAT_MAX =
PIXEL_FORMAT_I422, // Must always be equal to largest entry logged. PIXEL_FORMAT_Y16, // Must always be equal to largest entry logged.
}; };
// Color space or color range used for the pixels. // Color space or color range used for the pixels.
......
...@@ -52,7 +52,7 @@ static VideoPixelFormat AomImgFmtToVideoPixelFormat(const aom_image_t* img) { ...@@ -52,7 +52,7 @@ static VideoPixelFormat AomImgFmtToVideoPixelFormat(const aom_image_t* img) {
case AOM_IMG_FMT_I420: case AOM_IMG_FMT_I420:
return PIXEL_FORMAT_I420; return PIXEL_FORMAT_I420;
case AOM_IMG_FMT_I422: case AOM_IMG_FMT_I422:
return PIXEL_FORMAT_I422; return PIXEL_FORMAT_YV16;
case AOM_IMG_FMT_I444: case AOM_IMG_FMT_I444:
return PIXEL_FORMAT_YV24; return PIXEL_FORMAT_YV24;
......
...@@ -57,7 +57,7 @@ VideoPixelFormat V4L2Device::V4L2PixFmtToVideoPixelFormat(uint32_t pix_fmt) { ...@@ -57,7 +57,7 @@ VideoPixelFormat V4L2Device::V4L2PixFmtToVideoPixelFormat(uint32_t pix_fmt) {
return PIXEL_FORMAT_YV12; return PIXEL_FORMAT_YV12;
case V4L2_PIX_FMT_YUV422M: case V4L2_PIX_FMT_YUV422M:
return PIXEL_FORMAT_I422; return PIXEL_FORMAT_YV16;
case V4L2_PIX_FMT_RGB32: case V4L2_PIX_FMT_RGB32:
return PIXEL_FORMAT_ARGB; return PIXEL_FORMAT_ARGB;
......
...@@ -351,7 +351,6 @@ base::Optional<VideoPixelFormat> ToMediaVideoPixelFormat( ...@@ -351,7 +351,6 @@ base::Optional<VideoPixelFormat> ToMediaVideoPixelFormat(
CASE_RETURN_OTHER(PIXEL_FORMAT_YUV444P12); CASE_RETURN_OTHER(PIXEL_FORMAT_YUV444P12);
CASE_RETURN_OTHER(PIXEL_FORMAT_Y8); CASE_RETURN_OTHER(PIXEL_FORMAT_Y8);
CASE_RETURN_OTHER(PIXEL_FORMAT_Y16); CASE_RETURN_OTHER(PIXEL_FORMAT_Y16);
CASE_RETURN_OTHER(PIXEL_FORMAT_I422);
} }
return base::nullopt; // Not a 'default' to ensure compile-time checks. return base::nullopt; // Not a 'default' to ensure compile-time checks.
} }
...@@ -388,7 +387,6 @@ base::Optional<pb::VideoDecoderConfig::Format> ToProtoVideoDecoderConfigFormat( ...@@ -388,7 +387,6 @@ base::Optional<pb::VideoDecoderConfig::Format> ToProtoVideoDecoderConfigFormat(
CASE_RETURN_OTHER(PIXEL_FORMAT_YUV444P12); CASE_RETURN_OTHER(PIXEL_FORMAT_YUV444P12);
CASE_RETURN_OTHER(PIXEL_FORMAT_Y8); CASE_RETURN_OTHER(PIXEL_FORMAT_Y8);
CASE_RETURN_OTHER(PIXEL_FORMAT_Y16); CASE_RETURN_OTHER(PIXEL_FORMAT_Y16);
CASE_RETURN_OTHER(PIXEL_FORMAT_I422);
} }
return base::nullopt; // Not a 'default' to ensure compile-time checks. return base::nullopt; // Not a 'default' to ensure compile-time checks.
} }
......
...@@ -216,7 +216,6 @@ message VideoDecoderConfig { ...@@ -216,7 +216,6 @@ message VideoDecoderConfig {
PIXEL_FORMAT_YUV444P12 = 24; PIXEL_FORMAT_YUV444P12 = 24;
PIXEL_FORMAT_Y8 = 25; PIXEL_FORMAT_Y8 = 25;
PIXEL_FORMAT_Y16 = 26; PIXEL_FORMAT_Y16 = 26;
PIXEL_FORMAT_I422 = 27;
}; };
// Proto version of media::ColorSpace. // Proto version of media::ColorSpace.
......
...@@ -734,7 +734,6 @@ void PaintCanvasVideoRenderer::ConvertVideoFrameToRGBPixels( ...@@ -734,7 +734,6 @@ void PaintCanvasVideoRenderer::ConvertVideoFrameToRGBPixels(
} }
break; break;
case PIXEL_FORMAT_YV16: case PIXEL_FORMAT_YV16:
case PIXEL_FORMAT_I422:
LIBYUV_I422_TO_ARGB(video_frame->visible_data(VideoFrame::kYPlane), LIBYUV_I422_TO_ARGB(video_frame->visible_data(VideoFrame::kYPlane),
video_frame->stride(VideoFrame::kYPlane), video_frame->stride(VideoFrame::kYPlane),
video_frame->visible_data(VideoFrame::kUPlane), video_frame->visible_data(VideoFrame::kUPlane),
......
...@@ -459,7 +459,6 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHardwareFrame( ...@@ -459,7 +459,6 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHardwareFrame(
case PIXEL_FORMAT_YUV444P12: case PIXEL_FORMAT_YUV444P12:
case PIXEL_FORMAT_Y8: case PIXEL_FORMAT_Y8:
case PIXEL_FORMAT_Y16: case PIXEL_FORMAT_Y16:
case PIXEL_FORMAT_I422:
case PIXEL_FORMAT_UNKNOWN: case PIXEL_FORMAT_UNKNOWN:
frame_ready_cb.Run(video_frame); frame_ready_cb.Run(video_frame);
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment