From patchwork Thu May 27 15:34:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 27956 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp551759iof; Thu, 27 May 2021 08:36:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDhOpL2hZ6sMV/G1Io/bLzpcu9gMeq05X70calZ4D7FNLszsCu0uDFcMAAT4Teh2x+oJKZ X-Received: by 2002:a17:907:75e9:: with SMTP id jz9mr4410859ejc.314.1622129787220; Thu, 27 May 2021 08:36:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622129787; cv=none; d=google.com; s=arc-20160816; b=kNlZ1XtL/Qf9/xGE4nTw7Rx8E7X+aEVi3DZFc6mPSEHFMfaXW5fCrU26rokfKdcOmK nqYj3dPEgS0TAMWhyFR5DLWcQLKC/svoEJ+JcWtMDeaCAgrWFNJFviQqK52FRJyH8i2L w3U0jcW/DdbElUvLZnWgrsXyvOlPn28ZSGgXMyByWfeqbjfYVpAUJJQcPu0g9Wnos4sm XOQ9y1HgQ96t8JOxGnOZ5YyVPNf0kInMVIVbQJc84Xq3SCDpT3EvKvwWlb/Dv0yX53fv ceB3hRB75I/T3/9q8fjUWqqzSgB6naNjJQnoObHjlwFHW8T2ukKAXznYK0AZP1TLb7Jv wwlg== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=wtVq9bGDBB2amHL0tXtEZ+NkCJoULpgh8slOIcelPW8=; b=HwxDPpeeHO2nG7BQZTQSCsnI378wteOW/hGNgasTUrxbM009Hf6SosKzjZWrWUULPn Koq3yYsrMmKFNAasy2Aj6pRbgjjoMpMt4XCagf5533pvJX+G9q6Eq5hb88AiZ6d7Rsu+ QLHY2Mj1J1FJr0RPLjJFMDnxzRu4gOA8pWTQzhUkCj7ZL8BVXeUXjocctwwuaZqej6wa mQagPsC421TNQnfyhl6dkBC44sAfVpwj1jcPA9Im7FFVe9yUofcb3d96Tc/EOh27sTia etzAAU0aAXwp8+ahTD7FH7m369/7B7sxCmUAMp44ZfCq0/n9tuGikfUzSk3Z3rFe7di1 T8Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=SJdSyVia; 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 eb8si2820899edb.574.2021.05.27.08.36.26; Thu, 27 May 2021 08:36:27 -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=@foxmail.com header.s=s201512 header.b=SJdSyVia; 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 81370680AE7; Thu, 27 May 2021 18:36:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-64.mail.qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 399226807B4 for ; Thu, 27 May 2021 18:36:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1622129770; bh=bf/icVySOYMebeM04iwW5ndWkD67nUyGhAjtvUv+yHs=; h=From:To:Cc:Subject:Date; b=SJdSyViaDF6YEDPeqpB+NtCdrNKYTaEOurwRzlO8Dya7rcmuBVPLGekMn8I09YgLf E88ZXBSIAwUNvtDmVxsAvFSmMRyV9q4Rde+TD5+F2ZrGOwlaSLlfnzCSS3mslCk+pg ZE7iOhY+OlZvyKA1EyTu4CSZRXo60Jv3IZdaco0Q= Received: from localhost.localdomain ([113.87.131.216]) by newxmesmtplogicsvrszc6.qq.com (NewEsmtp) with SMTP id 8BB188AF; Thu, 27 May 2021 23:34:59 +0800 X-QQ-mid: xmsmtpt1622129699tg4ce7vpd Message-ID: X-QQ-XMAILINFO: NUgRyEi/6Ep4yJ8FvgEbx8LJdRAGRHPfEnwQGERJXHbx+vj+bhFu/tZUg4mL9y 0FJB2LThU8njv3SB7TXIR7QZidZX+CuSGr5uASeWfyam5aQzJN3opH/wJuDZq3JWL29l5n2Lu8Rg 3p31WLsjF5epayZK9wJparcGbAFmnjpQZnZZHdWE5ByCLLrBdyE8/n4sHqzZKVxg0ik7tVc0rBZI DFkKBfMVRqtkLBCX8B8H8s3IyPjZg3QO+cmMGZX2yZQeu9bj/Sl0hi+L18+2JNkJ+p6shSpurKb2 dnqEsY8g1gb5v8GyvPj4CrAUwxUXinCvkQ4ZvxpeQtrztRAMoMNkAGSQUJUAgBGccbf5YKkRA7vv TYjbL7u4ZbRqkunb/0KUX0F+YjSSdFyfCJlScEbxPmS0gGgiQG9Znzv/A3uSXoYYSjxd8USl9LhK NQZZ9od+w8jTARYNU7PBOnlxT/OECBckz7YaiN8TVtDMiqoRUK0R7uOjaTOlCftlxiavQ3Ku7hkT 6MofMNDO7FIiR1TyuldGODOhhtr7AMLHYbo86TlW2JqmXDfEEiY8WYbj1cCFvf8p0YZF0R9es57J VyS1r16yq852yg/1L0EjVR0TUaic/lGWBTRdIiU4dc3MYkGioaEWintixs+/zkTz6JVsAA8DA1LV 8Vi0+cEaT9xynvSa6DBZpiTc6N4pf3AZbzWTmVkaI+B4Deq25mohrf14vTKvsZ2/2upgObV/aMs3 VSE8Oeu/Is2ADv3aYjq37yMLghfxnVm0+fxwcz6LseeWsNTK6OYsaoRQFPmzdVel74R6wTCTjxm5 zowB+vRmyiz7a3xnejZeMIJu0BLqkUp3Y5WcWFqFU3x99i1pm1+iW0 From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 May 2021 23:34:55 +0800 X-OQ-MSGID: <20210527153455.74429-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/libsrt: log streamid in listener mode 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: y9PaCsPbraXL It's useful for test client which pass streamid to ffmpeg/ffplay. For example, use ffmpeg to test streamid support in VLC: ./ffmpeg -v info -re -i foo.mp4 -c copy -f mpegts -mode listener srt://127.0.0.1:9000 ./vlc srt://127.0.0.1:9000?streamid=foobar --- libavformat/libsrt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index c1e96f700e..6ea6c35c53 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -143,6 +143,8 @@ static const AVOption libsrt_options[] = { { NULL } }; +static int libsrt_getsockopt(URLContext *h, int fd, SRT_SOCKOPT optname, const char * optnamestr, void * optval, int * optlen); + static int libsrt_neterrno(URLContext *h) { int os_errno; @@ -224,6 +226,8 @@ static int libsrt_listen(int eid, int fd, const struct sockaddr *addr, socklen_t { int ret; int reuse = 1; + char streamid[512] = {}; + int streamid_len = sizeof(streamid); if (srt_setsockopt(fd, SOL_SOCKET, SRTO_REUSEADDR, &reuse, sizeof(reuse))) { av_log(h, AV_LOG_WARNING, "setsockopt(SRTO_REUSEADDR) failed\n"); } @@ -242,6 +246,8 @@ static int libsrt_listen(int eid, int fd, const struct sockaddr *addr, socklen_t return libsrt_neterrno(h); if (libsrt_socket_nonblock(ret, 1) < 0) av_log(h, AV_LOG_DEBUG, "libsrt_socket_nonblock failed\n"); + if (!libsrt_getsockopt(h, ret, SRTO_STREAMID, "SRTO_STREAMID", streamid, &streamid_len)) + av_log(h, AV_LOG_INFO, "accept streamid [%s], length %d\n", streamid, streamid_len); return ret; }