From patchwork Sat May 6 11:42:56 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: 3595 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp72052vsd; Sat, 6 May 2017 04:43:15 -0700 (PDT) X-Received: by 10.28.86.65 with SMTP id k62mr7794880wmb.78.1494070995002; Sat, 06 May 2017 04:43:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494070994; cv=none; d=google.com; s=arc-20160816; b=IvgQlUtALhje8GcGWsaAEQ7ZYpVUdY7Q5T0BwWF1QBEmtdTjFFIXFqQS9aExAyB1hd cH5Wgj2jvjoFleXs101sSDycxtOf7H/xK1F5ARKITrXFYGD1i8PBiuqs8QTXKkb3euoB nHETv2RBWM8P/MbVFRV5uKmf468pt8KZHlOGnm6VhD7bQkA4ueOeKRH/jz57MBbkwuIS 88ymmNcXceRHIY8gZmRKacftq7hrJYIZY3GROCvqzgNUqUfjKUnbXQcsQcxHY2GvmrJS tQ8QSc0hrQt6bg6a8zj1RJLCv0ejmWb3oRoh433jOb60HqJODzD8QvyRb6dic7mqCd4v rvDg== 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=0aAo0am7rRytO2tgKy16qYtCCZink3GUc8iJi4c2v6c=; b=YBRhi6oSxXwqHSD/XithqJ1fA9CScbRvZk8H+eyyRwvmBXg15fCXe5x8Gwaq8Dmfzz 44rk36lnK21qDsc9kJTBOoEibsonkY7FUbcVAEPtyWWEAQQniC5v4DBUlcCHn9wXaGnH Er8R6bUgOQ7lteLWBPjTOHC8uZFzIoqNyQF3CZTmUHFx7W24RshTahv4aL4p+B2O7Wq6 5MEsOQvlhVAPCQRmxaykbJZgmSyKvSPrLd87H8VEoKMhZyMdzEtJ1lem6QUGShWP3mr3 C009QX9djqSOrltUdzS82YPQLNIiVBhlbqjlgUoKI031oLqpgg0LU8+2gBaBKcrU4Wfr GZPg== 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 j88si5473305wmi.125.2017.05.06.04.43.14; Sat, 06 May 2017 04:43:14 -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 E6EDB6806B8; Sat, 6 May 2017 14:43:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBACF6805F2 for ; Sat, 6 May 2017 14:42:58 +0300 (EEST) Received: by mail-pg0-f68.google.com with SMTP id u187so4047755pgb.1 for ; Sat, 06 May 2017 04:43:04 -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=jTyZ1zwym7rNxWJImXLqodD/AA/fnHXgPERcZ+c6Gow=; b=ptHHsjhoe5+QunIJKbB9RKIAS2pmUjgHCm5f56gfFEfrFhr3a4FUL2XxmMxO4krYY+ idHIujgGYiQmp+VJTB+EfUWgigs3xR+q4lvDJx591yZUuueWZUGvHA7pW3H43UZ7EM9r l49zKb/KnpYesysjiKFVe3sRl7WTxYyjIozUAnp4eQamqgJQWfToZKYFciZqAfqDAnyG UG3LR38MukRbZ/xJ89Jxt87TTdRG78bNoUMG18f+yNN4wAP6Zu50vUEJDSlZ2Njp7b1W xHTOn5ho6nlxLh5KCZHT8uSfrNqX7RwwXKqsmXB3pILiv1slvDKJSMA8gNq0FVpwLaej yyNg== 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=jTyZ1zwym7rNxWJImXLqodD/AA/fnHXgPERcZ+c6Gow=; b=i6lqGNu4LFWbDNgJ6J5PGjs1vFq/iWKcirXV/w+5UA9/gTiaV3WFKrcE86d3VmZ50h 7FG1gyP5K991Cmu5x4M5ZBrHJ9Wn9FqqRfZqMSdTjQku7Q8OBOxTmsdEESIKorL2YZWb infFeLadHeTsSWAmXN7a/9dbB2qbnvH09jiXrZk10nWDliGUzhz52HLQwUvx/o+yGV0q HGbyiGFsnQQFysU96FU3wdIZNB5I/WBBJHayCWWJ3vyIqB2aqhbbYbyXarjZnieZ6sCT 0O57Tg3zMuw4dOFMSuwJHdaWcs4c410K3uzzTjetMlK4DM0L2EQZlUmq0hjr6GEhroKc h8FA== X-Gm-Message-State: AN3rC/4/UhdZWxzqwKurW+Zbo2kEihFbjaxaEWOSlfG0eDTcINHzOBvG rNtiwSpoVBMZDg== X-Received: by 10.84.209.198 with SMTP id y64mr70797250plh.78.1494070982383; Sat, 06 May 2017 04:43:02 -0700 (PDT) Received: from localhost.localdomain (h175-177-005-132.catv02.itscom.jp. [175.177.5.132]) by smtp.gmail.com with ESMTPSA id r13sm8643062pgn.16.2017.05.06.04.43.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 06 May 2017 04:43:01 -0700 (PDT) From: Takayuki 'January June' Suwa To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 May 2017 20:42:56 +0900 Message-Id: <1494070976-26505-1-git-send-email-jjsuwa.sys3175@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [FFmpeg-devel] [PATCH] avdevice/alsa: wait until playback buffers are drained before closing 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" This fixes early abort on ALSA playback --- libavdevice/alsa.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavdevice/alsa.c b/libavdevice/alsa.c index 8d27913..1bbff30 100644 --- a/libavdevice/alsa.c +++ b/libavdevice/alsa.c @@ -300,6 +300,8 @@ av_cold int ff_alsa_close(AVFormatContext *s1) { AlsaData *s = s1->priv_data; + snd_pcm_nonblock(s->h, 0); + snd_pcm_drain(s->h); av_freep(&s->reorder_buf); if (CONFIG_ALSA_INDEV) ff_timefilter_destroy(s->timefilter);