From patchwork Wed Dec 14 17:10:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39703 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp496289pzb; Wed, 14 Dec 2022 09:11:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf5H2TFfKsomb4/y6MeAehDqIUKYZb8z3BFP5F3M5Tj6cfA7cMPHN82n/8yp3+8q+gZFG3sz X-Received: by 2002:a17:907:2ace:b0:7c1:eb:b2a7 with SMTP id fm14-20020a1709072ace00b007c100ebb2a7mr16532446ejc.13.1671037863134; Wed, 14 Dec 2022 09:11:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671037863; cv=none; d=google.com; s=arc-20160816; b=X7rj7rmnTCUXxfL6p96utjTuAOZCOFUzETnjPnRcSLGcSPwoKnibmcQZsFUUk30lcq gMXp/YdiPg+laTqzw45DX3931y8PHxYJjULCQTS4kP/x4fAKOR20yjPm9FYKuErBiwwW a6zezdomBkl4QrsjHQ8Sk7obAStpVA1T5lXVFJW8w8+4X+YI3rugn+VOVbgIOdk/4TC5 6SUuJNSuZXcKpErb/ajks2sGSx6C79wuvtZd7GjYdgcDfFriKIa8bbyg4VL+/+fJ4MVy X3w1RvTswCUA8FC8ZS90ttgKjNyipTSjOy0DudttulKSDvGWlQj6BqdM9gQmcXUaUqxO 43wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=dhcOIDXSjkeRHxhkTrE0cqSvvkaDlP/Ij7rN4Fom2Sg=; b=Qm4IwwDZPVJ9sHW78aBUYORlwqWrJx+hgV90IAzFTYilY84vob9SbSTfYnBhRnhw79 0SKew7YslYSDQpXR26z6yYcnUqGoLowngHZVcc8OaT8jOrIDD3tlEjPGN0od5ClQ4SzP hAhoW/QQdyKLi3g5B4mVRQWu1NTh+xS7wke77wArjrU6yU/sxAn2w3nk4A0BWArr2m2+ aiZGAc6MvNwIKQXNNB3LEv6PqiG64PTIiyqCHq+qK9O8qeqRQr8sEVLpVJaqVOrJAPRU eNUExlyF41Ubd7A8Z/pkFxk+hTYh9OYJ93TvBqQ3xgwmFTLyHOQw23t3mzfoZvOzXqAj EJXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=vvYTkD6X; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e21-20020a17090658d500b007c0edce0846si12947471ejs.670.2022.12.14.09.11.02; Wed, 14 Dec 2022 09:11:03 -0800 (PST) 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=@foxmail.com header.s=s201512 header.b=vvYTkD6X; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFC6F68BC5D; Wed, 14 Dec 2022 19:10:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9266D68AEB3 for ; Wed, 14 Dec 2022 19:10:42 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1671037840; bh=G1oIvDzRw7dd7ySna8tOvkLc3sxBEcVTAIG6B5GrZ2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vvYTkD6XIeBW4MjxzxBEkBEkuX5tLqCjyF7gF+ExYO0Fk8s6IH8NlBcKSErf8mZUs bMVGnLBMTvwHUDtwUBSbIKUzNZbrp3i5nRuf4L9tBufOXbh5vmhHz6lr1RGaSG56Or g2kzn3jyEJq88Gycw/YehvTE/z3OHFguMDiQqj9g= Received: from localhost.localdomain ([113.116.29.217]) by newxmesmtplogicsvrsza12-0.qq.com (NewEsmtp) with SMTP id 2A515E8A; Thu, 15 Dec 2022 01:10:37 +0800 X-QQ-mid: xmsmtpt1671037839tvwvvv8mb Message-ID: X-QQ-XMAILINFO: MVKy59SpMLfU0uDBMWnOCueDarJ8VfKZb1LF6LaaXxihJcLldorioanH9YsWnn Fhdfj26WXS1eHMLllvG+/BdL9NFKLpUQ/RmnWRMPv5sq6JcSpX9pwz8xxiqr6gvSETskp8GKWA2a gFjx8IJI7vG1pOJg3nyhQWYv+3vyNKg7cJVLT6vIz3hltKa181HX/Ze1cZeKyY+Iw0sWUclI8x8c yy2n8tzZRe3ElCu2iYoN7O2GISuvLu/i4hYwXO7wJ3FuFqUHPKV1wNNzcN0MnmRdE1fjim4Op2p1 gSGinJ/K+ujOgOcpNMZEPbTi+++qA5JYKseCoycPf8GELv/t00OWmChgZAwuO35Ntadu9nBudA// se7y62grU0nR+om50VhdwoDMWAlsbCLfEqr9xEvIFk+i7H3myvoS9N58PyQ6De2nB80kPp9iVAlD ZHLDNjcE47/xR6NcrxNdSmRjx/y41ut5wUYgqU13EBvMBomZNfSZbOtTf05QJGdCAkgdDuQ5ECvs H+3e0JOVnwRaDRmV98ad5ZO8p3C4LPD9u6Edk1FB8kQkNLHz1Rd4XIoDwuJZNW2tiMiJ83IVx0oo TxUVI9juImIgXOgFyjnCZkV4TeT+CG1iP5Q0dKWEUeN9wJs0sqMYjifP5xufPpH6+kNBe4rSL2FP jAgo7IFWDGN7VHF2ydyenoA1NqCYYLG+zaT3Xd8xduEXgBTSnVoRI6vbWiVZqHAvrFulsdRQ7zei WXnvmrwrNdwuW+IZU+YQ+U5brfSvt1CM/4EZ8zIOdSa946/x9IPpv1wP+m64SwAP7jjiMq+rAmBl 4H+83uWZJ5xdGLJ08/4Fdi3OJJ0KqR0krlPiNO54QyrWa9V3sp9DF5zY+GV8Cv2dqg5b8BOnv+eB 6nwiz+YD+8+6Wy2YC9r7G34yCmqyqIy5NGVihnj2t7OxndOZoYGeavPNabVCGNOO5Uc8xJV1qbzI bfO2ympUr1BzR4lBpwNE5TBTiuLTT8bgXTr076fk5voEsP9zbsmjiX6DIk6vo+ From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Dec 2022 01:10:09 +0800 X-OQ-MSGID: <20221214171014.1058709-4-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221214171014.1058709-1-quinkblack@foxmail.com> References: <20221214171014.1058709-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 3/8] avformat/file: dup file descriptor for pipe X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wccLMp4kdZqy From: Zhao Zhili --- libavformat/file.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/libavformat/file.c b/libavformat/file.c index a56be64342..878983a336 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -167,6 +167,36 @@ static int file_check(URLContext *h, int mask) return ret; } +static int fd_dup(URLContext *h, int oldfd) +{ + int newfd; + +#ifdef F_DUPFD_CLOEXEC + newfd = fcntl(oldfd, F_DUPFD_CLOEXEC, 0); +#else + newfd = dup(oldfd); +#endif + if (newfd == -1) + return newfd; + +#if HAVE_FCNTL + if (fcntl(newfd, F_SETFD, FD_CLOEXEC) == -1) + av_log(h, AV_LOG_DEBUG, "Failed to set close on exec\n"); +#endif + +#if HAVE_SETMODE + setmode(newfd, O_BINARY); +#endif + return newfd; +} + +static int file_close(URLContext *h) +{ + FileContext *c = h->priv_data; + int ret = close(c->fd); + return (ret == -1) ? AVERROR(errno) : 0; +} + #if CONFIG_FILE_PROTOCOL static int file_delete(URLContext *h) @@ -263,13 +293,6 @@ static int64_t file_seek(URLContext *h, int64_t pos, int whence) return ret < 0 ? AVERROR(errno) : ret; } -static int file_close(URLContext *h) -{ - FileContext *c = h->priv_data; - int ret = close(c->fd); - return (ret == -1) ? AVERROR(errno) : 0; -} - static int file_open_dir(URLContext *h) { #if HAVE_LSTAT @@ -397,9 +420,9 @@ static int pipe_open(URLContext *h, const char *filename, int flags) c->fd = fd; } -#if HAVE_SETMODE - setmode(c->fd, O_BINARY); -#endif + c->fd = fd_dup(h, c->fd); + if (c->fd == -1) + return AVERROR(errno); h->is_streamed = 1; return 0; } @@ -409,6 +432,7 @@ const URLProtocol ff_pipe_protocol = { .url_open = pipe_open, .url_read = file_read, .url_write = file_write, + .url_close = file_close, .url_get_file_handle = file_get_handle, .url_check = file_check, .priv_data_size = sizeof(FileContext),