From patchwork Sun Feb 18 23:53:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Langdale X-Patchwork-Id: 7646 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp913637jai; Sun, 18 Feb 2018 16:00:15 -0800 (PST) X-Google-Smtp-Source: AH8x2256DTS9EXooCPBTNpXO7EsTDZvvsH9nmgqxYnDOPMBYQQIzUte1s2Plobj1v++JIQoJ2afz X-Received: by 10.28.91.17 with SMTP id p17mr9732196wmb.151.1518998415752; Sun, 18 Feb 2018 16:00:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518998415; cv=none; d=google.com; s=arc-20160816; b=TCRhBZHNE664oUkPMAjt9ty0CZd3/JfIa0o13mi7aeIOvDu335O+S/TLn3nMHPcWBi DD7Hya4li+m/80fPzR7KX482qU6r8i2msNHkgOWNybf/JyuJk32DT6ZL/hVJu2AmwcuN m8V73V2nb5Tw+jPNAdLF3xJ6JfuNVQIeWh7qaVi2HUhrH4XMxOjISRbAxQ99IgIKxLGw 1XPHJ5V3NigAGutD+JE9D9eyxuWZolKpgbnWrvD9UaKLh/f5IQIeKH8ISPVGIxolgt5K 3L1GpNA+WT3NLsJM3ld996F37/WmTFFb3SdbYkajrFjLCjPK+JWeVEXiz9Yc0Jo2PqW8 DDuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=1n6fBeqOXNw2orTUP/UjNBKr86LWagLpeb819cV6rf0=; b=ZTMITdz7J3ndxPGZQ8d0tZFtHPeb8RYtDvIH2BIRg3rkpoZ3yMlRbwCM5cni5okaQA ERged7X4t83FdlsNTE+rZA0lBIFZNWCS90cpL0rmlCscKzmy10ezIrFRRKOshkzyqkfG OOSiJEnJNi0EpOCpastqRvOJO8foqXF0MG8vRTs7qzcS53mpPkZJdMePOq7bpPH0hfy5 FP55Kbmkw+VSNxH7XxPkI2l4JVnUQPf/qDTO7afoKiaADfPjKxOklsIPSMW0A9bjgRsR iWaMDfWat3fmUW//tPK/iYR2BbzoxUB0z6Hy1sbupbKeP3XLSFAbd/koEEqzM04croVm A0ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@overt.org header.s=mail header.b=HGb9vfME; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q184si13359844wmb.192.2018.02.18.16.00.15; Sun, 18 Feb 2018 16:00:15 -0800 (PST) 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=@overt.org header.s=mail header.b=HGb9vfME; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F322689C74; Mon, 19 Feb 2018 02:00:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f227.google.com (mail-io0-f227.google.com [209.85.223.227]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D4582688294 for ; Mon, 19 Feb 2018 02:00:07 +0200 (EET) Received: by mail-io0-f227.google.com with SMTP id t22so9574752ioa.7 for ; Sun, 18 Feb 2018 16:00:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=QN026HMAqIy3R85Gy6L5oFsCdG3U9M/XrCVuWRLxxm8=; b=V6C1tGAhNUwhgE1O+gjnO86MEWyLj7/NIOa1/5Tfbz2YpZMg7pfpMv594hMD36q7Uo muvFaY2LxyiAuILV1o+Ps90oEGaBx+jChAbu5FOmSD80YRbW4ZScZtKhMLoZb/1RkfcF Zzuo6p4PeS9FpsygZY2+P5C5ahveY66k0lbFrqbD80U20vI8rucoa3CcIp9M0AGMq1vn CqlEVoGW4ndBM8xHFAo9oIRaF1XsAVWh3B2fyiu5iZH+8XNQZO1Sy5K8yGcncH8Bs1Ir Clr+4VX4PWzSsO0OBQuhDzfeo8k1O35eH0lh81OTzEkzHL0YByiUVzkphAaHGPPaXj4n VYZQ== X-Gm-Message-State: APf1xPBBTgep3bQ0KOQBTMpz+gSMvC3PnVM2SiVzxhaXNZ4KQXB47Hkd dIDirBSP52UlQ3GTbF8Bd8oBZFYVaaoU3jd77V8unXEshHIR2A== X-Received: by 10.107.18.158 with SMTP id 30mr3134507ios.164.1518998033575; Sun, 18 Feb 2018 15:53:53 -0800 (PST) Received: from mail.overt.org (155.208.178.107.bc.googleusercontent.com. [107.178.208.155]) by smtp-relay.gmail.com with ESMTPS id d143sm5918770itd.0.2018.02.18.15.53.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Feb 2018 15:53:53 -0800 (PST) X-Relaying-Domain: gapps.overt.org Received: from authenticated-user (mail.overt.org [107.178.208.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.overt.org (Postfix) with ESMTPSA id 03F7F6059C; Sun, 18 Feb 2018 23:53:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=overt.org; s=mail; t=1518998033; bh=bTZ8Rpsx88E7yJnCEYrpbtfpGiXUt5FaRTvMUBOg21o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HGb9vfME/h6tipS8R29URm2Vt4E/0dF5rzJtoZLw0U4Ilt09o75IdPiPIcfGardGe ZFA4QokHQ5Dvzp+vjZyAFk1gNYol4kMsEngvKOeeuotU5FB9iIuHawIhn9s0MPgPhn Y/bjpifEn7T6jKxQ9+1gwEaAW8wA8xavWmh3z2ohNJSBMGKzxx4TyrnFEIrVXo3Byc GOZS0nGPPAwhtPvUAS/wRN8HtV03Zr/abJqkZTZfOO/k531p6JIaESwWRnZdRbOE6O XAAhOjrV+DLmSV+s5rIF02yifyaCGpEgXVJC5ZZVDgRPnuBuOdGuxdzqbf7U2rjU8Q 9pfA/yAfQkm4g== From: Philip Langdale To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Feb 2018 15:53:32 -0800 Message-Id: <20180218235333.6965-3-philipl@overt.org> In-Reply-To: <20180218235333.6965-1-philipl@overt.org> References: <20180218235333.6965-1-philipl@overt.org> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/mjpeg: Pass full buffer to hwaccel start_frame 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: Philip Langdale MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/mjpegdec.c | 6 ++++-- libavcodec/mjpegdec.h | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 9a7a329b19..b41d2ce467 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -715,8 +715,8 @@ unk_pixfmt: if (!s->hwaccel_picture_private) return AVERROR(ENOMEM); - ret = s->avctx->hwaccel->start_frame(s->avctx, s->raw_buffer, - s->raw_buffer_size); + ret = s->avctx->hwaccel->start_frame(s->avctx, s->raw_packet->data, + s->raw_packet->size); if (ret < 0) return ret; } @@ -2242,6 +2242,8 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int ret = 0; int is16bit; + s->raw_packet = avpkt; + av_dict_free(&s->exif_metadata); av_freep(&s->stereo3d); s->adobe_transform = -1; diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index 11dfdbf62b..b47f54a5b9 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -139,8 +139,9 @@ typedef struct MJpegDecodeContext { int iccread; // Raw stream data for hwaccel use. - const uint8_t *raw_buffer; - size_t raw_buffer_size; + const AVPacket *raw_packet; + const uint8_t *raw_buffer; + size_t raw_buffer_size; uint8_t raw_huffman_lengths[2][4][16]; uint8_t raw_huffman_values[2][4][256];