From patchwork Sat Sep 24 18:01:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 704 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1161669vsd; Sat, 24 Sep 2016 11:01:43 -0700 (PDT) X-Received: by 10.194.68.8 with SMTP id r8mr11606384wjt.190.1474740102716; Sat, 24 Sep 2016 11:01:42 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 8si1502863wmo.24.2016.09.24.11.01.41; Sat, 24 Sep 2016 11:01:42 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li; dkim=neutral (body hash did not verify) header.i=@messagingengine.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 37EF1689DEC; Sat, 24 Sep 2016 21:01:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1759689BFD for ; Sat, 24 Sep 2016 21:01:16 +0300 (EEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 14465205C1 for ; Sat, 24 Sep 2016 14:01:32 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute7.internal (MEProxy); Sat, 24 Sep 2016 14:01:32 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=itanimul.li; h= date:from:message-id:subject:to:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=8rpDPS4SAni8JCIW1oVo4ZSpuhY=; b=AW7WLmhmNmAHIdtgho25Tzb7Uq7S /PeWh3nfEqFlPsJ9JDl5Qi7AH6KWJSlMQJeGhO6MPA9+09x7qMC1f7yZxWy3DhH4 oB2xT+pA8bK1gcHmXqIlFEB8SDexRIjaUi8DrTKxTVgxxXbEQkbZ+WG/hgbAU7PL wFc1rZ4yQtvKFng= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-sasl-enc:x-sasl-enc; s=smtpout; bh=8rpDPS4SAni8JCIW1oVo4ZSpuh Y=; b=jRNKw2OD4/Bx+L0sQAGfq52zqhaDVgci9RgYgeq6PEZdrJMWOxyVJf4g6B GAgBKuHhpIc5lOuj/RdBhvuRzNGaVSl+l+vx0qp1H66weoRXJdM5Fkv+mSPWPw3h 180axFI/tlEoz2aheOFaNDv9DulqDgfuPzk9z3bh9jbfLqbLM= X-Sasl-enc: aj0I1FL7GWxJr1lOb+cecbrbnV+f1Lq2JMPBH3t+WbKY 1474740091 Received: from localhost (cpc75394-sotn16-2-0-cust168.15-1.cable.virginm.net [82.22.8.169]) by mail.messagingengine.com (Postfix) with ESMTPA id AC45AF29CD for ; Sat, 24 Sep 2016 14:01:31 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Sep 2016 19:01:27 +0100 Message-Id: <20160924180127.79224-1-josh@itanimul.li> X-Mailer: git-send-email 2.8.4 (Apple Git-73) Subject: [FFmpeg-devel] [PATCH] lavd/sdl2: remove unused code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Josh de Kock --- libavdevice/sdl2.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c index e8252f0..217ccc0 100644 --- a/libavdevice/sdl2.c +++ b/libavdevice/sdl2.c @@ -48,10 +48,6 @@ typedef struct { SDL_Rect texture_rect; int inited; - SDL_Thread *event_thread; - SDL_mutex *mutex; - SDL_cond *init_cond; - int quit; } SDLContext; static const struct sdl_texture_format_entry { @@ -140,20 +136,9 @@ static int sdl2_write_trailer(AVFormatContext *s) { SDLContext *sdl = s->priv_data; - sdl->quit = 1; - if (sdl->texture) SDL_DestroyTexture(sdl->texture); sdl->texture = NULL; - if (sdl->event_thread) - SDL_WaitThread(sdl->event_thread, NULL); - sdl->event_thread = NULL; - if (sdl->mutex) - SDL_DestroyMutex(sdl->mutex); - sdl->mutex = NULL; - if (sdl->init_cond) - SDL_DestroyCond(sdl->init_cond); - sdl->init_cond = NULL; if (sdl->renderer) SDL_DestroyRenderer(sdl->renderer); @@ -204,7 +189,7 @@ static int sdl2_write_header(AVFormatContext *s) if (!sdl->texture_fmt) { av_log(s, AV_LOG_ERROR, - "Unsupported pixel format '%s', choose one of yuv420p, yuyv422, uyvy422, BGRA\n", + "Unsupported pixel format '%s'.\n", av_get_pix_fmt_name(codecpar->format)); goto fail; } @@ -255,7 +240,7 @@ fail: static int sdl2_write_packet(AVFormatContext *s, AVPacket *pkt) { - int ret = 0; + int ret, quit = 0; SDLContext *sdl = s->priv_data; AVCodecParameters *codecpar = s->streams[0]->codecpar; uint8_t *data[4]; @@ -268,14 +253,14 @@ static int sdl2_write_packet(AVFormatContext *s, AVPacket *pkt) switch (event.key.keysym.sym) { case SDLK_ESCAPE: case SDLK_q: - sdl->quit = 1; + quit = 1; break; default: break; } break; case SDL_QUIT: - sdl->quit = 1; + quit = 1; break; case SDL_WINDOWEVENT: switch(event.window.event){ @@ -294,13 +279,12 @@ static int sdl2_write_packet(AVFormatContext *s, AVPacket *pkt) } } - if (sdl->quit) { + if (quit) { sdl2_write_trailer(s); return AVERROR(EIO); } av_image_fill_arrays(data, linesize, pkt->data, codecpar->format, codecpar->width, codecpar->height, 1); - SDL_LockMutex(sdl->mutex); switch (sdl->texture_fmt) { /* case SDL_PIXELFORMAT_ARGB4444: * case SDL_PIXELFORMAT_RGBA4444: @@ -346,7 +330,6 @@ static int sdl2_write_packet(AVFormatContext *s, AVPacket *pkt) SDL_RenderClear(sdl->renderer); SDL_RenderCopy(sdl->renderer, sdl->texture, NULL, &sdl->texture_rect); SDL_RenderPresent(sdl->renderer); - SDL_UnlockMutex(sdl->mutex); return ret; }