From patchwork Fri Oct 30 11:01:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 23280 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 8849D44B216 for ; Fri, 30 Oct 2020 13:01:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61BBF68A0D3; Fri, 30 Oct 2020 13:01:31 +0200 (EET) 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 2679F6897CD for ; Fri, 30 Oct 2020 13:01:25 +0200 (EET) Received: by mail-wm1-f45.google.com with SMTP id h22so2568753wmb.0 for ; Fri, 30 Oct 2020 04:01:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=KfwZDizSPNFpf/W+wyx0t6Bxr4Xm5870WxHMoCXDIfo=; b=bz+FaxutgqlIyVLYxPWVDcVGX6bFe0D8nrTGHgwuKCEpCdsJsTJRwLyWhw8Pi/ulVV CzbfaEgRSUHvu38d1WytIXw0xAvjsJQT1sFDdyAYQ68oBME/X9U8OXfejMvvgXp5n1Y8 mpK4V2ClciMIC03DFUfzr4/JTrh7nsZ6TRpdjaJb2gnTNH2NxpzZ42oD1ii9uYUsi0mW jiPAeYw53n/CJ5UC17H6FTfC9ZFUuHnn+9V/evkyppdRlrsWYPufVsPoMa8y4SBUMx1/ GQVP11ftvLT2UbQp2fp01EJgn2vI1gZKzCgZS2Ln9CGMr5t48BbOZhojfZhVUZNeM3q7 TY/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=KfwZDizSPNFpf/W+wyx0t6Bxr4Xm5870WxHMoCXDIfo=; b=pejLR3NTpEe7xVdXZ62cfgsJt3fBohlrmgz59L+GnzMf9udZL5+8C3atDN9T73wREQ fKg4WPhh2kDblrmgpaKycCwzaX3edcb+c84/6ifcuImy8TS9Vv7OCxRIEW4H+WKWeliy q6+6i72UR0E7/1iJUI9xTs/tHoTM+Qbhf+ICDBut84Tl+por1qhNUAkyN2RLh0HrDqIF bCpVgtxdBi4U51QnIz6hkauCMmtqu9PcL+kwYoBkm2RobN0VdezvHLCmPlHOs5t0dTBD WBUJKp7YP4c1V1rHyeytmoVsncOauLh75EWV3B5Hhzxsl9YF/bPOneh8F+YBGYM33Amj /SbQ== X-Gm-Message-State: AOAM532uPDcj6OQA9LyITvCJIrCO/9w7+xnZdHoH0Jq/K2nrVb/eHQpm 3aw+db1+tFzNu7oe+6sWxCxkkQHfz11fBdeU X-Google-Smtp-Source: ABdhPJxUDv+jQyIvMxFfqaC3iUVlx0BkKswEyYsRgtBV5w6PEuciS2rAAXpGmn4KXz/ei8HGd6flWg== X-Received: by 2002:a7b:c18d:: with SMTP id y13mr1966410wmi.120.1604055683888; Fri, 30 Oct 2020 04:01:23 -0700 (PDT) Received: from localhost (host-96-177.parnet.fi. [77.234.96.177]) by smtp.gmail.com with ESMTPSA id u3sm8719787wro.33.2020.10.30.04.01.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 30 Oct 2020 04:01:23 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Oct 2020 13:01:20 +0200 Message-Id: <20201030110122.26502-1-martin@martin.st> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] tls: Share code for common protocol functions and fields 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/tls.h | 13 +++++++++++++ libavformat/tls_gnutls.c | 11 ++--------- libavformat/tls_libtls.c | 11 ++--------- libavformat/tls_mbedtls.c | 11 ++--------- libavformat/tls_openssl.c | 11 ++--------- libavformat/tls_schannel.c | 11 ++--------- libavformat/tls_securetransport.c | 11 ++--------- 7 files changed, 25 insertions(+), 54 deletions(-) diff --git a/libavformat/tls.h b/libavformat/tls.h index beb19d6d55..4f3315427d 100644 --- a/libavformat/tls.h +++ b/libavformat/tls.h @@ -51,6 +51,19 @@ typedef struct TLSShared { {"listen", "Listen for incoming connections", offsetof(pstruct, options_field . listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = TLS_OPTFL }, \ {"verifyhost", "Verify against a specific hostname", offsetof(pstruct, options_field . host), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL } +#define TLS_COMMON_PROTOCOL_FUNCTIONS \ +static int tls_get_file_handle(URLContext *h) \ +{ \ + TLSContext *c = h->priv_data; \ + return ffurl_get_file_handle(c->tls_shared.tcp); \ +} + +#define TLS_COMMON_PROTOCOL_FIELDS \ + .url_get_file_handle = tls_get_file_handle, \ + .priv_data_size = sizeof(TLSContext), \ + .flags = URL_PROTOCOL_FLAG_NETWORK, \ + .priv_data_class = &tls_class + int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AVDictionary **options); void ff_gnutls_init(void); diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c index 0c4ef34f5f..b971f1015a 100644 --- a/libavformat/tls_gnutls.c +++ b/libavformat/tls_gnutls.c @@ -263,11 +263,7 @@ static int tls_write(URLContext *h, const uint8_t *buf, int size) return print_tls_error(h, ret); } -static int tls_get_file_handle(URLContext *h) -{ - TLSContext *c = h->priv_data; - return ffurl_get_file_handle(c->tls_shared.tcp); -} +TLS_COMMON_PROTOCOL_FUNCTIONS static const AVOption options[] = { TLS_COMMON_OPTIONS(TLSContext, tls_shared), @@ -287,8 +283,5 @@ const URLProtocol ff_tls_protocol = { .url_read = tls_read, .url_write = tls_write, .url_close = tls_close, - .url_get_file_handle = tls_get_file_handle, - .priv_data_size = sizeof(TLSContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &tls_class, + TLS_COMMON_PROTOCOL_FIELDS, }; diff --git a/libavformat/tls_libtls.c b/libavformat/tls_libtls.c index dff7f2d9fb..b7709dd954 100644 --- a/libavformat/tls_libtls.c +++ b/libavformat/tls_libtls.c @@ -175,11 +175,7 @@ static int ff_tls_write(URLContext *h, const uint8_t *buf, int size) return AVERROR(EIO); } -static int tls_get_file_handle(URLContext *h) -{ - TLSContext *c = h->priv_data; - return ffurl_get_file_handle(c->tls_shared.tcp); -} +TLS_COMMON_PROTOCOL_FUNCTIONS static const AVOption options[] = { TLS_COMMON_OPTIONS(TLSContext, tls_shared), @@ -199,8 +195,5 @@ const URLProtocol ff_tls_protocol = { .url_read = ff_tls_read, .url_write = ff_tls_write, .url_close = ff_tls_close, - .url_get_file_handle = tls_get_file_handle, - .priv_data_size = sizeof(TLSContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &tls_class, + TLS_COMMON_PROTOCOL_FIELDS, }; diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c index 965adf1be4..6d7bef7572 100644 --- a/libavformat/tls_mbedtls.c +++ b/libavformat/tls_mbedtls.c @@ -320,11 +320,7 @@ static int tls_write(URLContext *h, const uint8_t *buf, int size) return handle_tls_error(h, "mbedtls_ssl_write", ret); } -static int tls_get_file_handle(URLContext *h) -{ - TLSContext *c = h->priv_data; - return ffurl_get_file_handle(c->tls_shared.tcp); -} +TLS_COMMON_PROTOCOL_FUNCTIONS static const AVOption options[] = { TLS_COMMON_OPTIONS(TLSContext, tls_shared), \ @@ -345,8 +341,5 @@ const URLProtocol ff_tls_protocol = { .url_read = tls_read, .url_write = tls_write, .url_close = tls_close, - .url_get_file_handle = tls_get_file_handle, - .priv_data_size = sizeof(TLSContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &tls_class, + TLS_COMMON_PROTOCOL_FIELDS, }; diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 002197fa76..802f29c980 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -345,11 +345,7 @@ static int tls_write(URLContext *h, const uint8_t *buf, int size) return print_tls_error(h, ret); } -static int tls_get_file_handle(URLContext *h) -{ - TLSContext *c = h->priv_data; - return ffurl_get_file_handle(c->tls_shared.tcp); -} +TLS_COMMON_PROTOCOL_FUNCTIONS static const AVOption options[] = { TLS_COMMON_OPTIONS(TLSContext, tls_shared), @@ -369,8 +365,5 @@ const URLProtocol ff_tls_protocol = { .url_read = tls_read, .url_write = tls_write, .url_close = tls_close, - .url_get_file_handle = tls_get_file_handle, - .priv_data_size = sizeof(TLSContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &tls_class, + TLS_COMMON_PROTOCOL_FIELDS, }; diff --git a/libavformat/tls_schannel.c b/libavformat/tls_schannel.c index 4bfaa85228..fef516ca94 100644 --- a/libavformat/tls_schannel.c +++ b/libavformat/tls_schannel.c @@ -583,11 +583,7 @@ done: return ret < 0 ? ret : outbuf[1].cbBuffer; } -static int tls_get_file_handle(URLContext *h) -{ - TLSContext *c = h->priv_data; - return ffurl_get_file_handle(c->tls_shared.tcp); -} +TLS_COMMON_PROTOCOL_FUNCTIONS static const AVOption options[] = { TLS_COMMON_OPTIONS(TLSContext, tls_shared), @@ -607,8 +603,5 @@ const URLProtocol ff_tls_protocol = { .url_read = tls_read, .url_write = tls_write, .url_close = tls_close, - .url_get_file_handle = tls_get_file_handle, - .priv_data_size = sizeof(TLSContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &tls_class, + TLS_COMMON_PROTOCOL_FIELDS }; diff --git a/libavformat/tls_securetransport.c b/libavformat/tls_securetransport.c index 3250b23051..de0a317cba 100644 --- a/libavformat/tls_securetransport.c +++ b/libavformat/tls_securetransport.c @@ -390,11 +390,7 @@ static int tls_write(URLContext *h, const uint8_t *buf, int size) return print_tls_error(h, ret); } -static int tls_get_file_handle(URLContext *h) -{ - TLSContext *c = h->priv_data; - return ffurl_get_file_handle(c->tls_shared.tcp); -} +TLS_COMMON_PROTOCOL_FUNCTIONS static const AVOption options[] = { TLS_COMMON_OPTIONS(TLSContext, tls_shared), @@ -414,8 +410,5 @@ const URLProtocol ff_tls_protocol = { .url_read = tls_read, .url_write = tls_write, .url_close = tls_close, - .url_get_file_handle = tls_get_file_handle, - .priv_data_size = sizeof(TLSContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &tls_class, + TLS_COMMON_PROTOCOL_FIELDS }; From patchwork Fri Oct 30 11:01:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 23281 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 58E2D44B216 for ; Fri, 30 Oct 2020 13:01:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3BA5F68A20A; Fri, 30 Oct 2020 13:01:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14FD868025F for ; Fri, 30 Oct 2020 13:01:31 +0200 (EET) Received: by mail-wm1-f52.google.com with SMTP id e2so2558775wme.1 for ; Fri, 30 Oct 2020 04:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=wy+uOP4KoOe4YBvvr+sExFy9KWbdSMRHah1BdAZ/O4M=; b=dAR+86wpmKHdjcQRPSZgVwrmdMfkRRGAb0RN+iwZEpon8BOTD0FRmV+3CAeQZZdUXm wyDkdg0qqJuOp0HuTvprDlLLdVyi9FXyzjURbYMp/3dWEZDQwT1SJX3wYO5pgV2tehao LHvAN6ReEpwehb4eyG3ZODqwCf7hdSC45VFi/oHulmnL3zy975UKrce1PumFH7FV+H2X 2uHjBm3c/BYZ+YNfLrOaPskrnokPDqdoyg9zJE6dBfp+OxE8n53d3wngGuoqy4iXZtW4 VSSDPRyaYVT8NGrE0rJf2V3YSaAJrwMdHauSe7QJoyOQR66SYRMlRaQAGOGLfIon5Fzf wNHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wy+uOP4KoOe4YBvvr+sExFy9KWbdSMRHah1BdAZ/O4M=; b=Hzw9IVxH5qTkjkky6gAGrEINtYVHMZXz8MsmFc45YW/WSFvCWzXvBhH22Ne8jrhvIA jk/cBxURht5BO5ApzPrd3eUhvox5C1UgTkgWlZc/Ae1MuQJoamzFq8+n/ng6/IwAWLss /p82WZUovhUUf9LnFl5Or+TnHWv/0VK+vpAFPvwWNGcVZaXqwYfPwxcFYcS7yw72xNGt CTX7GlQpICLqAw3PbONGHbV+fEiHkheJz3Y9WdexNFhSZFkbpOnEnChIC2kIASG3fHAm UzobV3Pd8FoLq/tSD5Wr5c5G7x4qvQhMGY0hAlf3k4nyUwDWIbs4/xH2lg1tWZ4bf33E qVoQ== X-Gm-Message-State: AOAM5302ru4fDgnnWjCoMyySf6v4mqPuGiskInzoguI9nniNgksska+7 0KgQ/6HrcxdLH1BXFZxY2ikN1TbkqtotLzxQ X-Google-Smtp-Source: ABdhPJxt+n24PIX76tsUhHUb4hlobwcvQ6XHyhijfn0poqM4/JZoI/1uSvCXkjiuTc0Yo+KFbvwecQ== X-Received: by 2002:a1c:60d4:: with SMTP id u203mr1970725wmb.103.1604055686156; Fri, 30 Oct 2020 04:01:26 -0700 (PDT) Received: from localhost (host-96-177.parnet.fi. [77.234.96.177]) by smtp.gmail.com with ESMTPSA id g66sm4354402wmg.37.2020.10.30.04.01.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 30 Oct 2020 04:01:24 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Oct 2020 13:01:21 +0200 Message-Id: <20201030110122.26502-2-martin@martin.st> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201030110122.26502-1-martin@martin.st> References: <20201030110122.26502-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] tls: Hook up the url_get_short_seek function in the TLS backends 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This makes sure that small seeks forward on https don't end up doing new requests. --- libavformat/tls.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/tls.h b/libavformat/tls.h index 4f3315427d..d33af80454 100644 --- a/libavformat/tls.h +++ b/libavformat/tls.h @@ -56,10 +56,17 @@ static int tls_get_file_handle(URLContext *h) \ { \ TLSContext *c = h->priv_data; \ return ffurl_get_file_handle(c->tls_shared.tcp); \ +} \ +static int tls_get_short_seek(URLContext *h) \ +{ \ + TLSContext *s = h->priv_data; \ + return ffurl_get_short_seek(s->tls_shared.tcp); \ } + #define TLS_COMMON_PROTOCOL_FIELDS \ .url_get_file_handle = tls_get_file_handle, \ + .url_get_short_seek = tls_get_short_seek, \ .priv_data_size = sizeof(TLSContext), \ .flags = URL_PROTOCOL_FLAG_NETWORK, \ .priv_data_class = &tls_class From patchwork Fri Oct 30 11:01:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 23282 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 B6F2844AC19 for ; Fri, 30 Oct 2020 13:07:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B38E68A5A8; Fri, 30 Oct 2020 13:07:38 +0200 (EET) 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 39FA168A5B5 for ; Fri, 30 Oct 2020 13:07:32 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id x7so6007527wrl.3 for ; Fri, 30 Oct 2020 04:07:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3Ef/8FZmTpzCiWENCAcEYiliqoNlrBDoVmfZOAqHqSg=; b=xqwFtRLGsmZw0g1AXn8p35jV/+yF+LbuzrsfcnkNsODYYGUvhqwV8vnYdaVyqQcjOI nKGyPFJNNgQW49CkizXKZW6oib4xU4alctG5kMNdD8uevA5B0HvoBAEdp24zNZccGa67 B1n4IABFLdk3kUG8rfQszD1bHzevR8vejjIH5wDRd3J4UaEGtZ2TnD7PBfCKzT/jF3IX PyCGAyiLFeyf+r9wWzFzmGv5Avlzc2IS9ZiiPmz3Qw5rc85wtu2ijvCDXDov9g0ahNSW II2wQliUSTdL6NKKtZ1pF1kEk0SIcOXv+5uZxK6Wrztoh1OKTzjP7HjZogaJFocyP65Q QxxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3Ef/8FZmTpzCiWENCAcEYiliqoNlrBDoVmfZOAqHqSg=; b=YLO3IZKQW69hoix6i0X3S6iXcxNsAaw+9prYUjDDPPnnFnuo6MG74QuoKSDluY9a5S bslQS1FF8qarZDXk1AIHbSGIJ19P86mLrDGdxnsFkyljv+A5nc9X8Wwl9pIdDfzdBXsq WmEBJBBV/3j2f2e9YqkStOyHC+MgKAt+Qbw7c9Hy30V9twIB2KyPXiXWbXpT7xuJs0q6 uwJA+3CtdLUchj3uqXL4oRI5rN6v09QI6dYh1ZTzLu8ql9T8KC0PYAfNwJ7R5SBV2Kcm HzgLN2mdA+MrH778Xpa8C2uWcL0MFeqHKeY5HypwCTxR8YWyvdMxXzYi7/jn7KHPL31h Rn0A== X-Gm-Message-State: AOAM533Si1QQv8yAdgXcWuhzIosswVF0d1UREcplDRnLdGBhqpGVJoVt kf1IApZBeoFx3t58Ed1rQ/t1duKCUD3t9tA3 X-Google-Smtp-Source: ABdhPJyJpmML6T3cE/ayOBBZ7WsYLgvjiAZHfIZrsCWcIHF+kqlRp2h/HdHxaidB096getgaSIG8wA== X-Received: by 2002:adf:f142:: with SMTP id y2mr2331741wro.160.1604055689600; Fri, 30 Oct 2020 04:01:29 -0700 (PDT) Received: from localhost (host-96-177.parnet.fi. [77.234.96.177]) by smtp.gmail.com with ESMTPSA id y201sm4540487wmd.27.2020.10.30.04.01.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 30 Oct 2020 04:01:29 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Oct 2020 13:01:22 +0200 Message-Id: <20201030110122.26502-3-martin@martin.st> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201030110122.26502-1-martin@martin.st> References: <20201030110122.26502-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] aviobuf: Increase the default SHORT_SEEK_THRESHOLD to 32 KB 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The previous threshold, 4 KB, maybe was reasonable when it was set (in 2010), but in today's settings and with typical network speeds and data sizes, it's pretty small. 32 KB probably is a more reasonable default now, regardless of input. --- libavformat/aviobuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index a77517d712..e1acb3890c 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -40,7 +40,7 @@ * data instead of calling the protocol seek function, for seekable * protocols. */ -#define SHORT_SEEK_THRESHOLD 4096 +#define SHORT_SEEK_THRESHOLD 32768 static void *ff_avio_child_next(void *obj, void *prev) {