X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fomxil%2Fandroid_mediacodec.c;h=21bd9a17aabc00e1f0b1409e3218c821eef11333;hb=9d997cdf5e68f11b70b08af53a8246bbd21c50ea;hp=2d0d346be121108d2691b3ef16fa27b999c7e82e;hpb=5967150642d875f12aa69ecc853e935fc593077a;p=vlc diff --git a/modules/codec/omxil/android_mediacodec.c b/modules/codec/omxil/android_mediacodec.c index 2d0d346be1..21bd9a17aa 100644 --- a/modules/codec/omxil/android_mediacodec.c +++ b/modules/codec/omxil/android_mediacodec.c @@ -141,7 +141,9 @@ struct decoder_sys_t jfieldID profile_levels_field, profile_field, level_field; jmethodID get_supported_types, get_name; jmethodID create_by_codec_name, configure, start, stop, flush, release; - jmethodID get_output_format, get_input_buffers, get_output_buffers; + jmethodID get_output_format; + jmethodID get_input_buffers, get_input_buffer; + jmethodID get_output_buffers, get_output_buffer; jmethodID dequeue_input_buffer, dequeue_output_buffer, queue_input_buffer; jmethodID release_output_buffer; jmethodID create_video_format, set_integer, set_bytebuffer, get_integer; @@ -168,8 +170,8 @@ struct decoder_sys_t /* Direct rendering members. */ bool direct_rendering; - int i_output_buffers; /**< number of MediaCodec output buffers */ - picture_t** inflight_picture; /**< stores the inflight picture for each output buffer or NULL */ + picture_t** pp_inflight_pictures; /**< stores the inflight picture for each output buffer or NULL */ + unsigned int i_inflight_pictures; timestamp_fifo_t *timestamp_fifo; }; @@ -202,50 +204,53 @@ struct member const char *class; int offset; int type; + bool critical; }; static const struct member members[] = { - { "toString", "()Ljava/lang/String;", "java/lang/Object", OFF(tostring), METHOD }, - - { "getCodecCount", "()I", "android/media/MediaCodecList", OFF(get_codec_count), STATIC_METHOD }, - { "getCodecInfoAt", "(I)Landroid/media/MediaCodecInfo;", "android/media/MediaCodecList", OFF(get_codec_info_at), STATIC_METHOD }, - - { "isEncoder", "()Z", "android/media/MediaCodecInfo", OFF(is_encoder), METHOD }, - { "getSupportedTypes", "()[Ljava/lang/String;", "android/media/MediaCodecInfo", OFF(get_supported_types), METHOD }, - { "getName", "()Ljava/lang/String;", "android/media/MediaCodecInfo", OFF(get_name), METHOD }, - { "getCapabilitiesForType", "(Ljava/lang/String;)Landroid/media/MediaCodecInfo$CodecCapabilities;", "android/media/MediaCodecInfo", OFF(get_capabilities_for_type), METHOD }, - - { "profileLevels", "[Landroid/media/MediaCodecInfo$CodecProfileLevel;", "android/media/MediaCodecInfo$CodecCapabilities", OFF(profile_levels_field), FIELD }, - { "profile", "I", "android/media/MediaCodecInfo$CodecProfileLevel", OFF(profile_field), FIELD }, - { "level", "I", "android/media/MediaCodecInfo$CodecProfileLevel", OFF(level_field), FIELD }, - - { "createByCodecName", "(Ljava/lang/String;)Landroid/media/MediaCodec;", "android/media/MediaCodec", OFF(create_by_codec_name), STATIC_METHOD }, - { "configure", "(Landroid/media/MediaFormat;Landroid/view/Surface;Landroid/media/MediaCrypto;I)V", "android/media/MediaCodec", OFF(configure), METHOD }, - { "start", "()V", "android/media/MediaCodec", OFF(start), METHOD }, - { "stop", "()V", "android/media/MediaCodec", OFF(stop), METHOD }, - { "flush", "()V", "android/media/MediaCodec", OFF(flush), METHOD }, - { "release", "()V", "android/media/MediaCodec", OFF(release), METHOD }, - { "getOutputFormat", "()Landroid/media/MediaFormat;", "android/media/MediaCodec", OFF(get_output_format), METHOD }, - { "getInputBuffers", "()[Ljava/nio/ByteBuffer;", "android/media/MediaCodec", OFF(get_input_buffers), METHOD }, - { "getOutputBuffers", "()[Ljava/nio/ByteBuffer;", "android/media/MediaCodec", OFF(get_output_buffers), METHOD }, - { "dequeueInputBuffer", "(J)I", "android/media/MediaCodec", OFF(dequeue_input_buffer), METHOD }, - { "dequeueOutputBuffer", "(Landroid/media/MediaCodec$BufferInfo;J)I", "android/media/MediaCodec", OFF(dequeue_output_buffer), METHOD }, - { "queueInputBuffer", "(IIIJI)V", "android/media/MediaCodec", OFF(queue_input_buffer), METHOD }, - { "releaseOutputBuffer", "(IZ)V", "android/media/MediaCodec", OFF(release_output_buffer), METHOD }, - - { "createVideoFormat", "(Ljava/lang/String;II)Landroid/media/MediaFormat;", "android/media/MediaFormat", OFF(create_video_format), STATIC_METHOD }, - { "setInteger", "(Ljava/lang/String;I)V", "android/media/MediaFormat", OFF(set_integer), METHOD }, - { "getInteger", "(Ljava/lang/String;)I", "android/media/MediaFormat", OFF(get_integer), METHOD }, - { "setByteBuffer", "(Ljava/lang/String;Ljava/nio/ByteBuffer;)V", "android/media/MediaFormat", OFF(set_bytebuffer), METHOD }, - - { "", "()V", "android/media/MediaCodec$BufferInfo", OFF(buffer_info_ctor), METHOD }, - { "size", "I", "android/media/MediaCodec$BufferInfo", OFF(size_field), FIELD }, - { "offset", "I", "android/media/MediaCodec$BufferInfo", OFF(offset_field), FIELD }, - { "presentationTimeUs", "J", "android/media/MediaCodec$BufferInfo", OFF(pts_field), FIELD }, - - { "allocateDirect", "(I)Ljava/nio/ByteBuffer;", "java/nio/ByteBuffer", OFF(allocate_direct), STATIC_METHOD }, - { "limit", "(I)Ljava/nio/Buffer;", "java/nio/ByteBuffer", OFF(limit), METHOD }, - - { NULL, NULL, NULL, 0, 0 }, + { "toString", "()Ljava/lang/String;", "java/lang/Object", OFF(tostring), METHOD, true }, + + { "getCodecCount", "()I", "android/media/MediaCodecList", OFF(get_codec_count), STATIC_METHOD, true }, + { "getCodecInfoAt", "(I)Landroid/media/MediaCodecInfo;", "android/media/MediaCodecList", OFF(get_codec_info_at), STATIC_METHOD, true }, + + { "isEncoder", "()Z", "android/media/MediaCodecInfo", OFF(is_encoder), METHOD, true }, + { "getSupportedTypes", "()[Ljava/lang/String;", "android/media/MediaCodecInfo", OFF(get_supported_types), METHOD, true }, + { "getName", "()Ljava/lang/String;", "android/media/MediaCodecInfo", OFF(get_name), METHOD, true }, + { "getCapabilitiesForType", "(Ljava/lang/String;)Landroid/media/MediaCodecInfo$CodecCapabilities;", "android/media/MediaCodecInfo", OFF(get_capabilities_for_type), METHOD, true }, + + { "profileLevels", "[Landroid/media/MediaCodecInfo$CodecProfileLevel;", "android/media/MediaCodecInfo$CodecCapabilities", OFF(profile_levels_field), FIELD, true }, + { "profile", "I", "android/media/MediaCodecInfo$CodecProfileLevel", OFF(profile_field), FIELD, true }, + { "level", "I", "android/media/MediaCodecInfo$CodecProfileLevel", OFF(level_field), FIELD, true }, + + { "createByCodecName", "(Ljava/lang/String;)Landroid/media/MediaCodec;", "android/media/MediaCodec", OFF(create_by_codec_name), STATIC_METHOD, true }, + { "configure", "(Landroid/media/MediaFormat;Landroid/view/Surface;Landroid/media/MediaCrypto;I)V", "android/media/MediaCodec", OFF(configure), METHOD, true }, + { "start", "()V", "android/media/MediaCodec", OFF(start), METHOD, true }, + { "stop", "()V", "android/media/MediaCodec", OFF(stop), METHOD, true }, + { "flush", "()V", "android/media/MediaCodec", OFF(flush), METHOD, true }, + { "release", "()V", "android/media/MediaCodec", OFF(release), METHOD, true }, + { "getOutputFormat", "()Landroid/media/MediaFormat;", "android/media/MediaCodec", OFF(get_output_format), METHOD, true }, + { "getInputBuffers", "()[Ljava/nio/ByteBuffer;", "android/media/MediaCodec", OFF(get_input_buffers), METHOD, false }, + { "getInputBuffer", "(I)Ljava/nio/ByteBuffer;", "android/media/MediaCodec", OFF(get_input_buffer), METHOD, false }, + { "getOutputBuffers", "()[Ljava/nio/ByteBuffer;", "android/media/MediaCodec", OFF(get_output_buffers), METHOD, false }, + { "getOutputBuffer", "(I)Ljava/nio/ByteBuffer;", "android/media/MediaCodec", OFF(get_output_buffer), METHOD, false }, + { "dequeueInputBuffer", "(J)I", "android/media/MediaCodec", OFF(dequeue_input_buffer), METHOD, true }, + { "dequeueOutputBuffer", "(Landroid/media/MediaCodec$BufferInfo;J)I", "android/media/MediaCodec", OFF(dequeue_output_buffer), METHOD, true }, + { "queueInputBuffer", "(IIIJI)V", "android/media/MediaCodec", OFF(queue_input_buffer), METHOD, true }, + { "releaseOutputBuffer", "(IZ)V", "android/media/MediaCodec", OFF(release_output_buffer), METHOD, true }, + + { "createVideoFormat", "(Ljava/lang/String;II)Landroid/media/MediaFormat;", "android/media/MediaFormat", OFF(create_video_format), STATIC_METHOD, true }, + { "setInteger", "(Ljava/lang/String;I)V", "android/media/MediaFormat", OFF(set_integer), METHOD, true }, + { "getInteger", "(Ljava/lang/String;)I", "android/media/MediaFormat", OFF(get_integer), METHOD, true }, + { "setByteBuffer", "(Ljava/lang/String;Ljava/nio/ByteBuffer;)V", "android/media/MediaFormat", OFF(set_bytebuffer), METHOD, true }, + + { "", "()V", "android/media/MediaCodec$BufferInfo", OFF(buffer_info_ctor), METHOD, true }, + { "size", "I", "android/media/MediaCodec$BufferInfo", OFF(size_field), FIELD, true }, + { "offset", "I", "android/media/MediaCodec$BufferInfo", OFF(offset_field), FIELD, true }, + { "presentationTimeUs", "J", "android/media/MediaCodec$BufferInfo", OFF(pts_field), FIELD, true }, + + { "allocateDirect", "(I)Ljava/nio/ByteBuffer;", "java/nio/ByteBuffer", OFF(allocate_direct), STATIC_METHOD, true }, + { "limit", "(I)Ljava/nio/Buffer;", "java/nio/ByteBuffer", OFF(limit), METHOD, true }, + + { NULL, NULL, NULL, 0, 0, false }, }; #define GET_INTEGER(obj, name) (*env)->CallIntMethod(env, obj, p_sys->get_integer, (*env)->NewStringUTF(env, name)) @@ -259,6 +264,7 @@ static void CloseDecoder(vlc_object_t *); static picture_t *DecodeVideo(decoder_t *, block_t **); static void InvalidateAllPictures(decoder_t *); +static int InsertInflightPicture(decoder_t *, picture_t *, unsigned int ); /***************************************************************************** * Module descriptor @@ -291,6 +297,37 @@ static int jstrcmp(JNIEnv* env, jobject str, const char* str2) return ret; } +static inline bool check_exception( JNIEnv *env ) +{ + if ((*env)->ExceptionOccurred(env)) { + (*env)->ExceptionClear(env); + return true; + } + else + return false; +} +#define CHECK_EXCEPTION() check_exception( env ) + +static bool codec_is_blacklisted( const char *p_name, int i_name_len ) +{ + static const char *blacklisted_codecs[] = { + /* software decoders */ + "OMX.google.", + /* crashes mediaserver */ + "OMX.MTK.VIDEO.DECODER.MPEG4", + NULL, + }; + + for( const char **pp_bl_codecs = blacklisted_codecs; *pp_bl_codecs != NULL; + pp_bl_codecs++ ) + { + if( !strncmp( p_name, *pp_bl_codecs, + __MIN( strlen(*pp_bl_codecs), i_name_len ) ) ) + return true; + } + return false; +} + /***************************************************************************** * OpenDecoder: Create the decoder instance *****************************************************************************/ @@ -339,9 +376,8 @@ static int OpenDecoder(vlc_object_t *p_this) *(jclass*)((uint8_t*)p_sys + classes[i].offset) = (*env)->FindClass(env, classes[i].name); - if ((*env)->ExceptionOccurred(env)) { + if (CHECK_EXCEPTION()) { msg_Warn(p_dec, "Unable to find class %s", classes[i].name); - (*env)->ExceptionClear(env); goto error; } } @@ -351,9 +387,8 @@ static int OpenDecoder(vlc_object_t *p_this) if (i == 0 || strcmp(members[i].class, members[i - 1].class)) last_class = (*env)->FindClass(env, members[i].class); - if ((*env)->ExceptionOccurred(env)) { + if (CHECK_EXCEPTION()) { msg_Warn(p_dec, "Unable to find class %s", members[i].class); - (*env)->ExceptionClear(env); goto error; } @@ -371,35 +406,48 @@ static int OpenDecoder(vlc_object_t *p_this) (*env)->GetFieldID(env, last_class, members[i].name, members[i].sig); break; } - if ((*env)->ExceptionOccurred(env)) { + if (CHECK_EXCEPTION()) { msg_Warn(p_dec, "Unable to find the member %s in %s", members[i].name, members[i].class); - (*env)->ExceptionClear(env); - goto error; + if (members[i].critical) + goto error; } } + /* getInputBuffers and getOutputBuffers are deprecated if API >= 21 + * use getInputBuffer and getOutputBuffer instead. */ + if (p_sys->get_input_buffer && p_sys->get_output_buffer) { + p_sys->get_output_buffers = + p_sys->get_input_buffers = NULL; + } else if (!p_sys->get_output_buffers && !p_sys->get_input_buffers) { + msg_Warn(p_dec, "Unable to find get Output/Input Buffer/Buffers"); + goto error; + } int num_codecs = (*env)->CallStaticIntMethod(env, p_sys->media_codec_list_class, p_sys->get_codec_count); jobject codec_name = NULL; for (int i = 0; i < num_codecs; i++) { - jobject info = (*env)->CallStaticObjectMethod(env, p_sys->media_codec_list_class, - p_sys->get_codec_info_at, i); - if ((*env)->CallBooleanMethod(env, info, p_sys->is_encoder)) { - (*env)->DeleteLocalRef(env, info); - continue; - } - - jobject codec_capabilities = (*env)->CallObjectMethod(env, info, p_sys->get_capabilities_for_type, - (*env)->NewStringUTF(env, mime)); + jobject codec_capabilities = NULL; jobject profile_levels = NULL; - int profile_levels_len = 0; - if ((*env)->ExceptionOccurred(env)) { + jobject info = NULL; + jobject name = NULL; + jobject types = NULL; + jsize name_len = 0; + int profile_levels_len = 0, num_types = 0; + const char *name_ptr = NULL; + bool found = false; + + info = (*env)->CallStaticObjectMethod(env, p_sys->media_codec_list_class, + p_sys->get_codec_info_at, i); + if ((*env)->CallBooleanMethod(env, info, p_sys->is_encoder)) + goto loopclean; + + codec_capabilities = (*env)->CallObjectMethod(env, info, p_sys->get_capabilities_for_type, + (*env)->NewStringUTF(env, mime)); + if (CHECK_EXCEPTION()) { msg_Warn(p_dec, "Exception occurred in MediaCodecInfo.getCapabilitiesForType"); - (*env)->ExceptionClear(env); - (*env)->DeleteLocalRef(env, info); - continue; + goto loopclean; } else if (codec_capabilities) { profile_levels = (*env)->GetObjectField(env, codec_capabilities, p_sys->profile_levels_field); if (profile_levels) @@ -407,15 +455,15 @@ static int OpenDecoder(vlc_object_t *p_this) } msg_Dbg(p_dec, "Number of profile levels: %d", profile_levels_len); - jobject types = (*env)->CallObjectMethod(env, info, p_sys->get_supported_types); - int num_types = (*env)->GetArrayLength(env, types); - jobject name = (*env)->CallObjectMethod(env, info, p_sys->get_name); - jsize name_len = (*env)->GetStringUTFLength(env, name); - const char *name_ptr = (*env)->GetStringUTFChars(env, name, NULL); - bool found = false; + types = (*env)->CallObjectMethod(env, info, p_sys->get_supported_types); + num_types = (*env)->GetArrayLength(env, types); + name = (*env)->CallObjectMethod(env, info, p_sys->get_name); + name_len = (*env)->GetStringUTFLength(env, name); + name_ptr = (*env)->GetStringUTFChars(env, name, NULL); + found = false; - if (!strncmp(name_ptr, "OMX.google.", __MIN(11, name_len))) - continue; + if (codec_is_blacklisted( name_ptr, name_len)) + goto loopclean; for (int j = 0; j < num_types && !found; j++) { jobject type = (*env)->GetObjectArrayElement(env, types, j); if (!jstrcmp(env, type, mime)) { @@ -423,11 +471,17 @@ static int OpenDecoder(vlc_object_t *p_this) now check if the capabilities of the codec is matching the video format. */ if (p_dec->fmt_in.i_codec == VLC_CODEC_H264 && fmt_profile) { + /* This decoder doesn't expose its profiles and is high + * profile capable */ + if (!strncmp(name_ptr, "OMX.LUMEVideoDecoder", __MIN(20, name_len))) + found = true; + for (int i = 0; i < profile_levels_len && !found; ++i) { jobject profile_level = (*env)->GetObjectArrayElement(env, profile_levels, i); int omx_profile = (*env)->GetIntField(env, profile_level, p_sys->profile_field); size_t codec_profile = convert_omx_to_profile_idc(omx_profile); + (*env)->DeleteLocalRef(env, profile_level); if (codec_profile != fmt_profile) continue; /* Some encoders set the level too high, thus we ignore it for the moment. @@ -445,12 +499,21 @@ static int OpenDecoder(vlc_object_t *p_this) p_sys->name = malloc(name_len + 1); memcpy(p_sys->name, name_ptr, name_len); p_sys->name[name_len] = '\0'; - (*env)->ReleaseStringUTFChars(env, name, name_ptr); codec_name = name; + } +loopclean: + if (name) + (*env)->ReleaseStringUTFChars(env, name, name_ptr); + if (profile_levels) + (*env)->DeleteLocalRef(env, profile_levels); + if (types) + (*env)->DeleteLocalRef(env, types); + if (codec_capabilities) + (*env)->DeleteLocalRef(env, codec_capabilities); + if (info) (*env)->DeleteLocalRef(env, info); + if (found) break; - } - (*env)->DeleteLocalRef(env, info); } if (!codec_name) { @@ -463,9 +526,8 @@ static int OpenDecoder(vlc_object_t *p_this) // but not in 4.1 devices. p_sys->codec = (*env)->CallStaticObjectMethod(env, p_sys->media_codec_class, p_sys->create_by_codec_name, codec_name); - if ((*env)->ExceptionOccurred(env)) { + if (CHECK_EXCEPTION()) { msg_Warn(p_dec, "Exception occurred in MediaCodec.createByCodecName."); - (*env)->ExceptionClear(env); goto error; } p_sys->allocated = true; @@ -505,6 +567,17 @@ static int OpenDecoder(vlc_object_t *p_this) direct rendering should be disabled since no surface will be attached to the JNI. */ p_sys->direct_rendering = jni_IsVideoPlayerActivityCreated() && var_InheritBool(p_dec, CFG_PREFIX "dr"); + + /* There is no way to rotate the video using direct rendering (and using a + * SurfaceView) before API 21 (Lollipop). Therefore, we deactivate direct + * rendering if video doesn't have a normal rotation and if + * get_input_buffer method is not present (This method exists since API + * 21). */ + if (p_sys->direct_rendering + && p_dec->fmt_in.video.orientation != ORIENT_NORMAL + && !p_sys->get_input_buffer) + p_sys->direct_rendering = false; + if (p_sys->direct_rendering) { if (p_dec->fmt_in.video.orientation != ORIENT_NORMAL) { int i_angle; @@ -531,9 +604,8 @@ static int OpenDecoder(vlc_object_t *p_this) if (surf) { // Configure MediaCodec with the Android surface. (*env)->CallVoidMethod(env, p_sys->codec, p_sys->configure, format, surf, NULL, 0); - if ((*env)->ExceptionOccurred(env)) { + if (CHECK_EXCEPTION()) { msg_Warn(p_dec, "Exception occurred in MediaCodec.configure with an output surface."); - (*env)->ExceptionClear(env); jni_UnlockAndroidSurface(); goto error; } @@ -546,31 +618,35 @@ static int OpenDecoder(vlc_object_t *p_this) } if (!p_sys->direct_rendering) { (*env)->CallVoidMethod(env, p_sys->codec, p_sys->configure, format, NULL, NULL, 0); - if ((*env)->ExceptionOccurred(env)) { + if (CHECK_EXCEPTION()) { msg_Warn(p_dec, "Exception occurred in MediaCodec.configure"); - (*env)->ExceptionClear(env); goto error; } } (*env)->CallVoidMethod(env, p_sys->codec, p_sys->start); - if ((*env)->ExceptionOccurred(env)) { + if (CHECK_EXCEPTION()) { msg_Warn(p_dec, "Exception occurred in MediaCodec.start"); - (*env)->ExceptionClear(env); goto error; } p_sys->started = true; - p_sys->input_buffers = (*env)->CallObjectMethod(env, p_sys->codec, p_sys->get_input_buffers); - p_sys->output_buffers = (*env)->CallObjectMethod(env, p_sys->codec, p_sys->get_output_buffers); + if (p_sys->get_input_buffers && p_sys->get_output_buffers) { + p_sys->input_buffers = (*env)->CallObjectMethod(env, p_sys->codec, p_sys->get_input_buffers); + if (CHECK_EXCEPTION()) { + msg_Err(p_dec, "Exception in MediaCodec.getInputBuffers (OpenDecoder)"); + goto error; + } + p_sys->output_buffers = (*env)->CallObjectMethod(env, p_sys->codec, p_sys->get_output_buffers); + if (CHECK_EXCEPTION()) { + msg_Err(p_dec, "Exception in MediaCodec.getOutputBuffers (OpenDecoder)"); + goto error; + } + p_sys->input_buffers = (*env)->NewGlobalRef(env, p_sys->input_buffers); + p_sys->output_buffers = (*env)->NewGlobalRef(env, p_sys->output_buffers); + } p_sys->buffer_info = (*env)->NewObject(env, p_sys->buffer_info_class, p_sys->buffer_info_ctor); - p_sys->input_buffers = (*env)->NewGlobalRef(env, p_sys->input_buffers); - p_sys->output_buffers = (*env)->NewGlobalRef(env, p_sys->output_buffers); p_sys->buffer_info = (*env)->NewGlobalRef(env, p_sys->buffer_info); - p_sys->i_output_buffers = (*env)->GetArrayLength(env, p_sys->output_buffers); - p_sys->inflight_picture = calloc(1, sizeof(picture_t*) * p_sys->i_output_buffers); - if (!p_sys->inflight_picture) - goto error; (*env)->DeleteLocalRef(env, format); jni_detach_thread(); @@ -610,18 +686,14 @@ static void CloseDecoder(vlc_object_t *p_this) if (p_sys->started) { (*env)->CallVoidMethod(env, p_sys->codec, p_sys->stop); - if ((*env)->ExceptionOccurred(env)) { + if (CHECK_EXCEPTION()) msg_Err(p_dec, "Exception in MediaCodec.stop"); - (*env)->ExceptionClear(env); - } } if (p_sys->allocated) { (*env)->CallVoidMethod(env, p_sys->codec, p_sys->release); - if ((*env)->ExceptionOccurred(env)) { + if (CHECK_EXCEPTION()) msg_Err(p_dec, "Exception in MediaCodec.release"); - (*env)->ExceptionClear(env); - } } (*env)->DeleteGlobalRef(env, p_sys->codec); } @@ -631,12 +703,29 @@ static void CloseDecoder(vlc_object_t *p_this) free(p_sys->name); ArchitectureSpecificCopyHooksDestroy(p_sys->pixel_format, &p_sys->architecture_specific_data); - free(p_sys->inflight_picture); + free(p_sys->pp_inflight_pictures); if (p_sys->timestamp_fifo) timestamp_FifoRelease(p_sys->timestamp_fifo); free(p_sys); } +/***************************************************************************** + * ReleaseOutputBuffer + *****************************************************************************/ +static int ReleaseOutputBuffer(decoder_t *p_dec, JNIEnv *env, int i_index, + bool b_render) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + + (*env)->CallVoidMethod(env, p_sys->codec, p_sys->release_output_buffer, + i_index, b_render); + if (CHECK_EXCEPTION()) { + msg_Err(p_dec, "Exception in MediaCodec.releaseOutputBuffer"); + return -1; + } + return 0; +} + /***************************************************************************** * vout callbacks *****************************************************************************/ @@ -644,7 +733,6 @@ static void UnlockPicture(picture_t* p_pic, bool b_render) { picture_sys_t *p_picsys = p_pic->p_sys; decoder_t *p_dec = p_picsys->priv.hw.p_dec; - decoder_sys_t *p_sys = p_dec->p_sys; if (!p_picsys->priv.hw.b_valid) return; @@ -658,17 +746,12 @@ static void UnlockPicture(picture_t* p_pic, bool b_render) } uint32_t i_index = p_picsys->priv.hw.i_index; - p_sys->inflight_picture[i_index] = NULL; + InsertInflightPicture(p_dec, NULL, i_index); /* Release the MediaCodec buffer. */ JNIEnv *env = NULL; jni_attach_thread(&env, THREAD_NAME); - (*env)->CallVoidMethod(env, p_sys->codec, p_sys->release_output_buffer, i_index, b_render); - if ((*env)->ExceptionOccurred(env)) { - msg_Err(p_dec, "Exception in MediaCodec.releaseOutputBuffer (DisplayBuffer)"); - (*env)->ExceptionClear(env); - } - + ReleaseOutputBuffer(p_dec, env, i_index, b_render); jni_detach_thread(); p_picsys->priv.hw.b_valid = false; @@ -680,39 +763,105 @@ static void InvalidateAllPictures(decoder_t *p_dec) decoder_sys_t *p_sys = p_dec->p_sys; vlc_mutex_lock(get_android_opaque_mutex()); - for (int i = 0; i < p_sys->i_output_buffers; ++i) { - picture_t *p_pic = p_sys->inflight_picture[i]; + + for (unsigned int i = 0; i < p_sys->i_inflight_pictures; ++i) { + picture_t *p_pic = p_sys->pp_inflight_pictures[i]; if (p_pic) { p_pic->p_sys->priv.hw.b_valid = false; - p_sys->inflight_picture[i] = NULL; + p_sys->pp_inflight_pictures[i] = NULL; } } vlc_mutex_unlock(get_android_opaque_mutex()); } -static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong timeout) +static int InsertInflightPicture(decoder_t *p_dec, picture_t *p_pic, + unsigned int i_index) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + + if (i_index >= p_sys->i_inflight_pictures) { + picture_t **pp_pics = realloc(p_sys->pp_inflight_pictures, + (i_index + 1) * sizeof (picture_t *)); + if (!pp_pics) + return -1; + if (i_index - p_sys->i_inflight_pictures > 0) + memset(&pp_pics[p_sys->i_inflight_pictures], 0, + (i_index - p_sys->i_inflight_pictures) * sizeof (picture_t *)); + p_sys->pp_inflight_pictures = pp_pics; + p_sys->i_inflight_pictures = i_index + 1; + } + p_sys->pp_inflight_pictures[i_index] = p_pic; + return 0; +} + +static int PutInput(decoder_t *p_dec, JNIEnv *env, block_t **pp_block, jlong timeout) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + block_t *p_block = *pp_block; + int index; + jobject buf; + jsize size; + uint8_t *bufptr; + struct H264ConvertState convert_state = { 0, 0 }; + + index = (*env)->CallIntMethod(env, p_sys->codec, + p_sys->dequeue_input_buffer, timeout); + if (CHECK_EXCEPTION()) { + msg_Err(p_dec, "Exception occurred in MediaCodec.dequeueInputBuffer"); + return -1; + } + if (index < 0) + return 0; + + if (p_sys->get_input_buffers) + buf = (*env)->GetObjectArrayElement(env, p_sys->input_buffers, index); + else + buf = (*env)->CallObjectMethod(env, p_sys->codec, p_sys->get_input_buffer, index); + size = (*env)->GetDirectBufferCapacity(env, buf); + bufptr = (*env)->GetDirectBufferAddress(env, buf); + if (size < 0) { + msg_Err(p_dec, "Java buffer has invalid size"); + return -1; + } + if ((size_t) size > p_block->i_buffer) + size = p_block->i_buffer; + memcpy(bufptr, p_block->p_buffer, size); + + convert_h264_to_annexb(bufptr, size, p_sys->nal_size, &convert_state); + + int64_t ts = p_block->i_pts; + if (!ts && p_block->i_dts) + ts = p_block->i_dts; + timestamp_FifoPut(p_sys->timestamp_fifo, p_block->i_pts ? VLC_TS_INVALID : p_block->i_dts); + (*env)->CallVoidMethod(env, p_sys->codec, p_sys->queue_input_buffer, index, 0, size, ts, 0); + (*env)->DeleteLocalRef(env, buf); + if (CHECK_EXCEPTION()) { + msg_Err(p_dec, "Exception in MediaCodec.queueInputBuffer"); + return -1; + } + block_Release(p_block); + *pp_block = NULL; + p_sys->decoded = true; + + return 0; +} + +static int GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong timeout) { decoder_sys_t *p_sys = p_dec->p_sys; while (1) { int index = (*env)->CallIntMethod(env, p_sys->codec, p_sys->dequeue_output_buffer, p_sys->buffer_info, timeout); - if ((*env)->ExceptionOccurred(env)) { + if (CHECK_EXCEPTION()) { msg_Err(p_dec, "Exception in MediaCodec.dequeueOutputBuffer (GetOutput)"); - (*env)->ExceptionClear(env); - p_sys->error_state = true; - return; + return -1; } if (index >= 0) { if (!p_sys->pixel_format) { msg_Warn(p_dec, "Buffers returned before output format is set, dropping frame"); - (*env)->CallVoidMethod(env, p_sys->codec, p_sys->release_output_buffer, index, false); - if ((*env)->ExceptionOccurred(env)) { - msg_Err(p_dec, "Exception in MediaCodec.releaseOutputBuffer"); - (*env)->ExceptionClear(env); - p_sys->error_state = true; - return; - } + if (ReleaseOutputBuffer(p_dec, env, index, false) != 0) + return -1; continue; } @@ -722,17 +871,11 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t picture_t *p_pic = *pp_pic; picture_sys_t *p_picsys = p_pic->p_sys; int i_prev_index = p_picsys->priv.hw.i_index; - (*env)->CallVoidMethod(env, p_sys->codec, p_sys->release_output_buffer, i_prev_index, false); - if ((*env)->ExceptionOccurred(env)) { - msg_Err(p_dec, "Exception in MediaCodec.releaseOutputBuffer " \ - "(GetOutput, overwriting previous picture)"); - (*env)->ExceptionClear(env); - p_sys->error_state = true; - return; - } + if (ReleaseOutputBuffer(p_dec, env, i_prev_index, false) != 0) + return -1; // No need to lock here since the previous picture was not sent. - p_sys->inflight_picture[i_prev_index] = NULL; + InsertInflightPicture(p_dec, NULL, i_prev_index); } if (*pp_pic) { @@ -754,9 +897,16 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t p_picsys->priv.hw.i_index = index; p_picsys->priv.hw.b_valid = true; - p_sys->inflight_picture[index] = p_pic; + vlc_mutex_lock(get_android_opaque_mutex()); + InsertInflightPicture(p_dec, p_pic, index); + vlc_mutex_unlock(get_android_opaque_mutex()); } else { - jobject buf = (*env)->GetObjectArrayElement(env, p_sys->output_buffers, index); + jobject buf; + if (p_sys->get_output_buffers) + buf = (*env)->GetObjectArrayElement(env, p_sys->output_buffers, index); + else + buf = (*env)->CallObjectMethod(env, p_sys->codec, + p_sys->get_output_buffer, index); //jsize buf_size = (*env)->GetDirectBufferCapacity(env, buf); uint8_t *ptr = (*env)->GetDirectBufferAddress(env, buf); @@ -778,51 +928,39 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t msg_Err(p_dec, "Codec error (IllegalStateException) in MediaCodec.releaseOutputBuffer"); (*env)->ExceptionClear(env); (*env)->DeleteLocalRef(env, illegalStateException); - p_sys->error_state = true; + (*env)->DeleteLocalRef(env, buf); + return -1; } } (*env)->DeleteLocalRef(env, buf); } } else { msg_Warn(p_dec, "NewPicture failed"); - (*env)->CallVoidMethod(env, p_sys->codec, p_sys->release_output_buffer, index, false); - if ((*env)->ExceptionOccurred(env)) { - msg_Err(p_dec, "Exception in MediaCodec.releaseOutputBuffer (GetOutput)"); - (*env)->ExceptionClear(env); - p_sys->error_state = true; - } + if (ReleaseOutputBuffer(p_dec, env, index, false) != 0) + return -1; } - return; + return 0; } else if (index == INFO_OUTPUT_BUFFERS_CHANGED) { msg_Dbg(p_dec, "output buffers changed"); + if (!p_sys->get_output_buffers) + continue; (*env)->DeleteGlobalRef(env, p_sys->output_buffers); p_sys->output_buffers = (*env)->CallObjectMethod(env, p_sys->codec, p_sys->get_output_buffers); - if ((*env)->ExceptionOccurred(env)) { + if (CHECK_EXCEPTION()) { msg_Err(p_dec, "Exception in MediaCodec.getOutputBuffer (GetOutput)"); - (*env)->ExceptionClear(env); p_sys->output_buffers = NULL; - p_sys->error_state = true; - return; + return -1; } p_sys->output_buffers = (*env)->NewGlobalRef(env, p_sys->output_buffers); - - vlc_mutex_lock(get_android_opaque_mutex()); - free(p_sys->inflight_picture); - p_sys->i_output_buffers = (*env)->GetArrayLength(env, p_sys->output_buffers); - p_sys->inflight_picture = calloc(1, sizeof(picture_t*) * p_sys->i_output_buffers); - vlc_mutex_unlock(get_android_opaque_mutex()); - } else if (index == INFO_OUTPUT_FORMAT_CHANGED) { jobject format = (*env)->CallObjectMethod(env, p_sys->codec, p_sys->get_output_format); - if ((*env)->ExceptionOccurred(env)) { + if (CHECK_EXCEPTION()) { msg_Err(p_dec, "Exception in MediaCodec.getOutputFormat (GetOutput)"); - (*env)->ExceptionClear(env); - p_sys->error_state = true; - return; + return -1; } jobject format_string = (*env)->CallObjectMethod(env, format, p_sys->tostring); @@ -849,8 +987,7 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t if (!GetVlcChromaFormat(p_sys->pixel_format, &p_dec->fmt_out.i_codec, &name)) { msg_Err(p_dec, "color-format not recognized"); - p_sys->error_state = true; - return; + return -1; } } @@ -872,8 +1009,7 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t p_sys->stride = width; if (p_sys->slice_height <= 0) p_sys->slice_height = height; - if ((*env)->ExceptionOccurred(env)) - (*env)->ExceptionClear(env); + CHECK_EXCEPTION(); ArchitectureSpecificCopyHooks(p_dec, p_sys->pixel_format, p_sys->slice_height, p_sys->stride, &p_sys->architecture_specific_data); @@ -885,9 +1021,10 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t } } else { - return; + return 0; } } + return 0; } static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block) @@ -895,27 +1032,20 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block) decoder_sys_t *p_sys = p_dec->p_sys; picture_t *p_pic = NULL; JNIEnv *env = NULL; - struct H264ConvertState convert_state = { 0, 0 }; if (!pp_block || !*pp_block) return NULL; - block_t *p_block = *pp_block; - - if (p_sys->error_state) { - block_Release(p_block); - if (!p_sys->error_event_sent) { - /* Signal the error to the Java. */ - jni_EventHardwareAccelerationError(); - p_sys->error_event_sent = true; - } - return NULL; - } + if (p_sys->error_state) + goto endclean; jni_attach_thread(&env, THREAD_NAME); + if (!env) + goto endclean; - if (p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED)) { - block_Release(p_block); + if ((*pp_block)->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED)) { + block_Release(*pp_block); + *pp_block = NULL; timestamp_FifoEmpty(p_sys->timestamp_fifo); if (p_sys->decoded) { /* Invalidate all pictures that are currently in flight @@ -925,15 +1055,13 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block) InvalidateAllPictures(p_dec); (*env)->CallVoidMethod(env, p_sys->codec, p_sys->flush); - if ((*env)->ExceptionOccurred(env)) { + if (CHECK_EXCEPTION()) { msg_Warn(p_dec, "Exception occurred in MediaCodec.flush"); - (*env)->ExceptionClear(env); p_sys->error_state = true; } } p_sys->decoded = false; - jni_detach_thread(); - return NULL; + goto endclean; } /* Use the aspect ratio provided by the input (ie read from packetizer). @@ -947,38 +1075,29 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block) jlong timeout = 0; const int max_polling_attempts = 50; int attempts = 0; - while (true) { - int index = (*env)->CallIntMethod(env, p_sys->codec, p_sys->dequeue_input_buffer, (jlong) 0); - if ((*env)->ExceptionOccurred(env)) { - msg_Err(p_dec, "Exception occurred in MediaCodec.dequeueInputBuffer"); - (*env)->ExceptionClear(env); + /* return when pp_block is processed */ + while (*pp_block != NULL) { + if (*pp_block != NULL && PutInput(p_dec, env, pp_block, (jlong) 0) != 0) { p_sys->error_state = true; break; } - if (index < 0) { - GetOutput(p_dec, env, &p_pic, timeout); - if (p_sys->error_state) - break; - if (p_pic) { - /* If we couldn't get an available input buffer but a - * decoded frame is available, we return the frame - * without assigning NULL to *pp_block. The next call - * to DecodeVideo will try to send the input packet again. - */ - jni_detach_thread(); - return p_pic; - } + if (p_pic == NULL && GetOutput(p_dec, env, &p_pic, timeout) != 0) { + p_sys->error_state = true; + break; + } + + if (p_pic == NULL && *pp_block != NULL) { timeout = 30 * 1000; ++attempts; /* With opaque DR the output buffers are released by the vout therefore we implement a timeout for polling in order to avoid being indefinitely stalled in this loop. */ if (p_sys->direct_rendering && attempts == max_polling_attempts) { - picture_t *invalid_picture = decoder_NewPicture(p_dec); - if (invalid_picture) { - invalid_picture->date = VLC_TS_INVALID; - picture_sys_t *p_picsys = invalid_picture->p_sys; + p_pic = decoder_NewPicture(p_dec); + if (p_pic) { + p_pic->date = VLC_TS_INVALID; + picture_sys_t *p_picsys = p_pic->p_sys; p_picsys->pf_lock_pic = NULL; p_picsys->pf_unlock_pic = NULL; p_picsys->priv.hw.p_dec = NULL; @@ -989,56 +1108,32 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block) /* If we cannot return a picture we must free the block since the decoder will proceed with the next block. */ - block_Release(p_block); + block_Release(*pp_block); *pp_block = NULL; } - jni_detach_thread(); - return invalid_picture; } - continue; - } - - jobject buf = (*env)->GetObjectArrayElement(env, p_sys->input_buffers, index); - jsize size = (*env)->GetDirectBufferCapacity(env, buf); - uint8_t *bufptr = (*env)->GetDirectBufferAddress(env, buf); - if (size < 0) { - msg_Err(p_dec, "Java buffer has invalid size"); - p_sys->error_state = true; - break; - } - if ((size_t) size > p_block->i_buffer) - size = p_block->i_buffer; - memcpy(bufptr, p_block->p_buffer, size); - - convert_h264_to_annexb(bufptr, size, p_sys->nal_size, &convert_state); - - int64_t ts = p_block->i_pts; - if (!ts && p_block->i_dts) - ts = p_block->i_dts; - timestamp_FifoPut(p_sys->timestamp_fifo, p_block->i_pts ? VLC_TS_INVALID : p_block->i_dts); - (*env)->CallVoidMethod(env, p_sys->codec, p_sys->queue_input_buffer, index, 0, size, ts, 0); - (*env)->DeleteLocalRef(env, buf); - if ((*env)->ExceptionOccurred(env)) { - msg_Err(p_dec, "Exception in MediaCodec.queueInputBuffer"); - (*env)->ExceptionClear(env); - p_sys->error_state = true; - break; } - p_sys->decoded = true; - break; } + +endclean: if (p_sys->error_state) { + if( pp_block && *pp_block ) + { + block_Release(*pp_block); + *pp_block = NULL; + } if (p_pic) picture_Release(p_pic); - jni_detach_thread(); - return NULL; - } - if (!p_pic) - GetOutput(p_dec, env, &p_pic, 0); - jni_detach_thread(); + p_pic = NULL; - block_Release(p_block); - *pp_block = NULL; + if (!p_sys->error_event_sent) { + /* Signal the error to the Java. */ + jni_EventHardwareAccelerationError(); + p_sys->error_event_sent = true; + } + } + if (env != NULL) + jni_detach_thread(); return p_pic; }