From patchwork Tue May 30 22:50:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41897 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp2833470pzb; Tue, 30 May 2023 15:50:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ613/vhvQKyIAHWom2gdEI0LgR1EjoaCpXBebLYZLx9wEO9130VA/zGtpTJNpbFHPfW29gg X-Received: by 2002:a17:906:4784:b0:968:1e8:a754 with SMTP id cw4-20020a170906478400b0096801e8a754mr3773631ejc.72.1685487037797; Tue, 30 May 2023 15:50:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685487037; cv=none; d=google.com; s=arc-20160816; b=yKH/QPPtkr0uF7j+1cPiTalSQLjlJJajvgt1wD/u1H2+E6KKoAFCHKmCW4SeDSZgRt TgokR+htSGyENvzEO5xgUdOXPIJ3LyNGoljAG+I8oOoSszI1TiSsA6T2xCgiovp2p4Ts hhdNICNyJcApN80BdE1M5iaxIiFMMmvQUJ2644Jfc6JdvzV29fg7kcaNDeAMcm07ZSsc XcHeuCIm9fzsBKD09UQ1GWoZGTB2hd0gWIHCRR3cCcq/khju9GEp/LF6PJswwBxQrtgS 1A/+RW45qW042mKz8+kW3P8OiGT9DmTLfKow1VqBaioqAi++Dkl31E6NqlJb3oWBbpTS MMDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=7Oh6S4BR/VI37d/OVlC1KcntlZ5Ue+HQH0UVVCGUuos=; b=aU+sTA9O8Fr5wndbJdJbB2jDOm4rMenkUqy5FHbS/3QNwtID9/4jx9+s2b7Z4cWgkz fQm90wL7UFhrUK4GpNT+lmUvgRalAj2Px7wsCA44qhednMzArv4AxHsBGnPTtH9+NTTQ fUH6q+gzDSXz3c4sEBxVUn+hhtkK7cgmpiNnwXonrDZCWnT/vFIoKzCgi1fi5HTf1krd fk8ErUVDumoHe9lMQ9ru5Zpi81ZKkiqN6d2C90NPNg64au/j0I6zVvPZYSMpQVyNzYmz L7O+aqTtD3Mr+x5iYDfDvgqIHsfAcPM0SbASGNDDNtrhDcHlnfTjDk1QLeX7wtPZ4+/G HqtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=U7xxpmly; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hd10-20020a170907968a00b00968db2f0384si9348247ejc.310.2023.05.30.15.50.32; Tue, 30 May 2023 15:50:37 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=U7xxpmly; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 671F768C033; Wed, 31 May 2023 01:50:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3954D68BE28 for ; Wed, 31 May 2023 01:50:22 +0300 (EEST) Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-394c7ba4cb5so1732476b6e.1 for ; Tue, 30 May 2023 15:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685487020; x=1688079020; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=PDkmYG74hrpwhFpsevAURXwizP3DSeBsWMy4aeL8+V8=; b=U7xxpmlyo+WRxE2FTzQ9cUkUQ7JcUgvZdctVNOYJFVafkwi6z+bPT2VykRrwArO4Yq YIN1NMvgmzZJBT0zIHklT5+JNVNnlqDwaD+0WTAf4szhmOFX6H6yTwcMF7kImhJKXSqw BSbJL+GzuGIGQibi67+4x2XEQXnbp/GXNutPCOr6bC5X+QSKlBcVEU57WJFh8SYeLYy7 dYOU+r3LPimvH5OVUjj8B10ykRDofvmrCTHOwbbvhFIRogU7zE2UqhI2moycZStWRJt3 dgYxPjbhoOScwhz0BHNgb/laqytJ+Ioj96mli7Lxr1ugKxPXDFVEKBcC63+1gYJSFE39 C0tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685487020; x=1688079020; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PDkmYG74hrpwhFpsevAURXwizP3DSeBsWMy4aeL8+V8=; b=kAnIDZJuI8nZ0WMqYalUuHJYiG/Zyk0uv614A1RUD0/fIvIDhnsvGJrtQ3Hsryjr7P YUL9s9FEy3GNgB/ZlLF4uX5jjQz1dypVJ7TmCLxEf6VLLiNAEQ5fN2CJzm8uA1beoXnW pKvPeQdyqwFZrMO3P9DRYBEvqmEfnZ5GU1dj+uZlkjx9KQ0GMOcGRTIkEfSv4nX1v2wX h7qPHGvJ1NcxM8FYO9PLupt5cpSbI0Ez5yNkNvJRiJABwGpCOKE26X7qCjB0xnnwP/G0 JWrNaBfnpjLImxVgCythnEQUWnFgQ8h+ZdABR9v9V3w2PpwNd1I9cewVGF2L3i7Q5OXz Ni/g== X-Gm-Message-State: AC+VfDxc/MqxrqzoqpIQkUZW2cYfYGRqxBvYR5dOfpQoC3W374g+0b54 j8mZo12Av959w8n53Yn+ISI5Z+l5qZk= X-Received: by 2002:a05:6808:1a93:b0:398:29f4:366d with SMTP id bm19-20020a0568081a9300b0039829f4366dmr1852894oib.5.1685487019921; Tue, 30 May 2023 15:50:19 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id l2-20020a05683004a200b006ab1830d483sm5987187otd.77.2023.05.30.15.50.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 15:50:19 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 May 2023 19:50:43 -0300 Message-Id: <20230530225043.1928-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/oggparseflac: use the GetByteContext API X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: e2PQA0WIYnOl All but one read are byte aligned, so there's no point in using the GetBitContext API. Signed-off-by: James Almer --- libavformat/oggparseflac.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index 557440d94b..f25ed9cc15 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -20,7 +20,7 @@ #include #include "libavcodec/avcodec.h" -#include "libavcodec/get_bits.h" +#include "libavcodec/bytestream.h" #include "libavcodec/flac.h" #include "avformat.h" #include "internal.h" @@ -34,31 +34,28 @@ flac_header (AVFormatContext * s, int idx) struct ogg *ogg = s->priv_data; struct ogg_stream *os = ogg->streams + idx; AVStream *st = s->streams[idx]; - GetBitContext gb; + GetByteContext gb; int mdt, ret; if (os->buf[os->pstart] == 0xff) return 0; - ret = init_get_bits8(&gb, os->buf + os->pstart, os->psize); - if (ret < 0) - return ret; - - skip_bits1(&gb); /* metadata_last */ - mdt = get_bits(&gb, 7); + bytestream2_init(&gb, os->buf + os->pstart, os->psize); + mdt = bytestream2_get_byte(&gb) & 0x7F; if (mdt == OGG_FLAC_METADATA_TYPE_STREAMINFO) { - uint8_t *streaminfo_start = os->buf + os->pstart + 5 + 4 + 4 + 4; uint32_t samplerate; - skip_bits_long(&gb, 4*8); /* "FLAC" */ - if(get_bits(&gb, 8) != 1) /* unsupported major version */ + if (bytestream2_get_bytes_left(&gb) < 4 + 4 + 4 + 4 + FLAC_STREAMINFO_SIZE) + return AVERROR_INVALIDDATA; + bytestream2_skipu(&gb, 4); /* "FLAC" */ + if (bytestream2_get_byteu(&gb) != 1) /* unsupported major version */ return -1; - skip_bits(&gb, 8 + 16); /* minor version + header count */ - skip_bits_long(&gb, 4*8); /* "fLaC" */ + bytestream2_skipu(&gb, 1 + 2); /* minor version + header count */ + bytestream2_skipu(&gb, 4); /* "fLaC" */ /* METADATA_BLOCK_HEADER */ - if (get_bits_long(&gb, 32) != FLAC_STREAMINFO_SIZE) + if (bytestream2_get_be32u(&gb) != FLAC_STREAMINFO_SIZE) return -1; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; @@ -67,7 +64,7 @@ flac_header (AVFormatContext * s, int idx) if ((ret = ff_alloc_extradata(st->codecpar, FLAC_STREAMINFO_SIZE)) < 0) return ret; - memcpy(st->codecpar->extradata, streaminfo_start, st->codecpar->extradata_size); + bytestream2_get_bufferu(&gb, st->codecpar->extradata, FLAC_STREAMINFO_SIZE); samplerate = AV_RB24(st->codecpar->extradata + 10) >> 4; if (!samplerate)