| Index: media/base/android/sdk_media_codec_bridge.cc
|
| diff --git a/media/base/android/sdk_media_codec_bridge.cc b/media/base/android/sdk_media_codec_bridge.cc
|
| index 840f57724c06560fdfbe78e21d7b7eaa038ecf04..9d743faf475cb74db2d32b1d19b7454dbc0716c6 100644
|
| --- a/media/base/android/sdk_media_codec_bridge.cc
|
| +++ b/media/base/android/sdk_media_codec_bridge.cc
|
| @@ -97,12 +97,6 @@ SdkMediaCodecBridge::~SdkMediaCodecBridge() {
|
| Java_MediaCodecBridge_release(env, j_media_codec_.obj());
|
| }
|
|
|
| -MediaCodecStatus SdkMediaCodecBridge::Reset() {
|
| - JNIEnv* env = AttachCurrentThread();
|
| - return static_cast<MediaCodecStatus>(
|
| - Java_MediaCodecBridge_flush(env, j_media_codec_.obj()));
|
| -}
|
| -
|
| bool SdkMediaCodecBridge::Start() {
|
| JNIEnv* env = AttachCurrentThread();
|
| return Java_MediaCodecBridge_start(env, j_media_codec_.obj());
|
| @@ -113,6 +107,12 @@ void SdkMediaCodecBridge::Stop() {
|
| Java_MediaCodecBridge_stop(env, j_media_codec_.obj());
|
| }
|
|
|
| +MediaCodecStatus SdkMediaCodecBridge::Flush() {
|
| + JNIEnv* env = AttachCurrentThread();
|
| + return static_cast<MediaCodecStatus>(
|
| + Java_MediaCodecBridge_flush(env, j_media_codec_.obj()));
|
| +}
|
| +
|
| MediaCodecStatus SdkMediaCodecBridge::GetOutputSize(gfx::Size* size) {
|
| JNIEnv* env = AttachCurrentThread();
|
| ScopedJavaLocalRef<jobject> result =
|
|
|