From 0ef2e660c13f7ae5db8fafff2376cb692bb35682 Mon Sep 17 00:00:00 2001 From: Mohamed Naufal Date: Sun, 9 Oct 2011 00:48:52 +0530 Subject: libstagefright: reindent after previous commit --- libavcodec/libstagefright.cpp | 68 +++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'libavcodec/libstagefright.cpp') diff --git a/libavcodec/libstagefright.cpp b/libavcodec/libstagefright.cpp index e20ff52ca7..9ffe27c0d9 100644 --- a/libavcodec/libstagefright.cpp +++ b/libavcodec/libstagefright.cpp @@ -445,49 +445,49 @@ static av_cold int Stagefright_close(AVCodecContext *avctx) Frame *frame; if (s->thread_started) { - if (!s->thread_exited) { - s->stop_decode = 1; + if (!s->thread_exited) { + s->stop_decode = 1; - // Make sure decode_thread() doesn't get stuck - pthread_mutex_lock(&s->out_mutex); - while (!s->out_queue->empty()) { - frame = *s->out_queue->begin(); - s->out_queue->erase(s->out_queue->begin()); - if (frame->size) - frame->mbuffer->release(); - av_freep(&frame); - } - pthread_mutex_unlock(&s->out_mutex); + // Make sure decode_thread() doesn't get stuck + pthread_mutex_lock(&s->out_mutex); + while (!s->out_queue->empty()) { + frame = *s->out_queue->begin(); + s->out_queue->erase(s->out_queue->begin()); + if (frame->size) + frame->mbuffer->release(); + av_freep(&frame); + } + pthread_mutex_unlock(&s->out_mutex); + + // Feed a dummy frame prior to signalling EOF. + // This is required to terminate the decoder(OMX.SEC) + // when only one frame is read during stream info detection. + if (s->dummy_buf && (frame = (Frame*)av_mallocz(sizeof(Frame)))) { + frame->status = OK; + frame->size = s->dummy_bufsize; + frame->key = 1; + frame->buffer = s->dummy_buf; + pthread_mutex_lock(&s->in_mutex); + s->in_queue->push_back(frame); + pthread_cond_signal(&s->condition); + pthread_mutex_unlock(&s->in_mutex); + s->dummy_buf = NULL; + } - // Feed a dummy frame prior to signalling EOF. - // This is required to terminate the decoder(OMX.SEC) - // when only one frame is read during stream info detection. - if (s->dummy_buf && (frame = (Frame*)av_mallocz(sizeof(Frame)))) { - frame->status = OK; - frame->size = s->dummy_bufsize; - frame->key = 1; - frame->buffer = s->dummy_buf; pthread_mutex_lock(&s->in_mutex); - s->in_queue->push_back(frame); + s->end_frame->status = ERROR_END_OF_STREAM; + s->in_queue->push_back(s->end_frame); pthread_cond_signal(&s->condition); pthread_mutex_unlock(&s->in_mutex); - s->dummy_buf = NULL; + s->end_frame = NULL; } - pthread_mutex_lock(&s->in_mutex); - s->end_frame->status = ERROR_END_OF_STREAM; - s->in_queue->push_back(s->end_frame); - pthread_cond_signal(&s->condition); - pthread_mutex_unlock(&s->in_mutex); - s->end_frame = NULL; - } - - pthread_join(s->decode_thread_id, NULL); + pthread_join(s->decode_thread_id, NULL); - if (s->ret_frame.data[0]) - avctx->release_buffer(avctx, &s->ret_frame); + if (s->ret_frame.data[0]) + avctx->release_buffer(avctx, &s->ret_frame); - s->thread_started = false; + s->thread_started = false; } while (!s->in_queue->empty()) { -- cgit v1.2.3