Commit 4f0e6892 authored by Thomas Guillem's avatar Thomas Guillem

mediacodec: jni: add missing exception check

parent ff626098
...@@ -649,8 +649,15 @@ static int PutInput(mc_api *api, const void *p_buf, size_t i_size, ...@@ -649,8 +649,15 @@ static int PutInput(mc_api *api, const void *p_buf, size_t i_size,
j_mc_buf = (*env)->GetObjectArrayElement(env, p_sys->input_buffers, j_mc_buf = (*env)->GetObjectArrayElement(env, p_sys->input_buffers,
index); index);
else else
{
j_mc_buf = (*env)->CallObjectMethod(env, p_sys->codec, j_mc_buf = (*env)->CallObjectMethod(env, p_sys->codec,
jfields.get_input_buffer, index); jfields.get_input_buffer, index);
if (CHECK_EXCEPTION())
{
msg_Err(api->p_obj, "Exception in MediaCodec.getInputBuffer");
return VLC_EGENERIC;
}
}
j_mc_size = (*env)->GetDirectBufferCapacity(env, j_mc_buf); j_mc_size = (*env)->GetDirectBufferCapacity(env, j_mc_buf);
p_mc_buf = (*env)->GetDirectBufferAddress(env, j_mc_buf); p_mc_buf = (*env)->GetDirectBufferAddress(env, j_mc_buf);
if (j_mc_size < 0) if (j_mc_size < 0)
...@@ -716,9 +723,16 @@ static int GetOutput(mc_api *api, mc_api_out *p_out, mtime_t i_timeout) ...@@ -716,9 +723,16 @@ static int GetOutput(mc_api *api, mc_api_out *p_out, mtime_t i_timeout)
buf = (*env)->GetObjectArrayElement(env, p_sys->output_buffers, buf = (*env)->GetObjectArrayElement(env, p_sys->output_buffers,
i_index); i_index);
else else
{
buf = (*env)->CallObjectMethod(env, p_sys->codec, buf = (*env)->CallObjectMethod(env, p_sys->codec,
jfields.get_output_buffer, jfields.get_output_buffer,
i_index); i_index);
if (CHECK_EXCEPTION())
{
msg_Err(api->p_obj, "Exception in MediaCodec.getOutputBuffer");
return VLC_EGENERIC;
}
}
//jsize buf_size = (*env)->GetDirectBufferCapacity(env, buf); //jsize buf_size = (*env)->GetDirectBufferCapacity(env, buf);
ptr = (*env)->GetDirectBufferAddress(env, buf); ptr = (*env)->GetDirectBufferAddress(env, buf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment