From patchwork Tue May 9 11:07:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takayuki 'January June' Suwa X-Patchwork-Id: 3626 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp1277701vsd; Tue, 9 May 2017 04:13:53 -0700 (PDT) X-Received: by 10.28.139.136 with SMTP id n130mr15577641wmd.4.1494328433186; Tue, 09 May 2017 04:13:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494328433; cv=none; d=google.com; s=arc-20160816; b=CnBUx9meX8io9rFO5qgU/Fel+EJIqBhfyzCSB93nI/R+np3KsY5ue6a61kWgOGlzhy SbeN/UWQeVciPa5VrA0/PJTSb7BfQv+rY0tsOAiNL21dV7k9Ow7OndiidMOfIel2DAGA DOX3vOGyO/Z0qs5xfCBO1uCoStITmdyKE8SDDdmuI316tqQQ9MKIsA2HDOBZ44QFIIES Rv5DVxH4HLTrq1BPiB+PoO/4BNOajMZFQCrsie3Y9aCXVfW3mRYwd5P4aRPNbJmbZ/w6 XM9ssUO0Et8vKDT778TygVGH1vZDYfjK2vaXu5dC2ceUyG3RqcjFlg50nRMowi3zI5RO sR3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=wmBVth3WkmEYFbi5t+rCOnzzKimEEE4yBDAVtmZmR08=; b=kP7c+i47vRebM11pdSvqXrRl1GlOYVk85uQ5Kawpe6k1Ydja8wee0wUEupvXN2hvmy xdcYWpadh2dtHMWfVL6oEmRWHjQ+QUsjfk5bockDje1h9X03308hTz8B+AzZPZ/NFUcn 0na5RtqyhW3QxjtRTf+ArDJ9pjWqDA/LOk+MJ7KpUsvE61AUR8XLXU9PsgE4dGW19sqB FfkXTHZxViSHbsLT79ICHwftaS7He6YKyMdgzf6c/o66NLdgOzQlmcT6Wq3SBgVnQH9g WCg1HOjEDJG3n/t4DAaUOSjHWokY54l1TSu3e+FEzL1tvt3bC8/1uqik95ZYsK45sFnO Cktw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x11si628131wmx.65.2017.05.09.04.13.52; Tue, 09 May 2017 04:13:53 -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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E8126882A5; Tue, 9 May 2017 14:13:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 25B586809D3 for ; Tue, 9 May 2017 14:13:36 +0300 (EEST) Received: by mail-pg0-f66.google.com with SMTP id s62so14728669pgc.0 for ; Tue, 09 May 2017 04:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Yn96q4dR0db4neaMASFWuyOChwnRa0dTmPbQHrx+95w=; b=a3QSsekjKQzdgtVjRI6wvxWHy59MkL9rC+kflebpK0eOtu+NH7pQoNoU/79Sit77GA pdmKX2Kc7Ff2BBWbRMpE48dtsMyRcmlI/Uvc+ysL+jo3wXGuZaoOjab1aFhB1iAHtIsw rho20GfN6anfk93/kbSiaRCr1Iqo+yGEooszJrGzvoLsCGXN9cBrClYsnYkaF1qsVee2 tVnV4X60ZfoWAiv1CvIn1D80gBC7iES9XJZTPEvETh7Rk3TjKS7TATLuObRrX7lt9umK G+hwEZ10lk04zOrh3jyMzA5KYPQgvOq7MZ+51fhGqgYb+GDFq7IlubKpxr8YSTagferd 8xrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Yn96q4dR0db4neaMASFWuyOChwnRa0dTmPbQHrx+95w=; b=aoy4rxj7ab5VqQYntjCwEhjCcpvLSHnxQGeSP65Pz2MTV5Pf5uHjH3xoC2fZ1MBj/5 7SWwrT9Y9qbZH/KE3dzhcRYM+FEnReWFpX/qX9700FpugVt99wZWIX2PkGyMxRohAWk9 0Y02BatI4r2Sh0nPkMgqWB9L+xWjHDvZHxLXolwMMX4BDYDx4wsn7FmCujaMCXJuEBF0 q/91yYf3T8FQToJstUJj7YtQVvdD2h359cDeTDOxWEu2kN5JSGlN7s74NcE60XacUVqt aInL8txncTQqPXRihuUGcdcJEQI3LmasVXPEE+eIFo/eCWWSLP1sFfSPu/0mDAORKaAe ZiFA== X-Gm-Message-State: AN3rC/5G+pae0LKIpBhEgEBxsU/or63Im6TxyHUb/6vNFcMhoo/8hfVP rIr1ykDajBZ5lw== X-Received: by 10.98.64.69 with SMTP id n66mr37381512pfa.211.1494328041382; Tue, 09 May 2017 04:07:21 -0700 (PDT) Received: from localhost.localdomain (h175-177-005-132.catv02.itscom.jp. [175.177.5.132]) by smtp.gmail.com with ESMTPSA id z5sm31856109pff.73.2017.05.09.04.07.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 May 2017 04:07:20 -0700 (PDT) From: Takayuki 'January June' Suwa To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 May 2017 20:07:15 +0900 Message-Id: <1494328035-1450-1-git-send-email-jjsuwa.sys3175@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [FFmpeg-devel] [PATCH] lavd/alsa: add workarounds for ALSA cleanup problem 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 Cc: Takayuki 'January June' Suwa MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" - Add snd_config_update_free_global() after closing ALSA PCM handle, as aplay does. - Add snd_pcm_hw_free(h) before closing the handle. see https://www.google.com/search?q=Without+the+snd_pcm_hw_free,+snd_pcm_close+sometimes+fails --- libavdevice/alsa.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavdevice/alsa.c b/libavdevice/alsa.c index 1bbff30..202b481 100644 --- a/libavdevice/alsa.c +++ b/libavdevice/alsa.c @@ -292,7 +292,9 @@ av_cold int ff_alsa_open(AVFormatContext *ctx, snd_pcm_stream_t mode, fail: snd_pcm_hw_params_free(hw_params); fail1: + snd_pcm_hw_free(h); snd_pcm_close(h); + snd_config_update_free_global(); return AVERROR(EIO); } @@ -302,10 +304,12 @@ av_cold int ff_alsa_close(AVFormatContext *s1) snd_pcm_nonblock(s->h, 0); snd_pcm_drain(s->h); + snd_pcm_hw_free(s->h); av_freep(&s->reorder_buf); if (CONFIG_ALSA_INDEV) ff_timefilter_destroy(s->timefilter); snd_pcm_close(s->h); + snd_config_update_free_global(); return 0; }