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