From patchwork Tue Nov 19 16:12:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16336 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 0E56844AD68 for ; Tue, 19 Nov 2019 18:20:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E42DB689FF9; Tue, 19 Nov 2019 18:20:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBC27689D53 for ; Tue, 19 Nov 2019 18:19:56 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id 8so4415932wmo.0 for ; Tue, 19 Nov 2019 08:19:56 -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:mime-version :content-transfer-encoding; bh=PF1RL8b2xRNBtEbipp2dLWBZYw7S0yrytXnV8Mx4cbE=; b=fbh9a0V+4BY3DYqOeTWFINHJcbF0aWmn+1uA13P8TJLmpHHBqs4VBWf7kv6JM8yTKh 9mp2+WQkuA4wTyJKytNqfBCWX3GZ2+fHRNfxiTvxCnd8kGfsXSst3/ijndZBtd1tE+f+ L0c0XdZW32jXAXtJmhHX4KXotKHeiF8Rdwge6VrJvj6i4FpyfHEMzREI3wOAn2xmNvIN 1nJxI/+EWrWezltXCh4se47dncaXJuUTlMLZXytMfEL8fk9DvyK3AHXXv8WifG2rZfHF u6Bxh9HonU2V2Z+spkIzU/a9OUyGqMH1nkGv+y7fKM7LNGwPAKqlex6I1/zGe1mezMuL WQCw== 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=PF1RL8b2xRNBtEbipp2dLWBZYw7S0yrytXnV8Mx4cbE=; b=k33mESd/xVFoNHsGUHVOexi3dFe2uPeY3IYlf/MKD7U4hyn5Sscydibhk2Rj2SxTaM 3YFm90w4t13UKM5bgyG6qz2XkAztw6hrK8a9WkoITdnn2qiVL+KnX0AmnFI7W1XdCUVY Y7UEGYIY/FWQmMsdiXB0XkqSpNJUc+czurl2WQtPotBf+b/ur1Bb1gKa3wwbIvFJgIr8 7jBQGholR5S60KNY9+aVRRE+RHKRUZOyW3Cu4tcp//eexHA4P7tk7YIuyOXtgUIi57B0 hPpIwmDm+LWUDtKJS4LA7Vs+zM4D9xd2EwQ+91nafEpIjpe9SLOTUwPVkSj0OrDTdaH0 uqlg== X-Gm-Message-State: APjAAAW3jso+ThtYRyyAn6o9Q8tYqIsoll72jbqS34UCPHNPDE+eDHsN VDRUCRJ200SyLVRhHojBnJzx4ViF X-Google-Smtp-Source: APXvYqxkIfkLzTg0ZW7wJAxkMC542pjNH7mdr+OVEx4OdS//aQRqtuvOd3n4oiBF3SsZ5F6FaeiPdQ== X-Received: by 2002:a1c:9d4a:: with SMTP id g71mr6972773wme.66.1574179961896; Tue, 19 Nov 2019 08:12:41 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id f188sm3611784wmf.3.2019.11.19.08.12.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2019 08:12:41 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Nov 2019 17:12:28 +0100 Message-Id: <20191119161234.3766-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/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;