From patchwork Sat Jul 18 11:56:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 21165 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 10B67447829 for ; Sat, 18 Jul 2020 14:56:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED57268B761; Sat, 18 Jul 2020 14:56:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A1FF68B757 for ; Sat, 18 Jul 2020 14:56:36 +0300 (EEST) Received: by mail-wm1-f45.google.com with SMTP id c80so18157159wme.0 for ; Sat, 18 Jul 2020 04:56:36 -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=7j2cjbbrEGKJbWmtGOKWlWnbHrzqhQOIYffFZ+DBKTA=; b=l0VeJQQoG3AJMQ97iCMBcE4j1ystf92ez9ucPqoyDp8y/Oz9ke2nPrRYOKpd0/hLr0 eWEcNbqOipY7MFbiHuXGkXvzArNnTtT9J+/MUOmijUVmXpGG2r7+Wjxn8VS9C5zcLEk+ q4xBNX1E93ur4WTVADz4wgCErhzRsGXLd/mH/e4njbT/idPRWB4vHSvT1Zmb71AOkc+E r62urgUWXY9UpPEZQRFLXKfYwUz9uwXVK6rnVueCIzXNi5LPezj3DQoshOCB8cyHWQr2 pe62Hy7wX5ygQtxk4hA00Ln5TkqwKOCIhe42xwRqxxmkf6LJRLaEDo28uAtz3Ryk6WwQ tbEg== 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=7j2cjbbrEGKJbWmtGOKWlWnbHrzqhQOIYffFZ+DBKTA=; b=lKbMDAi9H1Zc6xkbGeFf3jQAzrFqXK8EyT4nK+Q5GaeTiaMseuBHVoDx5pT9Sg+MO0 f7MPaXPzUquSqwzWtCny5mMiUV85TpdN31lmE9xhKdLLILa9SXHqSBD3mWAyBLnT0POz +TKkGTm+PWfvKPgA3v5j4F29wUmsVqFr0iJzkIjzArzK+OPYBEl/gTnzglQe1VoNiG50 T7XHvJyvSZ6ldJdapd17FSLKnwRt+By/+HP/DV+nlAtDZnzTQnlGjY1d2oGzJE04j4K7 1UN4C43OBk1jK58vXqKI45FR4pf+A8J+nob5WA+FQMbwX/JCmOP+jAh1GmyTobo4hRrr UNTA== X-Gm-Message-State: AOAM531e2FV3SuURuPdck1WMSrs+lwJDmx/NUnjj8gw2Q0qvfj6VQ5MK 0oz9I9w9o8cD8n9XkJ/gLz2PtL7p X-Google-Smtp-Source: ABdhPJwLmdD8fE+qdZ0MdlrGcnugVPnqR3BO46MgMQVUhK9C0BOPhlyfV1FEgjOztuuLpGdj/dIJFA== X-Received: by 2002:a05:600c:218f:: with SMTP id e15mr12564827wme.63.1595073395596; Sat, 18 Jul 2020 04:56:35 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id 68sm20015591wmz.40.2020.07.18.04.56.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Jul 2020 04:56:35 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Jul 2020 19:56:23 +0800 Message-Id: <1595073385-29007-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 1/3] doc/http: Update HTTP protocol options 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao remove the timeout option docs part for HTTP protocol and add auth_type option part. Signed-off-by: Jun Zhao --- doc/protocols.texi | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/doc/protocols.texi b/doc/protocols.texi index 64ad3f0..7b3df96 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -392,11 +392,6 @@ string describing the libavformat build. ("Lavf/") @item user-agent This is a deprecated option, you can use user_agent instead it. -@item timeout -Set timeout in microseconds of socket I/O operations used by the underlying low level -operation. By default it is set to -1, which means that the timeout is -not specified. - @item reconnect_at_eof If set then eof is treated like an error and causes reconnection, this is useful for live / endless streams. @@ -481,6 +476,28 @@ Send an Expect: 100-continue header for POST. If set to 1 it will send, if set to 0 it won't, if set to -1 it will try to send if it is applicable. Default value is -1. +@item auth_type + +Set HTTP authentication type. No option for Digest, since this method requires +getting nonce parameters from the server first and can't be used straight away like +Basic. + +@table @option +@item none +Choose the HTTP authentication type automatically. This is the default. +@item basic + +Choose the HTTP basic authentication. + +Basic authentication sends a Base64-encoded string that contains a user name and password +for the client. Base64 is not a form of encryption and should be considered the same as +sending the user name and password in clear text (Base64 is a reversible encoding). +If a resource needs to be protected, strongly consider using an authentication scheme +other than basic authentication. HTTPS/TLS should be used with basic authentication. +Without these additional security enhancements, basic authentication should not be used +to protect sensitive or valuable information. +@end table + @end table @subsection HTTP Cookies From patchwork Sat Jul 18 11:56:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 21166 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 190CF447829 for ; Sat, 18 Jul 2020 14:56:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 03F7268B76A; Sat, 18 Jul 2020 14:56:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B8F8968B757 for ; Sat, 18 Jul 2020 14:56:36 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id f139so20910250wmf.5 for ; Sat, 18 Jul 2020 04:56:36 -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:in-reply-to:references; bh=XpojcvxxEST9yM/+5VThOUOgcnKNYRTyxq2l8HQfJXs=; b=fva2v2U+Bnfs22VEXqzjhl6KVixOhUxHgYLRv28TLlpH34ycDlbLdmwkXTdc6Vn/R7 DJ9l4FpYYdC62xDub5ZDthdVSg2Y1HRaS2L0M6v4QMZseLg0wUb01/q3lcTz0hsEXOxV UpOU+Kc7sbWwZK2x+RcU3IUFynfbl5evxm/BopfU5Fv0wbWSpULjvmNk4j0qF/C1iHni aVEcpPvprBjgrZIQwpeddvnr5YeV9bJw+qbuVP4dJGlWFEFG+E4IGy1jeMGgcKQ2edEU QStfPX5hLq07XAPMXpKEvPKgV63IQdE6xWElu9aOrfBkR6FyfHb38NwJXleQ6u8qgZBf vIjg== 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:in-reply-to :references; bh=XpojcvxxEST9yM/+5VThOUOgcnKNYRTyxq2l8HQfJXs=; b=UlvtZja9DINujlUURuas6N+p+nR/xM9jME06asKL94XxzT84/o5Ba5JV5gXPJIqFfU zZBKg44AjYMI63QHZSaS0Nt55cr51mAlAQRLfngiQBSvhs1xa0huUIBg/P2YIIZsgG7C 6MRBiMWj2koWOTkU5usS9AzqLLMOX4GMbSDudAALzK+De78OwhWlzzyhnviKiwg648zx gr9TGLIExPye7ELpw84MICppWiGXMihql+yK3kDQGBaCr2M+qJvU5LY+U1Xd5M7Tl08k pyFR2hFbDNgy4AlEahMNZpqLEkkipdbDDkd2cJTcmoxWnmZxPTuMZT6pwZYKhTro3W75 OAsA== X-Gm-Message-State: AOAM530gVoUS3VECGE8qZ/KWcss1J+oNPDQAygAQzfPfp7PF5OmMtJHx t7PYDo1KpuueWRG3nt2BkGfDFH8y X-Google-Smtp-Source: ABdhPJx3ii/0wUX47WbHf9pKhNE5DNj6mWgyLanNl73r6pBk4AEJGpViKoziJjloPtVGRkeNxP7+ew== X-Received: by 2002:a1c:2602:: with SMTP id m2mr14096818wmm.50.1595073396173; Sat, 18 Jul 2020 04:56:36 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id 68sm20015591wmz.40.2020.07.18.04.56.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Jul 2020 04:56:35 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Jul 2020 19:56:24 +0800 Message-Id: <1595073385-29007-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1595073385-29007-1-git-send-email-mypopydev@gmail.com> References: <1595073385-29007-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] lavf/hls: enable custom interrup callback in sub-demuxer 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Enable the custom callback in sub-demuxer Signed-off-by: Jun Zhao --- libavformat/hls.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/hls.c b/libavformat/hls.c index ba17c4e..cf0b71d 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1984,6 +1984,7 @@ static int hls_read_header(AVFormatContext *s) read_data, NULL, NULL); pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4; pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s->max_analyze_duration : 4 * AV_TIME_BASE; + pls->ctx->interrupt_callback = s->interrupt_callback; url = av_strdup(pls->segments[0]->url); ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0, 0); av_free(url); From patchwork Sat Jul 18 11:56:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 21167 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D9BCA447821 for ; Sat, 18 Jul 2020 15:19:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B1A4468B436; Sat, 18 Jul 2020 15:19:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2221689ED4 for ; Sat, 18 Jul 2020 15:19:16 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id a6so13694634wrm.4 for ; Sat, 18 Jul 2020 05:19:16 -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:in-reply-to:references; bh=YYy3sqbNaypUcAgwPyd6rklak36dTWWTD+dTd6e1/U4=; b=SMciMv/aCsC2s+9wHUVh/7WltPTlFy0d3oEVjLEJ8ePNPTjjnrCi7m5ahFIpffSBxY aGEMnd9yKwthuod50wDOeWQmY0lrJJFebZd29tnZpZxUhpBppE0Ru67q6RRxYnEaCE7E VqOkodogVh/vdslWkueflZHIZSyHrToOxYOtxspv0SgLQTzTnl++5eD161Xr3e6wVQU1 M6ZikT9s4CrCmfVhqKamR3mbzSEbGT9OsZ1CuPNs1IdBqkvMfAAuhuBsqGtBtQbwL1oz f8XX0MmC6FAmjlSmCeWDHRKJOBqQYTA0/ermjq8z2xamo2g3rtCCqICjVI+6cOa0Kqqo UbnQ== 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:in-reply-to :references; bh=YYy3sqbNaypUcAgwPyd6rklak36dTWWTD+dTd6e1/U4=; b=fvKIGUbXfPDKv81CnZErcsr7M2yMmtutSiV0hEFVnHdQdBOpZdY6xbYfHOIauxQwkc Y1M3ikAYeYN6VeWglf8PU+1bqDjqdczwfTyM4xn8Lcnf1cCehJGCKLLyN1oXNFRzHXYc MHDdT53OM1BcRum91WOwZ75hHdhetax6X+NsS2J1CF18MhOG0/328Hk27XEGcsJBwqnx Sz5kpZaIfr/C4ILOn4FQ1F8Q9mUZlG4wnmpN5l8ClB+d0HyKe+yUtCY5DeHOvKRxvor2 Ha1yWNwlVk0u1S0UK7gFPXF8t6KCGTzPkTBfDYF+Jur/r8RMnbNUG4EC5e1slulWvVOD rNSA== X-Gm-Message-State: AOAM533+eO/iQW2LQWe465qNFNTXLk/MbaHrjr27nQY2IjrZeJgnxTfy Dfh2mmSveGZhxnq2ZOFz8sFSgX4k X-Google-Smtp-Source: ABdhPJy9ZmYELltB3K3QeL+HTu/D+LjwtlCmz2k9kWT8hRqiglPgHT8z6h8FLk312MPWJE1VBctgQQ== X-Received: by 2002:a5d:6a8d:: with SMTP id s13mr5351465wru.201.1595073396954; Sat, 18 Jul 2020 04:56:36 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id 68sm20015591wmz.40.2020.07.18.04.56.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Jul 2020 04:56:36 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Jul 2020 19:56:25 +0800 Message-Id: <1595073385-29007-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1595073385-29007-1-git-send-email-mypopydev@gmail.com> References: <1595073385-29007-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] lavf/dashdec: enable custom interrup callback in sub-demuxer 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Enable the custom callback in sub-demuxer Signed-off-by: Jun Zhao --- libavformat/dashdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 694782c..c5a5ff6 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1943,6 +1943,7 @@ static int reopen_demux_for_component(AVFormatContext *s, struct representation pls->ctx->flags = AVFMT_FLAG_CUSTOM_IO; pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4; pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s->max_analyze_duration : 4 * AV_TIME_BASE; + pls->ctx->interrupt_callback = s->interrupt_callback; ret = av_probe_input_buffer(&pls->pb, &in_fmt, "", NULL, 0, 0); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Error when loading first fragment, playlist %d\n", (int)pls->rep_idx);