Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstagefright: port to refcounted frames

Browse Source 
Untested.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
pull/27/head
Paul B Mahol 12 years ago
parent dda8afc391
commit d1c96b28d7
1 changed files with 9 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      libavcodec/libstagefright.cpp

26
libavcodec/libstagefright.cpp
Unescape View File

@ -186,7 +186,7 @@ void* decode_thread(void *arg)
buffer->release(); buffer->release();
goto push_frame; goto push_frame;
} }
ret = ff_get_buffer(avctx, frame->vframe, 0); ret = ff_get_buffer(avctx, frame->vframe, AV_GET_BUFFER_FLAG_REF);
if (ret < 0) { if (ret < 0) {
frame->status = ret; frame->status = ret;
decode_done = 1; decode_done = 1;
@ -457,10 +457,8 @@ static int Stagefright_decode_frame(AVCodecContext *avctx, void *data,
return -1; return -1;
} }
if (s->prev_frame) { if (s->prev_frame)
avctx->release_buffer(avctx, s->prev_frame); av_frame_free(&s->prev_frame);
av_freep(&s->prev_frame);
}
s->prev_frame = ret_frame; s->prev_frame = ret_frame;
*got_frame = 1; *got_frame = 1;
@ -482,10 +480,8 @@ static av_cold int Stagefright_close(AVCodecContext *avctx)
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->vframe) { if (frame->vframe)
avctx->release_buffer(avctx, frame->vframe); av_frame_free(&frame->vframe);
av_freep(&frame->vframe);
}
av_freep(&frame); av_freep(&frame);
} }
pthread_mutex_unlock(&s->out_mutex); pthread_mutex_unlock(&s->out_mutex);
@ -515,10 +511,8 @@ static av_cold int Stagefright_close(AVCodecContext *avctx)
pthread_join(s->decode_thread_id, NULL); pthread_join(s->decode_thread_id, NULL);
if (s->prev_frame) { if (s->prev_frame)
avctx->release_buffer(avctx, s->prev_frame); av_frame_free(&s->prev_frame);
av_freep(&s->prev_frame);
}
s->thread_started = false; s->thread_started = false;
} }
@ -534,10 +528,8 @@ static av_cold int Stagefright_close(AVCodecContext *avctx)
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->vframe) { if (frame->vframe)
avctx->release_buffer(avctx, frame->vframe); av_frame_free(&frame->vframe);
av_freep(&frame->vframe);
}
av_freep(&frame); av_freep(&frame);
} }

Write Preview
Loading…
Cancel
Save