Revert of Add accelerated video decoder interface, VP8 and H.264 implementations and hook up to V4L2SVDA

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"
 #if defined(ARCH_CPU_ARMEL)
 #include "content/common/gpu/media/tegra_v4l2_video_device.h"
 #endif
 
 // TODO(posciak): remove this once V4L2 headers are updated.
 #define V4L2_PIX_FMT_VP9 v4l2_fourcc('V', 'P', '9', '0')
-#define V4L2_PIX_FMT_H264_SLICE v4l2_fourcc('S', '2', '6', '4')
-#define V4L2_PIX_FMT_VP8_FRAME v4l2_fourcc('V', 'P', '8', 'F')
 
 namespace content {
 
-V4L2Device::~V4L2Device() {
+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())
+    return generic_device.Pass();
+
+#if defined(ARCH_CPU_ARMEL)
+  scoped_ptr<TegraV4L2Device> tegra_device(new TegraV4L2Device(type));
+  if (tegra_device->Initialize())
+    return tegra_device.Pass();
+#endif
+
+  LOG(ERROR) << "Failed to create V4L2Device";
+  return scoped_ptr<V4L2Device>();
 }
 
 // static
-scoped_refptr<V4L2Device> V4L2Device::Create(Type type) {
-  DVLOG(3) << __PRETTY_FUNCTION__;
-
-  scoped_refptr<GenericV4L2Device> generic_device(new GenericV4L2Device(type));
-  if (generic_device->Initialize())
-    return generic_device;
-
-#if defined(ARCH_CPU_ARMEL)
-  scoped_refptr<TegraV4L2Device> tegra_device(new TegraV4L2Device(type));
-  if (tegra_device->Initialize())
-    return tegra_device;
-#endif
-
-  LOG(ERROR) << "Failed to create V4L2Device";
-  return scoped_refptr<V4L2Device>();
-}
-
-// static
 media::VideoFrame::Format V4L2Device::V4L2PixFmtToVideoFrameFormat(
     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;
@@ skipping 18 matching lines @@
       return V4L2_PIX_FMT_YUV420M;
 
     default:
       LOG(FATAL) << "Add more cases as needed";
       return 0;
   }
 }
 
 // static
 uint32 V4L2Device::VideoCodecProfileToV4L2PixFmt(
-    media::VideoCodecProfile profile,
-    bool slice_based) {
+    media::VideoCodecProfile profile) {
   if (profile >= media::H264PROFILE_MIN &&
       profile <= media::H264PROFILE_MAX) {
-    if (slice_based)
-      return V4L2_PIX_FMT_H264_SLICE;
-    else
-      return V4L2_PIX_FMT_H264;
+    return V4L2_PIX_FMT_H264;
   } else if (profile >= media::VP8PROFILE_MIN &&
              profile <= media::VP8PROFILE_MAX) {
-    if (slice_based)
-      return V4L2_PIX_FMT_VP8_FRAME;
-    else
-      return V4L2_PIX_FMT_VP8;
+    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
@@ skipping 91 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