From patchwork Sun Nov 17 07:34:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16302 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 5F5DF4499FD for ; Sun, 17 Nov 2019 09:35:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E6FB68A659; Sun, 17 Nov 2019 09:35:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C8A368A485 for ; Sun, 17 Nov 2019 09:35:24 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id f3so15276828wmc.5 for ; Sat, 16 Nov 2019 23:35:24 -0800 (PST) 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=PF1RL8b2xRNBtEbipp2dLWBZYw7S0yrytXnV8Mx4cbE=; b=s2I6+0/vMeTdMV30f1aPYmk4ARDvX54m9hXKvR2uO2Ha7KQtaHWeXKbr86XtElNozu OMNK0aw+qHFRodm9L+sbFyixKxQaisGCWiSUTEVUpSM7yEY8H8V7WSpghDYFsneLqudm oVggH+c95MtSG6Dt0BzLWpoNpbL2/qgux4ZMoZSksS15ka4C+qSkLq7/zWseDGSvN3cW HQFzFkJi8fTvHKfCFMGonmGOVZnNdYfsZgMitgyzTWRERsWyx8b5L/pHkrNPp7clHy13 Vximo5k/VbqqR83B8rdpI7Hxiyf7nU5twEjUyUvCyWb47LiOP76O+ytc3VCncWd/AU64 M6gQ== 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=PF1RL8b2xRNBtEbipp2dLWBZYw7S0yrytXnV8Mx4cbE=; b=ZbQT4XABbnJ5TlXMW6KX/zKB16t7I56vYn9SAIxV+sO1A7kApkzhaLDdf8lWmCm64y Z7iIk3snr0IQ9aYD7OaW19vn3/l2ySGBupbCwMK+8DjNKNbRGq0IID1ylPcTUhj+MXq/ 4na2TPaxB+Cl6FfK2be5cGwILLnQ4nHubmorJp7ehn6huMuH35dWaZ/6OxoXBHfxPy0X nGIosYpZTgOlRnRHyv+kb9L55RdQC0987N3OipsmE45gXG5Y2JyaEecpanLybJ44MKfB rPoQB+tvEEYWmtvaUQZ40oSKXUbb25GP9+fp5Q6iqnzP+YKjbHgRkA+CdehihxrQCHd9 8z+A== X-Gm-Message-State: APjAAAX3Vp9loceI4vP80uhWHAzsLA0kkXllusFu5VPrVyiTeH7VZqay RljceW0IODkoRGW3i6rQEaBSz1TN9r0= X-Google-Smtp-Source: APXvYqzCWcFsWzIK4RyyITb/arQzmCATEkl9JehiZxi5FH432IUNbxKtpEE1aj0hDSIZ/4WxI+Wl9w== X-Received: by 2002:a1c:5415:: with SMTP id i21mr24390032wmb.120.1573976123761; Sat, 16 Nov 2019 23:35:23 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id q15sm16713082wmq.0.2019.11.16.23.35.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Nov 2019 23:35:23 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 17 Nov 2019 08:34:39 +0100 Message-Id: <20191117073440.22718-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191117073440.22718-1-andreas.rheinhardt@gmail.com> References: <20191117073440.22718-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/6] avcodec/cbs_jpeg: Use memcpy when writing pictures 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" This is possible because the size of a scan header is always a multiple of a byte. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_jpeg.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c index b189cbd9b7..64fe70beab 100644 --- a/libavcodec/cbs_jpeg.c +++ b/libavcodec/cbs_jpeg.c @@ -330,7 +330,7 @@ static int cbs_jpeg_write_scan(CodedBitstreamContext *ctx, PutBitContext *pbc) { JPEGRawScan *scan = unit->content; - int i, err; + int err; err = cbs_jpeg_write_scan_header(ctx, pbc, &scan->header); if (err < 0) @@ -340,8 +340,12 @@ static int cbs_jpeg_write_scan(CodedBitstreamContext *ctx, if (scan->data_size * 8 > put_bits_left(pbc)) return AVERROR(ENOSPC); - for (i = 0; i < scan->data_size; i++) - put_bits(pbc, 8, scan->data[i]); + av_assert0(put_bits_count(pbc) % 8 == 0); + + flush_put_bits(pbc); + + memcpy(put_bits_ptr(pbc), scan->data, scan->data_size); + skip_put_bytes(pbc, scan->data_size); } return 0;