| Index: media/base/android/media_codec_bridge.h
|
| diff --git a/media/base/android/media_codec_bridge.h b/media/base/android/media_codec_bridge.h
|
| index 9f855beb6098cf80869c193f7ef049dce38e31e7..a27b5b51086538205289088f4e1d60fb8e638dd6 100644
|
| --- a/media/base/android/media_codec_bridge.h
|
| +++ b/media/base/android/media_codec_bridge.h
|
| @@ -121,7 +121,7 @@ class MEDIA_EXPORT MediaCodecBridge {
|
| static bool RegisterMediaCodecBridge(JNIEnv* env);
|
|
|
| protected:
|
| - explicit MediaCodecBridge(const std::string& mime);
|
| + MediaCodecBridge(const std::string& mime, bool is_secure);
|
|
|
| // Calls start() against the media codec instance. Used in StartXXX() after
|
| // configuring media codec.
|
| @@ -169,7 +169,7 @@ class MEDIA_EXPORT VideoCodecBridge : public MediaCodecBridge {
|
| public:
|
| // Returns an VideoCodecBridge instance if |codec| is supported, or a NULL
|
| // pointer otherwise.
|
| - static VideoCodecBridge* Create(const VideoCodec codec);
|
| + static VideoCodecBridge* Create(const VideoCodec codec, bool is_secure);
|
|
|
| // Start the video codec bridge.
|
| // TODO(qinmin): Pass codec specific data if available.
|
| @@ -177,7 +177,7 @@ class MEDIA_EXPORT VideoCodecBridge : public MediaCodecBridge {
|
| jobject media_crypto);
|
|
|
| private:
|
| - explicit VideoCodecBridge(const std::string& mime);
|
| + VideoCodecBridge(const std::string& mime, bool is_secure);
|
| };
|
|
|
| } // namespace media
|
|
|