From patchwork Mon May 4 18:22:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19499 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 4514944AD26 for ; Mon, 4 May 2020 21:23:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2B87968BEA1; Mon, 4 May 2020 21:23:32 +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 7712168BE58 for ; Mon, 4 May 2020 21:23:24 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id v4so629560wme.1 for ; Mon, 04 May 2020 11:23:24 -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 :mime-version:content-transfer-encoding; bh=nqvj4JzTaOocFsf0nblOBCnx1ykequ6Ufi1iu3fx7Go=; b=SBFovyMf+m0ZDvJalCcwu/HZUgyWtN1dgsCWtZrazDgjAAGZaRTOa8o2eN1pioYUfH zF8Iwi2HwYbCXlRyJylFwUgscNUMoUcPW5gXZd4UtZJdXbF96xJ8lLboWpT+1cb1m0jn qVhgvc/l0O0+LlNrqQHUXAqUNshk97xMzX2OBR5WTnnFnBU8ohCafQNOI2+Jqee9KmEJ HyJmRKnserEkfwWLuTWsiMeutMe1xra+YFo8cUssVsZQAMFPslA6jEqfeIVICyL28RQr TaVk2223Q7SpgnZgohkqyzug3svX+IMQbFTY879FybJLAisdyBX/KzxvcEHh9RQaNNBt c2hA== 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:mime-version:content-transfer-encoding; bh=nqvj4JzTaOocFsf0nblOBCnx1ykequ6Ufi1iu3fx7Go=; b=tCnS+5YNaoladW7fdJ+kNWCuyVnuUYUQzZZ7JwdJXVNmknlOP4Tdw0Xi+e4HDnFty2 pGqjaki3AuwkqLk+CW9Ydn9bO0tTn8AmK/J8WopPlvQXHpK17H+SEfwErfFXg2PAsDIj aT7DbcU5BW9sQ6xjfs/CX4XdQ88yC3zRHxGQbezlJbmucmWSWSfqI24GD3oX+9B8WrM7 M0n41B0mfL79ydZolhlkqKRDwqfLbZ2SNuo6zzvyW1FKH+TpXxIBOUlzoUzd8lakHCyJ 59hh+RV1EMgg53G1nGSad8d6lq9HyvoBNkQhENu3RPg3/7qRFNBqW+fVK5EGGttb3JQm yeHw== X-Gm-Message-State: AGi0PuZFj4Ra950SJUEDTjMgKkYSFWQyDYhDaWCgssZZ+Abo1OWjoFw7 J0rf4L0IPq6j+UArCUAZA6st9uXb X-Google-Smtp-Source: APiQypKinQiA+Go9yrxQ0kbx8T/+qHNpqBmtLijqO3iDTsNne58TaYcb9QX4wvlaUr7f21q7mjNrnQ== X-Received: by 2002:a1c:9891:: with SMTP id a139mr17345957wme.129.1588616603531; Mon, 04 May 2020 11:23:23 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id u188sm358595wmg.37.2020.05.04.11.23.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 11:23:22 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 May 2020 20:22:45 +0200 Message-Id: <20200504182250.26141-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200504182250.26141-1-andreas.rheinhardt@gmail.com> References: <20200504182250.26141-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/10] avformat/nutenc: Create put_* functions by macro 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" It allows to add analogous functions using e.g. the bytestream API instead of using an AVIOContext. Signed-off-by: Andreas Rheinhardt --- libavformat/nutenc.c | 49 ++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index ca433038d4..a75d9282fe 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -290,25 +290,35 @@ static int get_v_length(uint64_t val) return i; } -/** - * Put val using a variable number of bytes. - */ -static void put_v(AVIOContext *bc, uint64_t val) -{ - int i = get_v_length(val); - - while (--i > 0) - avio_w8(bc, 128 | (uint8_t)(val >> (7*i))); - - avio_w8(bc, val & 127); +#define PUT_FUNCTIONS(type, write, suffix) \ +/** \ + * Put val using a variable number of bytes. \ + */ \ +static void put_v##suffix(type dst, uint64_t val) \ +{ \ + int i = get_v_length(val); \ + \ + while (--i > 0) \ + write(dst, 128 | (uint8_t)(val >> (7*i))); \ + \ + write(dst, val & 127); \ +} \ + \ +static void put_tt##suffix(NUTContext *nut, AVRational *time_base, \ + type dst, uint64_t val) \ +{ \ + val *= nut->time_base_count; \ + val += time_base - nut->time_base; \ + put_v##suffix(dst, val); \ +} \ + \ +static void put_s##suffix(type dst, int64_t val) \ +{ \ + put_v##suffix(dst, 2 * FFABS(val) - (val > 0)); \ } -static void put_tt(NUTContext *nut, AVRational *time_base, AVIOContext *bc, uint64_t val) -{ - val *= nut->time_base_count; - val += time_base - nut->time_base; - put_v(bc, val); -} +PUT_FUNCTIONS(AVIOContext *, avio_w8,) + /** * Store a string as vb. */ @@ -320,11 +330,6 @@ static void put_str(AVIOContext *bc, const char *string) avio_write(bc, string, len); } -static void put_s(AVIOContext *bc, int64_t val) -{ - put_v(bc, 2 * FFABS(val) - (val > 0)); -} - static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc, uint64_t startcode) {