Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(619)

Unified Diff: media/base/android/sdk_media_codec_bridge.cc

Issue 2047003003: Rename MediaCodecBridge::Reset() to Flush() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a couple Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/sdk_media_codec_bridge.h ('k') | media/base/android/sdk_media_codec_bridge_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 =
« no previous file with comments | « media/base/android/sdk_media_codec_bridge.h ('k') | media/base/android/sdk_media_codec_bridge_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698