[M52] Make AVDA fall back to software decoding if needed.

media/gpu/android_video_decode_accelerator.h

 // Copyright (c) 2013 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.
 
 #ifndef MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 #define MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 192 matching lines @@
     gfx::ScopedJavaSurface surface_;
 
     // The MediaCrypto object is used in the MediaCodec.configure() in case of
     // an encrypted stream.
     media::MediaDrmBridgeCdmContext::JavaObjectPtr media_crypto_;
 
     // Initial coded size.  The actual size might change at any time, so this
     // is only a hint.
     gfx::Size initial_expected_coded_size_;
 
+    // Should we allow MediaCodec to autodetect the codec type (true), or
+    // select a software decoder manually (false).  This is because fallback to
+    // software when autodetecting can sometimes hang mediaserver.
+    bool allow_autodetection_ = false;
+
+    // Should we notify AVDATimerManager when codec configuration completes?
+    bool notify_completion_ = false;
+
    protected:
     friend class base::RefCountedThreadSafe<CodecConfig>;
     virtual ~CodecConfig();
 
    private:
     DISALLOW_COPY_AND_ASSIGN(CodecConfig);
   };
 
   // Callback that is called when the SurfaceView becomes available, if it's
   // not during Initialize.  |success| is true if it is now available, false
@@ skipping 245 matching lines @@
 
   // WeakPtrFactory for posting tasks back to |this|.
   base::WeakPtrFactory<AndroidVideoDecodeAccelerator> weak_this_factory_;
 
   friend class AndroidVideoDecodeAcceleratorTest;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_