vlc | branch: master | Adrien Maglo <[email protected]> | Thu Jun 12 08:50:52 2014 +0200| [c47334a3d2136941861d1b449a7610ec844412df] | committer: Adrien Maglo
Revert "mediacodec: wait to have the first frame successfully decoded to set the started flag" This reverts commit 703cfc648ee8e3fe70ee276508f44321a0b7b993 as it does not solve any issue. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c47334a3d2136941861d1b449a7610ec844412df --- modules/codec/omxil/android_mediacodec.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/modules/codec/omxil/android_mediacodec.c b/modules/codec/omxil/android_mediacodec.c index 87b135d..94359c3 100644 --- a/modules/codec/omxil/android_mediacodec.c +++ b/modules/codec/omxil/android_mediacodec.c @@ -523,14 +523,7 @@ static int OpenDecoder(vlc_object_t *p_this) (*env)->ExceptionClear(env); goto error; } - - /* WARNING: we should normally set the started flag here, just after the start() call. - However, as libstagefright is asynchronous and is not entirely initialized after - the start() call, we wait to have successfully decoded the first frame before - setting this flag in order to try to avoid a crash happening during the module - CloseDecoder() function. - Note: calling release() without having called stop() does not seem to be an issue. */ - //p_sys->started = true; + 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); @@ -948,7 +941,6 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block) (*env)->CallVoidMethod(env, p_sys->codec, p_sys->queue_input_buffer, index, 0, size, ts, 0); (*env)->DeleteLocalRef(env, buf); p_sys->decoded = true; - p_sys->started = true; break; } if (!p_pic) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
