From patchwork Thu Aug 8 11:32:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 14314 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 43F02447C44 for ; Thu, 8 Aug 2019 14:40:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2B2D868AB25; Thu, 8 Aug 2019 14:40:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f66.google.com (mail-ot1-f66.google.com [209.85.210.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D317168A4A3 for ; Thu, 8 Aug 2019 14:40:46 +0300 (EEST) Received: by mail-ot1-f66.google.com with SMTP id o101so117238257ota.8 for ; Thu, 08 Aug 2019 04:40:46 -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=VPsq4JgS4VzsTHFfynBy7YDtVNdyBTe3sDty0D96//k=; b=P/+6I/EsEVXRLGbvAlke63J3AvVwbFHRR1SginQ5K1Z6lmoHntfdZH/QzifHlHTM8D JUjzjRGLe2DzvZMph6qyR8bzd9ceAyHvOtpuQro/7m9KxRFUfR9BsE+dJibUzHu0sWXm qrxLe0fBpx96HmsLqMvBmRspLup7JrtL/LLjOWejK1fF+xqmlpXHxBZppHTYdxmUVeYG WO84i62Ke9VgaoyYKrSZrGSpBFrm3bguq8UH3IxwRqesGBKOF22KUHYOThrgr61VH57F awOh3LR+NSDdOOmRslQYLsJV3mJi+ORmoUwXvO1uBHuV3+lSjj4JqB1KeZbHv0vnFD9g 8q5w== 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=VPsq4JgS4VzsTHFfynBy7YDtVNdyBTe3sDty0D96//k=; b=qJiDWJHd5knN7UQefARK1wpaKZNYzysn832zJ6np2vf0ABepPIkkUJ7Pq/VhLRfTbd yrSv8isaQ8WYr9ZJHFQ/BEec35e1W3WvOeLfD4bDkkygG5G9mQqJ9aKs23dlpm1KLP8t J29X4LnkvNcgn96bTHCDt9IOOekO3334rty8Hk0YIywSrGdgzKIO3QjqxNfrdI+GM7/g 7Otz3K100hwvYF1pU5HBq6y8EKkmk1PwLPedK+3CM9rHtMOx4krpgOPnPSHIVXaBBDWC 0vv910PmD4HdDuuXV+8bEKpaTEquXYuv2AZNM38uvRjftqxd8e5u2t3dHyinPm9v8+8f d3fQ== X-Gm-Message-State: APjAAAU4uhmxHbjwM5e0ujpww/SA2Q5GpIL0w9+IaA8VWgwGBS3EC+ET rAhOMSlaKeglmc7RItJe+doWEdWK X-Google-Smtp-Source: APXvYqxmJNfzQbyZPt8w36qiLnurI4M8K01Gv0BX28FsrlvkyuM/qwc43LPQ28J8yxPjyPCHFS36xg== X-Received: by 2002:a63:7887:: with SMTP id t129mr12447395pgc.309.1565263946298; Thu, 08 Aug 2019 04:32:26 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id q8sm2063040pjq.20.2019.08.08.04.32.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 04:32:25 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Aug 2019 19:32:20 +0800 Message-Id: <1565263941-20590-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1 1/2] lavf/avio: add a ffio_realloc_buf API for AVIO buffer realloc 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: tomajsjiang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: tomajsjiang Add new API ffio_realloc_buf for AVIO buffer realloc. Signed-off-by: Zhongxing Jiang --- libavformat/avio_internal.h | 9 +++++++++ libavformat/aviobuf.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 04c1ad5..eb628ac 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -87,6 +87,15 @@ int ffio_read_size(AVIOContext *s, unsigned char *buf, int size); int ffio_set_buf_size(AVIOContext *s, int buf_size); /** + * Reallocate a given buffer for AVIOContext. + * + * @param s the AVIOContext to realloc. + * @param buf_size required new buffer size. + * @return 0 on success, a negative AVERROR on failure. + */ +int ffio_realloc_buf(AVIOContext *s, int buf_size); + +/** * Ensures that the requested seekback buffer size will be available * * Will ensure that when reading sequentially up to buf_size, seeking diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 2d01102..3b59180 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1093,6 +1093,37 @@ int ffio_set_buf_size(AVIOContext *s, int buf_size) return 0; } +int ffio_realloc_buf(AVIOContext *s, int buf_size) +{ + uint8_t *buffer; + int data_size; + + if (!s->buffer_size) + return ffio_set_buf_size(s, buf_size); + + if (buf_size <= s->buffer_size) + return 0; + + buffer = av_malloc(buf_size); + if (!buffer) + return AVERROR(ENOMEM); + + data_size = s->write_flag ? (s->buf_ptr - s->buffer) : (s->buf_end - s->buf_ptr); + if (data_size > 0) + memcpy(buffer, s->write_flag ? s->buffer : s->buf_ptr, data_size); + av_free(s->buffer); + s->buffer = buffer; + s->orig_buffer_size = buf_size; + s->buffer_size = buf_size; + s->buf_ptr = s->write_flag ? (s->buffer + data_size) : s->buffer; + if (s->write_flag) + s->buf_ptr_max = s->buffer + data_size; + + s->buf_end = s->write_flag ? (s->buffer + s->buffer_size) : (s->buf_ptr + data_size); + + return 0; +} + static int url_resetbuf(AVIOContext *s, int flags) { av_assert1(flags == AVIO_FLAG_WRITE || flags == AVIO_FLAG_READ);