From patchwork Sat Sep 26 10:27: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: 22622 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 EB37A44B03F for ; Sat, 26 Sep 2020 13:37:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D6C3568B79A; Sat, 26 Sep 2020 13:37:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BE1B68B765 for ; Sat, 26 Sep 2020 13:36:58 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id b79so1877587wmb.4 for ; Sat, 26 Sep 2020 03:36:58 -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=NGgsqxhRCPzn77KHdLUZlaCdXizQ8MZ5HxUMdbd8Y5w=; b=kV/00cGVPZXN2gM0Th8lOZ3qgfrPULxCPtKoWwDhStGr6PsDAOmGEm2gC4AY6KvgOt TZ275Eq9LLzb42w6tILqQenHgkafotrAn4/eUfHn/ogKmVKg36aqD6+WbT8H007PMGKn +J/K6jMPU+C9O+ezF8O3l8hHMWx3zFSU7lFB5hPVgIza0YZbtOFcDZ8c8Zatm/wwMYKC jEA2+c/Xp09mrfnM/DFn56Sh9ZxPdcczMM7R5j/Pxvx8UbTT5sg1tX1wbO5krEZlFj4v N6YhF0EKyNqTw1WozqwBDjeK2hVG2QSK3GHm5AgDm6tY786x5j4ORRfyBRL25gBot9ZO FfIQ== 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=NGgsqxhRCPzn77KHdLUZlaCdXizQ8MZ5HxUMdbd8Y5w=; b=haSp6cwHJ9we7K/7G5oL26nA8eKp8XtHIklUztko9/Kl7tsXoDZw9/2Ymn6bbJKM3B kQmboplp/B1D5jJH5FgoUDhkhryLEVRSG2EKsUEIzP4URsW84GXb4D0/AA4yU+RhOgJa Vq3fyV8pYYs/R5ef5wdLYGgebH69ISBnyF6wAmXTEQ82KDcq0yYAt8f7VaueQrUZOviM hZzWyG0Q326UIvXx8KA1tpcVg4mXBJCOI0J2vMpc0VWcESI5nT5BT5v8bc/c+9fLKnhz m9QmaMTQei4/AfsY0JAbrPSz6gdo8bFYapzJnOeIHyKRFbYjxb6ugRS4Sq0DKmYD02OG qNDg== X-Gm-Message-State: AOAM533KsYU00Nc4lpV4oano6ExAjR+8aNbDuRfGxa7Ra4TnF+LdaNZ7 MRIMII3PkO4chLQ26AjM0NpaJvuL/vY= X-Google-Smtp-Source: ABdhPJwR/lBQZOTmVqK5dQCR+uuUmq6qIr8ETUqO7iRmS+dMcAUj8YLu6kkiq74+mffcfvb/7+Qs0w== X-Received: by 2002:a1c:62c2:: with SMTP id w185mr1993484wmb.109.1601116197772; Sat, 26 Sep 2020 03:29:57 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id k8sm6064867wrl.42.2020.09.26.03.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2020 03:29:56 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Sep 2020 12:27:45 +0200 Message-Id: <20200926102804.228089-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200926102804.228089-1-andreas.rheinhardt@gmail.com> References: <20200926102804.228089-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/25] avcodec/magicyuv: Don't use GetBit API for byte-aligned reads 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/magicyuv.c | 45 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c index 6c29efc9f4..f7dfef0eb8 100644 --- a/libavcodec/magicyuv.c +++ b/libavcodec/magicyuv.c @@ -270,27 +270,26 @@ static int magy_decode_slice(AVCodecContext *avctx, void *tdata, int sheight = AV_CEIL_RSHIFT(s->slice_height, s->vshift[i]); ptrdiff_t fake_stride = p->linesize[i] * (1 + interlaced); ptrdiff_t stride = p->linesize[i]; + const uint8_t *slice = s->buf + s->slices[i][j].start; int flags, pred; - int ret = init_get_bits8(&gb, s->buf + s->slices[i][j].start, - s->slices[i][j].size); - - if (ret < 0) - return ret; - flags = get_bits(&gb, 8); - pred = get_bits(&gb, 8); + flags = bytestream_get_byte(&slice); + pred = bytestream_get_byte(&slice); dst = p->data[i] + j * sheight * stride; if (flags & 1) { - if (get_bits_left(&gb) < 8* width * height) + if (s->slices[i][j].size - 2 < width * height) return AVERROR_INVALIDDATA; for (k = 0; k < height; k++) { - for (x = 0; x < width; x++) - dst[x] = get_bits(&gb, 8); - + bytestream_get_buffer(&slice, dst, width); dst += stride; } } else { + int ret = init_get_bits8(&gb, slice, s->slices[i][j].size - 2); + + if (ret < 0) + return ret; + for (k = 0; k < height; k++) { for (x = 0; x < width; x++) { int pix; @@ -385,21 +384,25 @@ static int magy_decode_slice(AVCodecContext *avctx, void *tdata, return 0; } -static int build_huffman(AVCodecContext *avctx, GetBitContext *gbit, int max) +static int build_huffman(AVCodecContext *avctx, const uint8_t *table, + int table_size, int max) { MagicYUVContext *s = avctx->priv_data; + GetByteContext gb; HuffEntry he[4096]; int i = 0, j = 0, k; - while (get_bits_left(gbit) >= 8) { - int b = get_bits(gbit, 1); - int x = get_bits(gbit, 7); + bytestream2_init(&gb, table, table_size); + + while (bytestream2_get_bytes_left(&gb) > 0) { + int b = bytestream2_peek_byteu(&gb) & 0x80; + int x = bytestream2_get_byteu(&gb) & ~0x80; int l = 1; if (b) { - if (get_bits_left(gbit) < 8) + if (bytestream2_get_bytes_left(&gb) <= 0) break; - l += get_bits(gbit, 8); + l += bytestream2_get_byteu(&gb); } k = j + l; if (k > max || x == 0 || x > 32) { @@ -440,7 +443,6 @@ static int magy_decode_frame(AVCodecContext *avctx, void *data, ThreadFrame frame = { .f = data }; AVFrame *p = data; GetByteContext gbyte; - GetBitContext gbit; uint32_t first_offset, offset, next_offset, header_size, slice_width; int width, height, format, version, table_size; int ret, i, j; @@ -632,11 +634,8 @@ static int magy_decode_frame(AVCodecContext *avctx, void *data, if (table_size < 2) return AVERROR_INVALIDDATA; - ret = init_get_bits8(&gbit, avpkt->data + bytestream2_tell(&gbyte), table_size); - if (ret < 0) - return ret; - - ret = build_huffman(avctx, &gbit, s->max); + ret = build_huffman(avctx, avpkt->data + bytestream2_tell(&gbyte), + table_size, s->max); if (ret < 0) return ret;