From: Neil Roberts <bpeeluk-at-yahoo.co.uk@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Cc: Michael Niedermayer <michael@niedermayer.cc>
Subject: [FFmpeg-devel] [PATCH v2 1/2] avformat/file: Add a specialized url_check callback for pipe protocol
Date: Tue, 30 Aug 2022 14:09:53 +0200
Message-ID: <20220830120954.452255-1-bpeeluk@yahoo.co.uk> (raw)
In-Reply-To: <20220829215422.GK2088045@pb2>
Using file_check for the pipe protocol doesn't make sense. For example,
for a URL like “pipe:0” it would end up checking whether the “pipe:0”
file exists. This patch instead makes it check the access modes on the
corresponding file descriptor using fcntl on *nix and DuplicateHandle on
Windows.
v2: Use DuplicateHandle on Windows to check whether the duplicated
handle can have the corresponding access flags.
Signed-off-by: Neil Roberts <bpeeluk@yahoo.co.uk>
---
libavformat/file.c | 74 ++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 71 insertions(+), 3 deletions(-)
diff --git a/libavformat/file.c b/libavformat/file.c
index 98c9e81bcb..b3f7bc9282 100644
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -375,9 +375,8 @@ const URLProtocol ff_file_protocol = {
#if CONFIG_PIPE_PROTOCOL
-static int pipe_open(URLContext *h, const char *filename, int flags)
+static int pipe_get_fd(const char *filename, int flags)
{
- FileContext *c = h->priv_data;
int fd;
char *final;
av_strstart(filename, "pipe:", &filename);
@@ -390,6 +389,14 @@ static int pipe_open(URLContext *h, const char *filename, int flags)
fd = 0;
}
}
+
+ return fd;
+}
+
+static int pipe_open(URLContext *h, const char *filename, int flags)
+{
+ FileContext *c = h->priv_data;
+ int fd = pipe_get_fd(filename, flags);
#if HAVE_SETMODE
setmode(fd, O_BINARY);
#endif
@@ -398,13 +405,74 @@ static int pipe_open(URLContext *h, const char *filename, int flags)
return 0;
}
+static int pipe_check(URLContext *h, int mask)
+{
+ int fd = pipe_get_fd(h->filename, mask);
+ int access = 0;
+
+#ifdef _WIN32
+
+ HANDLE pipe_handle = (HANDLE) _get_osfhandle(fd);
+ HANDLE tmp_handle;
+
+ if (pipe_handle == INVALID_HANDLE_VALUE)
+ return AVERROR(errno);
+
+ if (mask & AVIO_FLAG_READ &&
+ DuplicateHandle(GetCurrentProcess(), /* hSourceProcessHandle */
+ pipe_handle,
+ GetCurrentProcess(), /* hTargetProcessHandle */
+ &tmp_handle,
+ FILE_READ_DATA,
+ FALSE, /* bInheritHandle */
+ 0 /* options */)) {
+ access |= AVIO_FLAG_READ;
+ CloseHandle(tmp_handle);
+ }
+
+ if (mask & AVIO_FLAG_WRITE &&
+ DuplicateHandle(GetCurrentProcess(), /* hSourceProcessHandle */
+ pipe_handle,
+ GetCurrentProcess(), /* hTargetProcessHandle */
+ &tmp_handle,
+ FILE_WRITE_DATA,
+ FALSE, /* bInheritHandle */
+ 0 /* options */)) {
+ access |= AVIO_FLAG_WRITE;
+ CloseHandle(tmp_handle);
+ }
+
+#else /* _WIN32 */
+
+ int status_flags = fcntl(fd, F_GETFL);
+
+ if (status_flags == -1)
+ return AVERROR(errno);
+
+ switch (status_flags & O_ACCMODE) {
+ case O_RDONLY:
+ access = AVIO_FLAG_READ;
+ break;
+ case O_WRONLY:
+ access = AVIO_FLAG_WRITE;
+ break;
+ case O_RDWR:
+ access = AVIO_FLAG_READ | AVIO_FLAG_WRITE;
+ break;
+ }
+
+#endif /* _WIN32 */
+
+ return access & mask;
+}
+
const URLProtocol ff_pipe_protocol = {
.name = "pipe",
.url_open = pipe_open,
.url_read = file_read,
.url_write = file_write,
.url_get_file_handle = file_get_handle,
- .url_check = file_check,
+ .url_check = pipe_check,
.priv_data_size = sizeof(FileContext),
.priv_data_class = &pipe_class,
.default_whitelist = "crypto,data"
--
2.37.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2022-08-30 12:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220829144320.330685-1-bpeeluk.ref@yahoo.co.uk>
2022-08-29 14:43 ` [FFmpeg-devel] [PATCH " Neil Roberts
2022-08-29 14:43 ` [FFmpeg-devel] [PATCH 2/2] avformat/tests: Add a test for avio_check with the " Neil Roberts
2022-08-29 21:54 ` [FFmpeg-devel] [PATCH 1/2] avformat/file: Add a specialized url_check callback for " Michael Niedermayer
2022-08-30 12:09 ` Neil Roberts [this message]
2022-08-30 12:09 ` [FFmpeg-devel] [PATCH v2 2/2] avformat/tests: Add a test for avio_check with the " Neil Roberts
2022-11-09 14:31 ` [FFmpeg-devel] [PATCH v2 1/2] avformat/file: Add a specialized url_check callback for " Neil Roberts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220830120954.452255-1-bpeeluk@yahoo.co.uk \
--to=bpeeluk-at-yahoo.co.uk@ffmpeg.org \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=michael@niedermayer.cc \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git