Make AVDA fall back to software decoding if needed.

media/base/android/sdk_media_codec_bridge.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_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_
 
 #include <jni.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 56 matching lines @@
   MediaCodecStatus GetOutputBufferAddress(int index,
                                           size_t offset,
                                           const uint8_t** addr,
                                           size_t* capacity) override;
 
   static bool RegisterSdkMediaCodecBridge(JNIEnv* env);
 
  protected:
   SdkMediaCodecBridge(const std::string& mime,
                       bool is_secure,
-                      MediaCodecDirection direction);
-
+                      MediaCodecDirection direction,
+                      bool require_software);
 
   jobject media_codec() { return j_media_codec_.obj(); }
   MediaCodecDirection direction_;
 
  private:
   // Java MediaCodec instance.
   base::android::ScopedJavaGlobalRef<jobject> j_media_codec_;
 
   DISALLOW_COPY_AND_ASSIGN(SdkMediaCodecBridge);
 };
@@ skipping 75 matching lines @@
                                    MediaCodecDirection direction);
 
   // Create, start, and return a VideoCodecBridge decoder or NULL on failure.
   static VideoCodecBridge* CreateDecoder(
       const VideoCodec& codec,  // e.g. media::kCodecVP8
       bool is_secure,           // Will be used with encrypted content.
       const gfx::Size& size,    // Output frame size.
       jobject surface,          // Output surface, optional.
       jobject media_crypto,     // MediaCrypto object, optional.
       bool allow_adaptive_playback =
-          true);  // Should adaptive playback be allowed if supported.
+          true,  // Should adaptive playback be allowed if supported.
+      bool require_software = false);  // Require software decoder?
 
   // Create, start, and return a VideoCodecBridge encoder or NULL on failure.
   static VideoCodecBridge* CreateEncoder(
       const VideoCodec& codec,  // e.g. media::kCodecVP8
       const gfx::Size& size,    // input frame size
       int bit_rate,             // bits/second
       int frame_rate,           // frames/second
       int i_frame_interval,     // count
       int color_format);        // MediaCodecInfo.CodecCapabilities.
 
@@ skipping 10 matching lines @@
   // will be false. If |adaptive_playback_supported| is larger than 0, the
   // return value will be true.
   void set_adaptive_playback_supported_for_testing(
       int adaptive_playback_supported) {
     adaptive_playback_supported_for_testing_ = adaptive_playback_supported;
   }
 
  private:
   VideoCodecBridge(const std::string& mime,
                    bool is_secure,
-                   MediaCodecDirection direction);
+                   MediaCodecDirection direction,
+                   bool require_software);
 
   int adaptive_playback_supported_for_testing_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_