Revert hardware decoder changes causing ChromeOS HW test crash.

content/common/gpu/media/v4l2_video_decode_accelerator.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 contains an implementation of VideoDecodeAccelerator
 // that utilizes hardware video decoders, which expose Video4Linux 2 API
 // (http://linuxtv.org/downloads/v4l-dvb-apis/).
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_DECODE_ACCELERATOR_H_
@@ skipping 257 matching lines @@
   //
   // Other utility functions.  Called on decoder_thread_, unless
   // decoder_thread_ is not yet started, in which case the child thread can call
   // these (e.g. in Initialize() or Destroy()).
   //
 
   // Create the buffers we need.
   bool CreateInputBuffers();
   bool CreateOutputBuffers();
 
-  // Set input and output formats before starting decode.
-  bool SetupFormats();
-
   //
   // Methods run on child thread.
   //
 
   // Destroy buffers.
   void DestroyInputBuffers();
   // In contrast to DestroyInputBuffers, which is called only from destructor,
   // we call DestroyOutputBuffers also during playback, on resolution change.
   // Even if anything fails along the way, we still want to go on and clean
   // up as much as possible, so return false if this happens, so that the
@@ skipping 103 matching lines @@
   bool output_streamon_;
   // Output buffers enqueued to device.
   int output_buffer_queued_count_;
   // Output buffers ready to use, as a FIFO since we want oldest-first to hide
   // synchronization latency with GL.
   std::queue<int> free_output_buffers_;
   // Mapping of int index to output buffer record.
   std::vector<OutputRecord> output_buffer_map_;
   // Required size of DPB for decoding.
   int output_dpb_size_;
-
-  // Number of planes (i.e. separate memory buffers) for output.
+  // Stores the number of planes (i.e. separate memory buffers) for output.
   size_t output_planes_count_;
 
   // Pictures that are ready but not sent to PictureReady yet.
   std::queue<PictureRecord> pending_picture_ready_;
 
   // The number of pictures that are sent to PictureReady and will be cleared.
   int picture_clearing_count_;
 
   // Used by the decoder thread to wait for AssignPictureBuffers to arrive
   // to avoid races with potential Reset requests.
@@ skipping 15 matching lines @@
 
   // Make our context current before running any EGL entry points.
   base::Callback<bool(void)> make_context_current_;
 
   // EGL state
   EGLDisplay egl_display_;
   EGLContext egl_context_;
 
   // The codec we'll be decoding for.
   media::VideoCodecProfile video_profile_;
-  // Chosen output format.
-  uint32_t output_format_fourcc_;
 
   // The WeakPtrFactory for |weak_this_|.
   base::WeakPtrFactory<V4L2VideoDecodeAccelerator> weak_this_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(V4L2VideoDecodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_DECODE_ACCELERATOR_H_