Revert hotfix for EVDA tearing.

content/common/gpu/media/exynos_video_decode_accelerator.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.

[Ami GONE FROM CHROMIUM, 2013/06/13 20:56:47]

lolwat?

 // 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 VideoDecoderAccelerator
 // that utilizes the hardware video decoder present on the Exynos SoC.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_EXYNOS_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_EXYNOS_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <list>
@@ skipping 72 matching lines @@
 
  private:
   // These are rather subjectively tuned.
   enum {
     kMfcInputBufferCount = 8,
     kMfcInputBufferMaxSize = 512 * 1024,
     kGscInputBufferCount = 4,
     // Number of output buffers to use for each VDA stage above what's required
     // by the decoder (e.g. DPB size, in H264).
     kDpbOutputBufferExtraCount = 3,
-    // We're continuing to have issues with synchronization between Mali 3D and
-    // Exynos video decode, so we buffer this many extra GSC output buffers in
-    // the GSC free output buffers queue, to add a safety margin.
-    // Must be lesser than or equal to kDpbOutputBufferExtraCount.
-    // TODO(sheu): remove this hack (http://crbug.com/225563).
-    kGscOutputBufferExtraForSyncCount = 2,
   };
 
   // Internal state of the decoder.
   enum State {
     kUninitialized,      // Initialize() not yet called.
     kInitialized,        // Initialize() returned true; ready to start decoding.
     kDecoding,           // DecodeBufferInitial() successful; decoding frames.
     kResetting,          // Presently resetting.
     kAfterReset,         // After Reset(), ready to start decoding again.
     kError,              // Error in kDecoding state.
@@ skipping 317 matching lines @@
 
   // The codec we'll be decoding for.
   media::VideoCodecProfile video_profile_;
 
   DISALLOW_COPY_AND_ASSIGN(ExynosVideoDecodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_EXYNOS_VIDEO_DECODE_ACCELERATOR_H_