generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libstagefright: reindent after previous commit

Browse Source
This commit is contained in:
Mohamed Naufal 2011-10-09 00:48:52 +05:30
parent a85996d834
commit 0ef2e660c1
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
libavcodec/libstagefright.cpp
View File

@ -445,49 +445,49 @@ static av_cold int Stagefright_close(AVCodecContext *avctx)
Frame *frame; Frame *frame;
if (s->thread_started) { if (s->thread_started) {
if (!s->thread_exited) { if (!s->thread_exited) {
s->stop_decode = 1; s->stop_decode = 1;
// Make sure decode_thread() doesn't get stuck // Make sure decode_thread() doesn't get stuck
pthread_mutex_lock(&s->out_mutex); pthread_mutex_lock(&s->out_mutex);
while (!s->out_queue->empty()) { while (!s->out_queue->empty()) {
frame = *s->out_queue->begin(); frame = *s->out_queue->begin();
s->out_queue->erase(s->out_queue->begin()); s->out_queue->erase(s->out_queue->begin());
if (frame->size) if (frame->size)
frame->mbuffer->release(); frame->mbuffer->release();
av_freep(&frame); av_freep(&frame);
} }
pthread_mutex_unlock(&s->out_mutex); 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); 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_cond_signal(&s->condition);
pthread_mutex_unlock(&s->in_mutex); pthread_mutex_unlock(&s->in_mutex);
s->dummy_buf = NULL; s->end_frame = NULL;
} }
pthread_mutex_lock(&s->in_mutex); pthread_join(s->decode_thread_id, NULL);
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); if (s->ret_frame.data[0])
avctx->release_buffer(avctx, &s->ret_frame);
if (s->ret_frame.data[0]) s->thread_started = false;
avctx->release_buffer(avctx, &s->ret_frame);
s->thread_started = false;
} }
while (!s->in_queue->empty()) { while (!s->in_queue->empty()) {