Revert hardware decoder changes causing ChromeOS HW test crash.

content/common/gpu/media/v4l2_video_device.h

 // 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.
 //
 // This file defines the V4L2Device interface which is used by the
 // V4L2DecodeAccelerator class to delegate/pass the device specific
 // handling of any of the functionalities.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_DEVICE_H_
 #define CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_DEVICE_H_
 
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace content {
 
 class V4L2Device {
  public:
   // Utility format conversion functions
   static media::VideoFrame::Format V4L2PixFmtToVideoFrameFormat(uint32 format);
   static uint32 VideoFrameFormatToV4L2PixFmt(media::VideoFrame::Format format);
   static uint32 VideoCodecProfileToV4L2PixFmt(media::VideoCodecProfile profile);
-  static uint32_t V4L2PixFmtToDrmFormat(uint32_t format);
   // Convert format requirements requested by a V4L2 device to gfx::Size.
   static gfx::Size CodedSizeFromV4L2Format(struct v4l2_format format);
 
   virtual ~V4L2Device();
 
   enum Type {
     kDecoder,
     kEncoder,
     kImageProcessor,
   };
@@ skipping 29 matching lines @@
                      unsigned int len,
                      int prot,
                      int flags,
                      unsigned int offset) = 0;
   virtual void Munmap(void* addr, unsigned int len) = 0;
 
   // Initializes the V4L2Device to operate as a device of |type|.
   // Returns true on success.
   virtual bool Initialize() = 0;
 
-  // Return true if the given V4L2 pixfmt can be used in CreateEGLImage()
-  // for the current platform.
-  virtual bool CanCreateEGLImageFrom(uint32_t v4l2_pixfmt) = 0;
-
   // Creates an EGLImageKHR since each V4L2Device may use a different method of
   // acquiring one and associating it to the given texture. The texture_id is
   // used to bind the texture to the returned EGLImageKHR. buffer_index can be
   // used to associate the returned EGLImageKHR by the underlying V4L2Device
   // implementation.
   virtual EGLImageKHR CreateEGLImage(EGLDisplay egl_display,
                                      EGLContext egl_context,
                                      GLuint texture_id,
                                      gfx::Size frame_buffer_size,
                                      unsigned int buffer_index,
-                                     uint32_t v4l2_pixfmt,
-                                     size_t num_v4l2_planes) = 0;
+                                     size_t planes_count) = 0;
 
   // Destroys the EGLImageKHR.
   virtual EGLBoolean DestroyEGLImage(EGLDisplay egl_display,
                                      EGLImageKHR egl_image) = 0;
 
   // Returns the supported texture target for the V4L2Device.
   virtual GLenum GetTextureTarget() = 0;
 
   // Returns the preferred V4L2 input format or 0 if don't care.
   virtual uint32 PreferredInputFormat() = 0;
+
+  // Returns the preferred V4L2 output format or 0 if don't care.
+  virtual uint32 PreferredOutputFormat() = 0;
 };
 
 }  //  namespace content
 
 #endif  //  CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_DEVICE_H_