RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffplay: more robust thread creation 

SDL_CreateThread can fail:
https://wiki.libsdl.org/SDL_CreateThread.
This patch makes thread creation more robust in one instance.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Ganesh Ajjanagadde 2015-10-03 18:50:06 -04:00 committed by Marton Balint
parent 59594b11f9
commit c3e8de1c24
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ffplay.c
View File

@ -2080,10 +2080,15 @@ static int audio_thread(void *arg)
return ret; return ret;
} }
static void decoder_start(Decoder *d, int (*fn)(void *), void *arg) static int decoder_start(Decoder *d, int (*fn)(void *), void *arg)
{ {
packet_queue_start(d->queue); packet_queue_start(d->queue);
d->decoder_tid = SDL_CreateThread(fn, arg); d->decoder_tid = SDL_CreateThread(fn, arg);
if (!d->decoder_tid) {
av_log(d, AV_LOG_ERROR, "SDL_CreateThread(): %s\n", SDL_GetError());
return AVERROR(ENOMEM);
}
return 0;
} }
static int video_thread(void *arg) static int video_thread(void *arg)
@ -2681,7 +2686,8 @@ static int stream_component_open(VideoState *is, int stream_index)
is->auddec.start_pts = is->audio_st->start_time; is->auddec.start_pts = is->audio_st->start_time;
is->auddec.start_pts_tb = is->audio_st->time_base; is->auddec.start_pts_tb = is->audio_st->time_base;
} }
decoder_start(&is->auddec, audio_thread, is); if ((ret = decoder_start(&is->auddec, audio_thread, is)) < 0)
goto fail;
SDL_PauseAudio(0); SDL_PauseAudio(0);
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
@ -2692,7 +2698,8 @@ static int stream_component_open(VideoState *is, int stream_index)
is->viddec_height = avctx->height; is->viddec_height = avctx->height;
decoder_init(&is->viddec, avctx, &is->videoq, is->continue_read_thread); decoder_init(&is->viddec, avctx, &is->videoq, is->continue_read_thread);
decoder_start(&is->viddec, video_thread, is); if ((ret = decoder_start(&is->viddec, video_thread, is)) < 0)
goto fail;
is->queue_attachments_req = 1; is->queue_attachments_req = 1;
break; break;
case AVMEDIA_TYPE_SUBTITLE: case AVMEDIA_TYPE_SUBTITLE:
@ -2700,7 +2707,8 @@ static int stream_component_open(VideoState *is, int stream_index)
is->subtitle_st = ic->streams[stream_index]; is->subtitle_st = ic->streams[stream_index];
decoder_init(&is->subdec, avctx, &is->subtitleq, is->continue_read_thread); decoder_init(&is->subdec, avctx, &is->subtitleq, is->continue_read_thread);
decoder_start(&is->subdec, subtitle_thread, is); if ((ret = decoder_start(&is->subdec, subtitle_thread, is)) < 0)
goto fail;
break; break;
default: default:
break; break;