Skip to content

F
ffmpeg.wasm-core
Commit 1d48e88d authored by Mohamed Naufal's avatar Mohamed Naufal
Browse files
Options

libstagefright: avoid potential deadlock on output MediaBuffer 

Maintain an output queue of AVFrames instead of MediaBuffers
so that the latter can be released early. This avoids a potential deadlock
between the stagefright decoder::read() and Stagefright_decode_frame()
parent 7b915a40
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 73 deletions
libavcodec/libstagefright.cpp
View file @ 1d48e88d
...@@ -48,8 +48,7 @@ struct Frame { ...@@ -48,8 +48,7 @@ struct Frame {
int64_t time; int64_t time;
int key; int key;
uint8_t *buffer; uint8_t *buffer;
MediaBuffer* mbuffer; AVFrame *vframe;
int32_t w, h;
}; };
struct TimeStamp { struct TimeStamp {
...@@ -74,7 +73,7 @@ struct StagefrightContext { ...@@ -74,7 +73,7 @@ struct StagefrightContext {
bool source_done; bool source_done;
volatile sig_atomic_t thread_started, thread_exited, stop_decode; volatile sig_atomic_t thread_started, thread_exited, stop_decode;
AVFrame ret_frame; AVFrame *prev_frame;
std::map<int64_t, TimeStamp> *ts_map; std::map<int64_t, TimeStamp> *ts_map;
int64_t frame_index; int64_t frame_index;
...@@ -156,7 +155,13 @@ void* decode_thread(void *arg) ...@@ -156,7 +155,13 @@ void* decode_thread(void *arg)
StagefrightContext *s = (StagefrightContext*)avctx->priv_data; StagefrightContext *s = (StagefrightContext*)avctx->priv_data;
Frame* frame; Frame* frame;
MediaBuffer *buffer; MediaBuffer *buffer;
int32_t w, h;
int decode_done = 0; int decode_done = 0;
int ret;
int src_linesize[3];
const uint8_t *src_data[3];
int64_t out_frame_index = 0;
do { do {
buffer = NULL; buffer = NULL;
frame = (Frame*)av_mallocz(sizeof(Frame)); frame = (Frame*)av_mallocz(sizeof(Frame));
...@@ -165,14 +170,63 @@ void* decode_thread(void *arg) ...@@ -165,14 +170,63 @@ void* decode_thread(void *arg)
frame->status = AVERROR(ENOMEM); frame->status = AVERROR(ENOMEM);
decode_done = 1; decode_done = 1;
s->end_frame = NULL; s->end_frame = NULL;
} else { goto push_frame;
frame->status = (*s->decoder)->read(&buffer); }
if (frame->status == OK) { frame->status = (*s->decoder)->read(&buffer);
sp<MetaData> outFormat = (*s->decoder)->getFormat(); if (frame->status == OK) {
outFormat->findInt32(kKeyWidth , &frame->w); sp<MetaData> outFormat = (*s->decoder)->getFormat();
outFormat->findInt32(kKeyHeight, &frame->h); outFormat->findInt32(kKeyWidth , &w);
frame->size = buffer->range_length(); outFormat->findInt32(kKeyHeight, &h);
frame->mbuffer = buffer; frame->vframe = (AVFrame*)av_mallocz(sizeof(AVFrame));
if (!frame->vframe) {
frame->status = AVERROR(ENOMEM);
decode_done = 1;
buffer->release();
goto push_frame;
}
ret = avctx->get_buffer(avctx, frame->vframe);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
frame->status = ret;
decode_done = 1;
buffer->release();
goto push_frame;
}
// The OMX.SEC decoder doesn't signal the modified width/height
if (s->decoder_component && !strncmp(s->decoder_component, "OMX.SEC", 7) &&
(w & 15 || h & 15)) {
if (((w + 15)&~15) * ((h + 15)&~15) * 3/2 == buffer->range_length()) {
w = (w + 15)&~15;
h = (h + 15)&~15;
}
}
if (!avctx->width || !avctx->height || avctx->width > w || avctx->height > h) {
avctx->width = w;
avctx->height = h;
}
src_linesize[0] = w;
if (avctx->pix_fmt == PIX_FMT_YUV420P)
src_linesize[1] = src_linesize[2] = w/2;
else if (avctx->pix_fmt == PIX_FMT_NV21)
src_linesize[1] = w;
src_data[0] = (uint8_t*)buffer->data();
src_data[1] = src_data[0] + src_linesize[0] * h;
src_data[2] = src_data[1] + src_linesize[1] * h/2;
av_image_copy(frame->vframe->data, frame->vframe->linesize,
src_data, src_linesize,
avctx->pix_fmt, avctx->width, avctx->height);
buffer->meta_data()->findInt64(kKeyTime, &out_frame_index);
if (out_frame_index && s->ts_map->count(out_frame_index) > 0) {
frame->vframe->pts = (*s->ts_map)[out_frame_index].pts;
frame->vframe->reordered_opaque = (*s->ts_map)[out_frame_index].reordered_opaque;
s->ts_map->erase(out_frame_index);
}
buffer->release();
} else if (frame->status == INFO_FORMAT_CHANGED) { } else if (frame->status == INFO_FORMAT_CHANGED) {
if (buffer) if (buffer)
buffer->release(); buffer->release();
...@@ -181,7 +235,7 @@ void* decode_thread(void *arg) ...@@ -181,7 +235,7 @@ void* decode_thread(void *arg)
} else { } else {
decode_done = 1; decode_done = 1;
} }
} push_frame:
while (true) { while (true) {
pthread_mutex_lock(&s->out_mutex); pthread_mutex_lock(&s->out_mutex);
if (s->out_queue->size() >= 10) { if (s->out_queue->size() >= 10) {
...@@ -301,17 +355,10 @@ static int Stagefright_decode_frame(AVCodecContext *avctx, void *data, ...@@ -301,17 +355,10 @@ static int Stagefright_decode_frame(AVCodecContext *avctx, void *data,
{ {
StagefrightContext *s = (StagefrightContext*)avctx->priv_data; StagefrightContext *s = (StagefrightContext*)avctx->priv_data;
Frame *frame; Frame *frame;
MediaBuffer *mbuffer;
status_t status; status_t status;
size_t size;
uint8_t *buf;
const uint8_t *src_data[3];
int w, h;
int src_linesize[3];
int orig_size = avpkt->size; int orig_size = avpkt->size;
AVPacket pkt = *avpkt; AVPacket pkt = *avpkt;
int64_t out_frame_index = 0; AVFrame *ret_frame;
int ret;
if (!s->thread_started) { if (!s->thread_started) {
pthread_create(&s->decode_thread_id, NULL, &decode_thread, avctx); pthread_create(&s->decode_thread_id, NULL, &decode_thread, avctx);
...@@ -392,11 +439,8 @@ static int Stagefright_decode_frame(AVCodecContext *avctx, void *data, ...@@ -392,11 +439,8 @@ static int Stagefright_decode_frame(AVCodecContext *avctx, void *data,
s->out_queue->erase(s->out_queue->begin()); s->out_queue->erase(s->out_queue->begin());
pthread_mutex_unlock(&s->out_mutex); pthread_mutex_unlock(&s->out_mutex);
mbuffer = frame->mbuffer; ret_frame = frame->vframe;
status = frame->status; status = frame->status;
size = frame->size;
w = frame->w;
h = frame->h;
av_freep(&frame); av_freep(&frame);
if (status == ERROR_END_OF_STREAM) if (status == ERROR_END_OF_STREAM)
...@@ -408,52 +452,15 @@ static int Stagefright_decode_frame(AVCodecContext *avctx, void *data, ...@@ -408,52 +452,15 @@ static int Stagefright_decode_frame(AVCodecContext *avctx, void *data,
return -1; return -1;
} }
// The OMX.SEC decoder doesn't signal the modified width/height if (s->prev_frame) {
if (s->decoder_component && !strncmp(s->decoder_component, "OMX.SEC", 7) && avctx->release_buffer(avctx, s->prev_frame);
(w & 15 || h & 15)) { av_freep(&s->prev_frame);
if (((w + 15)&~15) * ((h + 15)&~15) * 3/2 == size) {
w = (w + 15)&~15;
h = (h + 15)&~15;
}
}
if (!avctx->width || !avctx->height || avctx->width > w || avctx->height > h) {
avctx->width = w;
avctx->height = h;
}
ret = avctx->reget_buffer(avctx, &s->ret_frame);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "reget buffer() failed\n");
goto end;
} }
s->prev_frame = ret_frame;
src_linesize[0] = w;
if (avctx->pix_fmt == PIX_FMT_YUV420P)
src_linesize[1] = src_linesize[2] = w/2;
else if (avctx->pix_fmt == PIX_FMT_NV21)
src_linesize[1] = w;
buf = (uint8_t*)mbuffer->data();
src_data[0] = buf;
src_data[1] = buf + src_linesize[0] * h;
src_data[2] = src_data[1] + src_linesize[1] * h/2;
av_image_copy(s->ret_frame.data, s->ret_frame.linesize,
src_data, src_linesize,
avctx->pix_fmt, avctx->width, avctx->height);
mbuffer->meta_data()->findInt64(kKeyTime, &out_frame_index);
if (out_frame_index && s->ts_map->count(out_frame_index) > 0) {
s->ret_frame.pts = (*s->ts_map)[out_frame_index].pts;
s->ret_frame.reordered_opaque = (*s->ts_map)[out_frame_index].reordered_opaque;
s->ts_map->erase(out_frame_index);
}
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
*(AVFrame*)data = s->ret_frame; *(AVFrame*)data = *ret_frame;
ret = orig_size; return orig_size;
end:
mbuffer->release();
return ret;
} }
static av_cold int Stagefright_close(AVCodecContext *avctx) static av_cold int Stagefright_close(AVCodecContext *avctx)
...@@ -470,8 +477,10 @@ static av_cold int Stagefright_close(AVCodecContext *avctx) ...@@ -470,8 +477,10 @@ 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->size) if (frame->vframe) {
frame->mbuffer->release(); avctx->release_buffer(avctx, frame->vframe);
av_freep(&frame->vframe);
}
av_freep(&frame); av_freep(&frame);
} }
pthread_mutex_unlock(&s->out_mutex); pthread_mutex_unlock(&s->out_mutex);
...@@ -501,8 +510,10 @@ static av_cold int Stagefright_close(AVCodecContext *avctx) ...@@ -501,8 +510,10 @@ static av_cold int Stagefright_close(AVCodecContext *avctx)
pthread_join(s->decode_thread_id, NULL); pthread_join(s->decode_thread_id, NULL);
if (s->ret_frame.data[0]) if (s->prev_frame) {
avctx->release_buffer(avctx, &s->ret_frame); avctx->release_buffer(avctx, s->prev_frame);
av_freep(&s->prev_frame);
}
s->thread_started = false; s->thread_started = false;
} }
...@@ -518,8 +529,10 @@ static av_cold int Stagefright_close(AVCodecContext *avctx) ...@@ -518,8 +529,10 @@ 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->size) if (frame->vframe) {
frame->mbuffer->release(); avctx->release_buffer(avctx, frame->vframe);
av_freep(&frame->vframe);
}
av_freep(&frame); av_freep(&frame);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment