Revert hardware decoder changes causing ChromeOS HW test crash.

content/common/gpu/media/v4l2_video_device.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <libdrm/drm_fourcc.h>
 #include <linux/videodev2.h>
 
 #include "base/numerics/safe_conversions.h"
 #include "content/common/gpu/media/generic_v4l2_video_device.h"
 #include "content/common/gpu/media/tegra_v4l2_video_device.h"
 
-// TODO(posciak): remove this once V4L2 headers are updated.
-#define V4L2_PIX_FMT_VP9 v4l2_fourcc('V', 'P', '9', '0')
-
 namespace content {
 
 V4L2Device::~V4L2Device() {}
 
 // static
 scoped_ptr<V4L2Device> V4L2Device::Create(Type type) {
   DVLOG(3) << __PRETTY_FUNCTION__;
 
   scoped_ptr<GenericV4L2Device> generic_device(new GenericV4L2Device(type));
   if (generic_device->Initialize())
@@ skipping 12 matching lines @@
     uint32 pix_fmt) {
   switch (pix_fmt) {
     case V4L2_PIX_FMT_NV12:
     case V4L2_PIX_FMT_NV12M:
       return media::VideoFrame::NV12;
 
     case V4L2_PIX_FMT_YUV420:
     case V4L2_PIX_FMT_YUV420M:
       return media::VideoFrame::I420;
 
-    case V4L2_PIX_FMT_RGB32:
-      return media::VideoFrame::ARGB;
-
     default:
       LOG(FATAL) << "Add more cases as needed";
       return media::VideoFrame::UNKNOWN;
   }
 }
 
 // static
 uint32 V4L2Device::VideoFrameFormatToV4L2PixFmt(
     media::VideoFrame::Format format) {
   switch (format) {
@@ skipping 11 matching lines @@
 
 // static
 uint32 V4L2Device::VideoCodecProfileToV4L2PixFmt(
     media::VideoCodecProfile profile) {
   if (profile >= media::H264PROFILE_MIN &&
       profile <= media::H264PROFILE_MAX) {
     return V4L2_PIX_FMT_H264;
   } else if (profile >= media::VP8PROFILE_MIN &&
              profile <= media::VP8PROFILE_MAX) {
     return V4L2_PIX_FMT_VP8;
-  } else if (profile >= media::VP9PROFILE_MIN &&
-             profile <= media::VP9PROFILE_MAX) {
-    return V4L2_PIX_FMT_VP9;
   } else {
     LOG(FATAL) << "Add more cases as needed";
     return 0;
   }
 }
 
 // static
-uint32_t V4L2Device::V4L2PixFmtToDrmFormat(uint32_t format) {
-  switch (format) {
-    case V4L2_PIX_FMT_NV12:
-    case V4L2_PIX_FMT_NV12M:
-      return DRM_FORMAT_NV12;
-
-    case V4L2_PIX_FMT_YUV420:
-    case V4L2_PIX_FMT_YUV420M:
-      return DRM_FORMAT_YUV420;
-
-    case V4L2_PIX_FMT_RGB32:
-      return DRM_FORMAT_ARGB8888;
-
-    default:
-      LOG(FATAL) << "Add more cases as needed";
-      return 0;
-  }
-}
-
-// static
 gfx::Size V4L2Device::CodedSizeFromV4L2Format(struct v4l2_format format) {
   gfx::Size coded_size;
   gfx::Size visible_size;
   media::VideoFrame::Format frame_format = media::VideoFrame::UNKNOWN;
   size_t bytesperline = 0;
   // Total bytes in the frame.
   size_t sizeimage = 0;
 
   if (V4L2_TYPE_IS_MULTIPLANAR(format.type)) {
     DCHECK_GT(format.fmt.pix_mp.num_planes, 0);
@@ skipping 61 matching lines @@
   // Sanity checks. Calculated coded size has to contain given visible size
   // and fulfill buffer byte size requirements.
   DCHECK(gfx::Rect(coded_size).Contains(gfx::Rect(visible_size)));
   DCHECK_LE(sizeimage,
             media::VideoFrame::AllocationSize(frame_format, coded_size));
 
   return coded_size;
 }
 
 }  //  namespace content