diff options
| author | Ganesh Ajjanagadde | 2015-10-03 18:50:06 -0400 |
|---|---|---|
| committer | Marton Balint | 2015-10-04 17:40:30 +0200 |
| commit | c3e8de1c248f8c742dd9e61a0c71ee56bba22c28 (patch) | |
| tree | 0a14c16bff320bfab312151af28e4a335e1cfddf | |
| parent | 59594b11f9629e80f8d38f6b963afc390b26dbdb (diff) | |
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>
| -rw-r--r-- | ffplay.c | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -2080,10 +2080,15 @@ static int audio_thread(void *arg) 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); 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) @@ -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_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); break; case AVMEDIA_TYPE_VIDEO: @@ -2692,7 +2698,8 @@ static int stream_component_open(VideoState *is, int stream_index) is->viddec_height = avctx->height; 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; break; 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]; 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; default: break; |