From patchwork Fri Sep 7 08:03:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jay@wizardofthenet.com X-Patchwork-Id: 10265 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp1316938jap; Fri, 7 Sep 2018 01:03:59 -0700 (PDT) X-Google-Smtp-Source: ANB0VdarXqQnd7Rzqs3B07fwo7Cgn8ozDBGNlb7AuyfT1MUAFznv3ajh4+mbKhQ1XEmF6E0387kI X-Received: by 2002:adf:eb87:: with SMTP id t7-v6mr5384834wrn.123.1536307439151; Fri, 07 Sep 2018 01:03:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536307439; cv=none; d=google.com; s=arc-20160816; b=HgHBgY/+ExhwajDgNSppnLZS4Vzlmk4lwrKM0KI+BBGQ9W/b6spJlCysE8HAF6wwfc kVbKyJFZ+37T1F8wlFXdP3w+l47kFEAyHn2SDKc+tK4bFs3MfYEKwvOzC/JBPgnOid1S DBWlVmgUETFZY0OD2L0fMauhNo4zdxOh2zK3oCjUQqOlobela36nRkt9IlepxGzVJD7m ejg2skyXCRz+MbUzow2igmJ6QOXleAdm/7hsxo+zQDDUjj+IfnPgt5lY1jlzZIIWGkXY vZR61BXL9Y/dDF0aIC+gZOeKMqBbA+ItEoRlZRZmpFA2g3VwN3crAMGKKJ6lfAywkZxt y9rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=sHQzY1u9I68VI1ezKKZE8Y7BW4DQ8w6XRiAJuGNUyls=; b=kw+njljVtNnQ7mIHCh/3Tj532VN+M3LBXm+KR0twhu9F5+suNsPc40gkmyluv6/FiX FUlprVuqw1rncJYhtljPJX+PL01SsOQx3SvD1UzNHXluUJvy8AlQiacvSFWxn2uRm+gc NqTvfbch1RAJg7dsh3XsoUO69D9MNSqAtdCXPJX0Pj+3pQ/7qifLGa8d+jkztTSKaaEK CUiXxp6KOSW6wBTbUuZJkge8Ua1a26oblCuN5fmyqyqCCOQtuRxKM4gcMoKNaqfuvn0V OfUEgPSR7W3xvrToHU3E9ZA4/pppgS3pyss0XgWS5jknNymCPuvFA2fM/PD7k2B6vEp1 lW4A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r13-v6si8665037wra.234.2018.09.07.01.03.58; Fri, 07 Sep 2018 01:03:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB75E68A107; Fri, 7 Sep 2018 11:03:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp121.iad3b.emailsrvr.com (smtp121.iad3b.emailsrvr.com [146.20.161.121]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F421689FF0 for ; Fri, 7 Sep 2018 11:03:31 +0300 (EEST) Received: from smtp8.relay.iad3b.emailsrvr.com (localhost [127.0.0.1]) by smtp8.relay.iad3b.emailsrvr.com (SMTP Server) with ESMTP id 9DD9C40070; Fri, 7 Sep 2018 04:03:38 -0400 (EDT) X-Auth-ID: jay@wizardofthenet.com Received: by smtp8.relay.iad3b.emailsrvr.com (Authenticated sender: jay-AT-wizardofthenet.com) with ESMTPSA id 381AF4006A; Fri, 7 Sep 2018 04:03:38 -0400 (EDT) X-Sender-Id: jay@wizardofthenet.com Received: from localhost.localdomain (cpe-76-89-145-17.socal.res.rr.com [76.89.145.17]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256) by 0.0.0.0:465 (trex/5.7.12); Fri, 07 Sep 2018 04:03:38 -0400 From: Jason Stevens To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Sep 2018 01:03:12 -0700 Message-Id: <20180907080313.25744-2-jay@wizardofthenet.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20180907080313.25744-1-jay@wizardofthenet.com> References: <20180907080313.25744-1-jay@wizardofthenet.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/2] libavcodec/dnxhd: change ff_dnxhd_get_hr_frame_size to avpriv_ 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: Jason Stevens Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" change ff_dnxhd_get_hr_frame_size to avpriv_dnxhd_get_hr_frame_size, to allow cross library usage in libavformat/mxfenc Signed-off-by: Jason Stevens --- libavcodec/dnxhd_parser.c | 2 +- libavcodec/dnxhddata.h | 2 +- libavcodec/dnxhdenc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/dnxhd_parser.c b/libavcodec/dnxhd_parser.c index 79ca1d6718..7c16e251a4 100644 --- a/libavcodec/dnxhd_parser.c +++ b/libavcodec/dnxhd_parser.c @@ -75,7 +75,7 @@ static int dnxhd_find_frame_end(DNXHDParserContext *dctx, remaining = avpriv_dnxhd_get_frame_size(cid); if (remaining <= 0) { - remaining = ff_dnxhd_get_hr_frame_size(cid, dctx->w, dctx->h); + remaining = avpriv_dnxhd_get_hr_frame_size(cid, dctx->w, dctx->h); if (remaining <= 0) continue; } diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h index f80ce18f3c..9dd352c242 100644 --- a/libavcodec/dnxhddata.h +++ b/libavcodec/dnxhddata.h @@ -90,7 +90,7 @@ static av_always_inline uint64_t ff_dnxhd_parse_header_prefix(const uint8_t *buf return ff_dnxhd_check_header_prefix(prefix); } -static av_always_inline int ff_dnxhd_get_hr_frame_size(int cid, int w, int h) +static av_always_inline int avpriv_dnxhd_get_hr_frame_size(int cid, int w, int h) { int result, i = ff_dnxhd_get_cid_table(cid); diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 9325f38baf..41b8079a09 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -482,7 +482,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) ctx->m.mb_num = ctx->m.mb_height * ctx->m.mb_width; if (ctx->cid_table->frame_size == DNXHD_VARIABLE) { - ctx->frame_size = ff_dnxhd_get_hr_frame_size(ctx->cid, + ctx->frame_size = avpriv_dnxhd_get_hr_frame_size(ctx->cid, avctx->width, avctx->height); av_assert0(ctx->frame_size >= 0); ctx->coding_unit_size = ctx->frame_size;