zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify JavaToStdString to allow ISO-8859-1 encoded strings.

Browse Source 
Current implementation of JavaToStdString applies additional encoding that modifies ISO-8859-1 encoded strings (e.g. byte array). This CL is to fix this.

A planned use of this is to pass a protobuf serialized string as a MediaConstraint to WebRTC to configure audio network adaptor.

BUG=webrtc:6815

Review-Url: https://codereview.webrtc.org/2549783002
Cr-Commit-Position: refs/heads/master@{#15509}
This commit is contained in:
minyue
2016-12-09 06:13:39 -08:00
committed by Commit bot
parent 5a388368a2
commit 50254636d4
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
webrtc/sdk/android/src/jni/jni_helpers.cc
View File

@ -15,6 +15,7 @@
#include <sys/prctl.h>
#include <sys/syscall.h>
#include <unistd.h>
#include <vector>
namespace webrtc_jni {
@ -236,15 +237,27 @@ jstring JavaStringFromStdString(JNIEnv* jni, const std::string& native) {
return jstr;
}
// Given a (UTF-16) jstring return a new UTF-8 native string.
// Given a jstring, reinterprets it to a new native string.
std::string JavaToStdString(JNIEnv* jni, const jstring& j_string) {
const char* chars = jni->GetStringUTFChars(j_string, nullptr);
CHECK_EXCEPTION(jni) << "Error during GetStringUTFChars";
std::string str(chars, jni->GetStringUTFLength(j_string));
CHECK_EXCEPTION(jni) << "Error during GetStringUTFLength";
jni->ReleaseStringUTFChars(j_string, chars);
CHECK_EXCEPTION(jni) << "Error during ReleaseStringUTFChars";
return str;
// Invoke String.getBytes(String charsetName) method to convert |j_string|
// to a byte array.
const jclass string_class = GetObjectClass(jni, j_string);
const jmethodID get_bytes =
GetMethodID(jni, string_class, "getBytes", "(Ljava/lang/String;)[B");
const jstring charset_name = jni->NewStringUTF("ISO-8859-1");
CHECK_EXCEPTION(jni) << "error during NewStringUTF";
const jbyteArray j_byte_array =
(jbyteArray)jni->CallObjectMethod(j_string, get_bytes, charset_name);
CHECK_EXCEPTION(jni) << "error during CallObjectMethod";
const size_t len = jni->GetArrayLength(j_byte_array);
CHECK_EXCEPTION(jni) << "error during GetArrayLength";
std::vector<char> buf(len);
jni->GetByteArrayRegion(j_byte_array, 0, len,
reinterpret_cast<jbyte*>(&buf[0]));
CHECK_EXCEPTION(jni) << "error during GetByteArrayRegion";
return std::string(buf.begin(), buf.end());
}
// Return the (singleton) Java Enum object corresponding to |index|;