| Index: media/base/android/sdk_media_codec_bridge.h
|
| diff --git a/media/base/android/sdk_media_codec_bridge.h b/media/base/android/sdk_media_codec_bridge.h
|
| index 2c52ede9060d8fe8d91dfa6cc31280974ecfb788..a02e1b785971a988e0406450a570781cb89d8ad0 100644
|
| --- a/media/base/android/sdk_media_codec_bridge.h
|
| +++ b/media/base/android/sdk_media_codec_bridge.h
|
| @@ -68,14 +68,15 @@ class MEDIA_EXPORT SdkMediaCodecBridge : public MediaCodecBridge {
|
| size_t offset,
|
| const uint8_t** addr,
|
| size_t* capacity) override;
|
| + bool IsSoftwareCodec() override;
|
|
|
| static bool RegisterSdkMediaCodecBridge(JNIEnv* env);
|
|
|
| protected:
|
| SdkMediaCodecBridge(const std::string& mime,
|
| bool is_secure,
|
| - MediaCodecDirection direction);
|
| -
|
| + MediaCodecDirection direction,
|
| + bool require_software_codec);
|
|
|
| jobject media_codec() { return j_media_codec_.obj(); }
|
| MediaCodecDirection direction_;
|
| @@ -171,7 +172,8 @@ class MEDIA_EXPORT VideoCodecBridge : public SdkMediaCodecBridge {
|
| 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_codec = false); // Require software decoder?
|
|
|
| // Create, start, and return a VideoCodecBridge encoder or NULL on failure.
|
| static VideoCodecBridge* CreateEncoder(
|
| @@ -202,7 +204,8 @@ class MEDIA_EXPORT VideoCodecBridge : public SdkMediaCodecBridge {
|
| private:
|
| VideoCodecBridge(const std::string& mime,
|
| bool is_secure,
|
| - MediaCodecDirection direction);
|
| + MediaCodecDirection direction,
|
| + bool require_software_codec);
|
|
|
| int adaptive_playback_supported_for_testing_;
|
| };
|
|
|