| Index: media/base/android/ndk_media_codec_bridge.cc
|
| diff --git a/media/base/android/ndk_media_codec_bridge.cc b/media/base/android/ndk_media_codec_bridge.cc
|
| index c39e0f9ca3e288f403602a9eb7b08c3668e18a0c..3385b31243a865d09f69df7014350ced5a15ce02 100644
|
| --- a/media/base/android/ndk_media_codec_bridge.cc
|
| +++ b/media/base/android/ndk_media_codec_bridge.cc
|
| @@ -54,11 +54,6 @@ NdkMediaCodecBridge::NdkMediaCodecBridge(const std::string& mime,
|
| media_codec_.reset(AMediaCodec_createEncoderByType(mime.c_str()));
|
| }
|
|
|
| -MediaCodecStatus NdkMediaCodecBridge::Reset() {
|
| - media_status_t status = AMediaCodec_flush(media_codec_.get());
|
| - return TranslateMediaCodecStatus(status);
|
| -}
|
| -
|
| bool NdkMediaCodecBridge::Start() {
|
| return AMEDIA_OK == AMediaCodec_start(media_codec_.get());
|
| }
|
| @@ -67,6 +62,11 @@ void NdkMediaCodecBridge::Stop() {
|
| AMediaCodec_stop(media_codec_.get());
|
| }
|
|
|
| +MediaCodecStatus NdkMediaCodecBridge::Flush() {
|
| + media_status_t status = AMediaCodec_flush(media_codec_.get());
|
| + return TranslateMediaCodecStatus(status);
|
| +}
|
| +
|
| MediaCodecStatus NdkMediaCodecBridge::GetOutputSize(gfx::Size* size) {
|
| AMediaFormat* format = AMediaCodec_getOutputFormat(media_codec_.get());
|
| int left, right, bottom, top;
|
|
|