From patchwork Thu Jul 30 21:18:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21389 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 61512448F08 for ; Fri, 31 Jul 2020 00:18:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 37D9D68B60E; Fri, 31 Jul 2020 00:18:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 066E668B60B for ; Fri, 31 Jul 2020 00:18:19 +0300 (EEST) Received: by mail-ej1-f67.google.com with SMTP id c16so9005679ejx.12 for ; Thu, 30 Jul 2020 14:18:18 -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:mime-version :content-transfer-encoding; bh=HoyCBhmuO1o2qHdDPvT5Nav+iPidtZ6pPCQj1UuLyzM=; b=b2l1VKDCnQdw+OEqzdvKXwiUYpx/7qglXqwVRoiWBetfJ01WwEnBiTsodl/bJBIdcP Fr7PLkjxk0TkbPb3NOtntNQpwSjRY8udHBD2nMzqvEL/40M1HqUgTLtSn4dqmR/Rziqd BGxwoFJn3MJcGVbJWjD47yezJfwCfLkePJt+PoIkN4s0WU7/Mjl+h9vIWKMA2JhVf0ZM YTqb1KFwis12p99ZkeVZKo5GgrPYQf7YEsjZgijC1wsyfE1bajznckUx5UQDfB0d/2Tj w13NtK39TNT4y21b6HS+1f9WqJiZsFAXqmZEuqIehsKToNYfOhIjAwRUWDf/8nX5X5c5 KjBw== 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=HoyCBhmuO1o2qHdDPvT5Nav+iPidtZ6pPCQj1UuLyzM=; b=OAhNTrxWTZ/lHtL3D3lU5vxjJFzZz+ZaJCVjRjYvaM/FXdoqnsrsU29u5DdGAgELxw 0X1KXjhepsJdjuyCppTUjWppm+Dx+tChiSpaq1x/ip8LGWTQw90s5AqZ7q6pmpJb6qOP S2RO2bw2TlKX/JQ/o0lKyqYscx27yd738QGChy4cnKuCq9i0qLuaJw2ChAcPESJE2Jfe nLxlvlsKTnPXUihQxStAG/+zxioJp//EjiXRReoSwaztIAfeMMkGqwr5Duj3FE6EjiZA 31sjPLnOekX7ELUW/3lBJWCMQ3kCivYaBwm68MQbUoJ/mXzDKRpKuzclb4ougBRWLOeF Yb3A== X-Gm-Message-State: AOAM533Mi2yU9ZrYXPF583auApecvVKG9+kP1ndA+IAIPYPkt2P0c/Gw aQVMu/hWF5R3u2hBEmQ4c65rMjJk X-Google-Smtp-Source: ABdhPJxQq9AoWJJQpmkSPq8gKp4ci3h8Gx6wy/jWHExtoXrp8QaIBqOuDMkxQjAW7iq3Tg2wv0M3Jg== X-Received: by 2002:a17:906:3a17:: with SMTP id z23mr1002345eje.238.1596143897974; Thu, 30 Jul 2020 14:18:17 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id u8sm7194667ejm.65.2020.07.30.14.18.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2020 14:18:17 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jul 2020 23:18:08 +0200 Message-Id: <20200730211808.22304-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec, avfilter, avformat: Remove redundant avpriv_align_put_bits 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" flush_put_bits() already fills the bitstream with zeroes, so it is unnecessary to align the bitstream before. Signed-off-by: Andreas Rheinhardt --- avpriv_align_put_bits() seems to be a function that should not exist as an avpriv function and instead be replaced by an inline function like the others or replaced by flush_put_bits(). Notice that even after this patch there are still users of avpriv_align_put_bits() outside of libavcodec, because an inline function in mpeg4audio.h uses it. libavcodec/hevc_ps_enc.c | 3 +-- libavcodec/mpegvideo_enc.c | 1 - libavcodec/vc2enc.c | 1 - libavcodec/xsubenc.c | 1 - libavfilter/vf_signature.c | 1 - libavformat/latmenc.c | 1 - 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libavcodec/hevc_ps_enc.c b/libavcodec/hevc_ps_enc.c index 78a73a5c0a..5449f81c82 100644 --- a/libavcodec/hevc_ps_enc.c +++ b/libavcodec/hevc_ps_enc.c @@ -113,10 +113,9 @@ int ff_hevc_encode_nal_vps(HEVCVPS *vps, unsigned int id, put_bits(&pb, 1, 0); // extension flag put_bits(&pb, 1, 1); // stop bit - avpriv_align_put_bits(&pb); + flush_put_bits(&pb); data_size = put_bits_count(&pb) / 8; - flush_put_bits(&pb); return data_size; } diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 21c30a9f8a..09697d89c8 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2818,7 +2818,6 @@ static void write_slice_end(MpegEncContext *s){ ff_mjpeg_encode_stuffing(s); } - avpriv_align_put_bits(&s->pb); flush_put_bits(&s->pb); if ((s->avctx->flags & AV_CODEC_FLAG_PASS1) && !s->partitioned_frame) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index ba5a03e4ec..2efb0f70ad 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -780,7 +780,6 @@ static int encode_slices(VC2EncContext *s) int slice_x, slice_y, skip = 0; SliceArgs *enc_args = s->slice_args; - avpriv_align_put_bits(&s->pb); flush_put_bits(&s->pb); buf = put_bits_ptr(&s->pb); diff --git a/libavcodec/xsubenc.c b/libavcodec/xsubenc.c index 4d58e0f3b5..349c1bca3c 100644 --- a/libavcodec/xsubenc.c +++ b/libavcodec/xsubenc.c @@ -206,7 +206,6 @@ FF_ENABLE_DEPRECATION_WARNINGS // Enforce total height to be a multiple of 2 if (h->rects[0]->h & 1) { put_xsub_rle(&pb, h->rects[0]->w, PADDING_COLOR); - avpriv_align_put_bits(&pb); } flush_put_bits(&pb); diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c index d07b213f31..5ea55d5247 100644 --- a/libavfilter/vf_signature.c +++ b/libavfilter/vf_signature.c @@ -559,7 +559,6 @@ static int binary_export(AVFilterContext *ctx, StreamContext *sc, const char* fi } } - avpriv_align_put_bits(&buf); flush_put_bits(&buf); fwrite(buffer, 1, put_bits_count(&buf)/8, f); fclose(f); diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c index 72b7f72f22..5458ce2596 100644 --- a/libavformat/latmenc.c +++ b/libavformat/latmenc.c @@ -211,7 +211,6 @@ static int latm_write_packet(AVFormatContext *s, AVPacket *pkt) } else avpriv_copy_bits(&bs, pkt->data, 8*pkt->size); - avpriv_align_put_bits(&bs); flush_put_bits(&bs); len = put_bits_count(&bs) >> 3;