Make AVDA fall back to software decoding if needed.

media/gpu/android_video_decode_accelerator.h

Index: media/gpu/android_video_decode_accelerator.h
diff --git a/media/gpu/android_video_decode_accelerator.h b/media/gpu/android_video_decode_accelerator.h
index e5cc82049cbc2294d94636dbf7d93e93668234f1..69cd6d9d6ecefb97501506b78048cf513ed6cff6 100644
--- a/media/gpu/android_video_decode_accelerator.h
+++ b/media/gpu/android_video_decode_accelerator.h
@@ -203,6 +203,14 @@ class MEDIA_GPU_EXPORT AndroidVideoDecodeAccelerator
     // 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();