From patchwork Mon Jan 6 14:51:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17216 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 2CD5944B8A3 for ; Mon, 6 Jan 2020 17:00:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 161E468ABB4; Mon, 6 Jan 2020 17:00:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3AD6C687FFF for ; Mon, 6 Jan 2020 17:00:02 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id c9so49945758wrw.8 for ; Mon, 06 Jan 2020 07:00:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=880n1wx5Kvn/scPzesEh9Fzt8FMRdckKQuJkvlKQBUM=; b=p0E8O/2B/0yw9Rj4RGw1ZVg9dS/2rjt4msYsCjHcUL8jMRCc9lRfRvEl5FBNcvke/w 0cminwzT742N9wbsmA9ArhTeQ0HYH4HQdCtivkXm2I+z3lNK3nvQS6/Au6WXOyEZfc1K r5VUtG60RuEbKNftWMCgTlx6xexMNQMAsZPMaAOP94WZ52XaX4q4UgZzQn6Z0FlKNqaV KpSN7U61fJjGT6FUNMawFv/EghffEwWM1QOehtLE1YZR7ogNvbnFvaNwumHVSLCnI5pW DHkq9K5PtmDZCOhd5Yg00C2tvevrcsz3ahP+oPNHGSxdkPGgqsbdKBMCPUsksvfdkz0E dIAA== 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:mime-version :content-transfer-encoding; bh=880n1wx5Kvn/scPzesEh9Fzt8FMRdckKQuJkvlKQBUM=; b=RVnS2I+Xvt/bYc6XtoFi4j6yJ8URt4YVHu76nc4ze9dvK7VqnOTw1UY5fvr8aI1HxC bcHMJ/RVTFAbMnEtCAo8McpPcw35p2wMs2jIkwPPXkxXtc9ppKb/QRwY1TXLakNnzN2x JyhXWt/Y09BdfjlJbGOleXDJhv/fMXdyVvQ8uJVwfH71zfMhmFY8gvD9yboO6VeLuBKt GHEi/olRixi+k67W/WCZ4594jHYRiYHgWaTBlcwAqeKrW8MjJsRSLeg5jNNu+wZ9x56U ctF2s6A85TdYaW4/fTdowCfxH67N7b+iQeDFYnGIUMFfmsZyun3gT4f33Wb17sHWZ6+m tBXw== X-Gm-Message-State: APjAAAV7BBob3uEnOd/4z422xIkYsJah503D1FUdejkVqbSCL+LDhVTe a4FexOzsKZimfzwq7223s4Bn/84I X-Google-Smtp-Source: APXvYqzIObCbqWtSTwdbgQiK8mjf4RlbldZ7dWtSH3QDPlYcEHPMVza9+mPLTPHoDwQhTmzxxT40sw== X-Received: by 2002:adf:e5ca:: with SMTP id a10mr102510206wrn.347.1578322316446; Mon, 06 Jan 2020 06:51:56 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id t12sm72311964wrs.96.2020.01.06.06.51.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 06:51:55 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Jan 2020 15:51:48 +0100 Message-Id: <20200106145149.18688-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/aviobuf: Remove AVIOInternal and one level of indirection 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" In the Libav commit cae448cf, the opaque of every AVIOContext opened by ffio_fdopen() (which is used internally by avio_open() and avio_open2()) changed: It was a simple pointer to an URLContext before, but now it was a structure (namely AVIOInternal) containing a pointer to an URLContext as its only member. The next commits (namely 8c0ceafb and ec4c4839) added members to AVIOInternal to allow white-/blacklisting of protocols. But these two commits were never merged into FFmpeg (they were only merged as no-ops in 510046c2 and 063b26d3), because FFmpeg chose a different way to implement this (in 93629735); and so our AVIOInternal still has exactly one member. This of course means that it is unnecessary to use AVIOInternal as opaque as it is just adding a level of indirection (not only pointer dereference, but also wrapper functions). Therefore this commit removes AVIOInternal entirely and essentially reverts cae448cf. Signed-off-by: Andreas Rheinhardt --- libavformat/aviobuf.c | 86 ++++++++----------------------------------- 1 file changed, 15 insertions(+), 71 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 70e1d2ca10..0e2f038988 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -42,15 +42,10 @@ */ #define SHORT_SEEK_THRESHOLD 4096 -typedef struct AVIOInternal { - URLContext *h; -} AVIOInternal; - static void *ff_avio_child_next(void *obj, void *prev) { AVIOContext *s = obj; - AVIOInternal *internal = s->opaque; - return prev ? NULL : internal->h; + return prev ? NULL : s->opaque; } static const AVClass *ff_avio_child_class_next(const AVClass *prev) @@ -940,49 +935,8 @@ uint64_t ffio_read_varlen(AVIOContext *bc){ return val; } -static int io_read_packet(void *opaque, uint8_t *buf, int buf_size) -{ - AVIOInternal *internal = opaque; - return ffurl_read(internal->h, buf, buf_size); -} - -static int io_write_packet(void *opaque, uint8_t *buf, int buf_size) -{ - AVIOInternal *internal = opaque; - return ffurl_write(internal->h, buf, buf_size); -} - -static int64_t io_seek(void *opaque, int64_t offset, int whence) -{ - AVIOInternal *internal = opaque; - return ffurl_seek(internal->h, offset, whence); -} - -static int io_short_seek(void *opaque) -{ - AVIOInternal *internal = opaque; - return ffurl_get_short_seek(internal->h); -} - -static int io_read_pause(void *opaque, int pause) -{ - AVIOInternal *internal = opaque; - if (!internal->h->prot->url_read_pause) - return AVERROR(ENOSYS); - return internal->h->prot->url_read_pause(internal->h, pause); -} - -static int64_t io_read_seek(void *opaque, int stream_index, int64_t timestamp, int flags) -{ - AVIOInternal *internal = opaque; - if (!internal->h->prot->url_read_seek) - return AVERROR(ENOSYS); - return internal->h->prot->url_read_seek(internal->h, stream_index, timestamp, flags); -} - int ffio_fdopen(AVIOContext **s, URLContext *h) { - AVIOInternal *internal = NULL; uint8_t *buffer = NULL; int buffer_size, max_packet_size; @@ -996,14 +950,10 @@ int ffio_fdopen(AVIOContext **s, URLContext *h) if (!buffer) return AVERROR(ENOMEM); - internal = av_mallocz(sizeof(*internal)); - if (!internal) - goto fail; - - internal->h = h; - - *s = avio_alloc_context(buffer, buffer_size, h->flags & AVIO_FLAG_WRITE, - internal, io_read_packet, io_write_packet, io_seek); + *s = avio_alloc_context(buffer, buffer_size, h->flags & AVIO_FLAG_WRITE, h, + (int (*)(void *, uint8_t *, int)) ffurl_read, + (int (*)(void *, uint8_t *, int)) ffurl_write, + (int64_t (*)(void *, int64_t, int))ffurl_seek); if (!*s) goto fail; @@ -1023,30 +973,28 @@ int ffio_fdopen(AVIOContext **s, URLContext *h) (*s)->max_packet_size = max_packet_size; (*s)->min_packet_size = h->min_packet_size; if(h->prot) { - (*s)->read_pause = io_read_pause; - (*s)->read_seek = io_read_seek; + (*s)->read_pause = (int (*)(void *, int))h->prot->url_read_pause; + (*s)->read_seek = + (int64_t (*)(void *, int, int64_t, int))h->prot->url_read_seek; if (h->prot->url_read_seek) (*s)->seekable |= AVIO_SEEKABLE_TIME; } - (*s)->short_seek_get = io_short_seek; + (*s)->short_seek_get = (int (*)(void *))ffurl_get_short_seek; (*s)->av_class = &ff_avio_class; return 0; fail: - av_freep(&internal); av_freep(&buffer); return AVERROR(ENOMEM); } URLContext* ffio_geturlcontext(AVIOContext *s) { - AVIOInternal *internal; if (!s) return NULL; - internal = s->opaque; - if (internal && s->read_packet == io_read_packet) - return internal->h; + if (s->opaque && s->read_packet == (int (*)(void *, uint8_t *, int))ffurl_read) + return s->opaque; else return NULL; } @@ -1216,17 +1164,15 @@ int avio_open2(AVIOContext **s, const char *filename, int flags, int avio_close(AVIOContext *s) { - AVIOInternal *internal; URLContext *h; if (!s) return 0; avio_flush(s); - internal = s->opaque; - h = internal->h; + h = s->opaque; + s->opaque = NULL; - av_freep(&s->opaque); av_freep(&s->buffer); if (s->write_flag) av_log(s, AV_LOG_VERBOSE, "Statistics: %d seeks, %d writeouts\n", s->seek_count, s->writeout_count); @@ -1318,8 +1264,7 @@ int avio_read_to_bprint(AVIOContext *h, AVBPrint *pb, size_t max_size) int avio_accept(AVIOContext *s, AVIOContext **c) { int ret; - AVIOInternal *internal = s->opaque; - URLContext *sc = internal->h; + URLContext *sc = s->opaque; URLContext *cc = NULL; ret = ffurl_accept(sc, &cc); if (ret < 0) @@ -1329,8 +1274,7 @@ int avio_accept(AVIOContext *s, AVIOContext **c) int avio_handshake(AVIOContext *c) { - AVIOInternal *internal = c->opaque; - URLContext *cc = internal->h; + URLContext *cc = c->opaque; return ffurl_handshake(cc); }