From patchwork Sat Sep 2 22:21:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 4961 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp1821991jao; Sat, 2 Sep 2017 15:28:37 -0700 (PDT) X-Received: by 10.223.139.148 with SMTP id o20mr3426327wra.232.1504391317555; Sat, 02 Sep 2017 15:28:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504391317; cv=none; d=google.com; s=arc-20160816; b=DIjlEKh9pcTiK6Ros/NEdYja5h9pEEuB/BahIEk5a95IHf0xn53a/Jw0v7XPhWs5eO Q4ZcOa/BikGPv/xKDM7jERuyhcNvDLPm45NwgQDKMvdVjCSoEzG9ujlykgBMvZ64tFBb FU4icawFe/LusLEjzk6fIsGspBEoF1qVVXu4ikCCj+8g/y+7EX2Sh9NwuEJE4fWWQN5E rzp3kWd6/7tOF2j6WWVH4dvwv50bd7vnUtylxuXJPKcssc0sJoiKO5Bg4XWeevIn3wAe hxiOcifkBwzCtZQvBqu6xkkOo38o25jeah7ReG0TT7gDQC+ha/YJS2UOjTxk/lf/vad8 JoGQ== 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: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=aPSuADpKg5Mr5JpceekpvVVKSXadeIp0GHSzWO022Cs=; b=iAeEEpxheYQtW3RxAqIFO6xNy6nq5Hy5QKVt7FskRHARvR+XqEpSZQrVp8SwaxLfmo wNDEr6IA5NC2gYSBTdTASloKyAVAnLmj8h46WhiZFHy1xb+GVcqKph67aSbR8F7hh2Gh v2GmjCTWDftgimD0vooFRQSBtVNgxxuRRiPT5pgRBsXCKYUuMk/9En2gP/ZaHrntqTS/ 0+ZX1HfT4L4vRZZLuPKacAdECKDIY6z/1KPjTh8O7DBv8/vT2JYJcwnb9pDy3Q2JzvKp KfDCsgOJMyxfZTcSfIvQCA8Na/uWfx5AEENXJfUwIDV9S1DJK3pc20efihs5g5j0gYuo 9CBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=IIxYBkfj; 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 6si2394962wmn.91.2017.09.02.15.28.37; Sat, 02 Sep 2017 15:28: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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=IIxYBkfj; 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 9BE5468047F; Sun, 3 Sep 2017 01:28:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f169.google.com (mail-wr0-f169.google.com [209.85.128.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F8B06803ED for ; Sun, 3 Sep 2017 01:28:27 +0300 (EEST) Received: by mail-wr0-f169.google.com with SMTP id k94so7276146wrc.0 for ; Sat, 02 Sep 2017 15:28:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=5rjFbzXlAbY64fG7shJn6VYpupOGRMq9s1dIfxe6iyo=; b=IIxYBkfjoJEUHLn5MBmM11iziFF6B2jcuih1uw3sm92y/eOpABiBN830bXnkVc2n14 vYPjqis0ecD3IvOGE5WIfRmUYRWWH4J60vsxuyZThaTLnlTqaEI77IBmAZc7nIJs9P41 ESsvX9nwakv/u5RAIjkbTANjaQSJ9oHKfxoYPFbBewU1Z8Tzp3YAbhBwqpF+3mIQ7b4K 2vDy5aJdMzLNm6zv/6+YQiU8g3mbhWHoBiEYSDLGYp3LjFZ1tMqPMrhHmvJ3uap6VC0o DBXjO0ClXRTDGQisNIMui0uptgbHmGXqW2dRC/Lu3xL2H2trfHPALfl699kv3FM6p6Pq dvmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=5rjFbzXlAbY64fG7shJn6VYpupOGRMq9s1dIfxe6iyo=; b=Z7IeANauGHLDuxr+J8Sz7izX9WVE6titnIf0hjTfnSCoXnpEAyeyjKcCiAT9tQ64My QBZjg6AJQkRRnvI+Zbp90nezuQHYToj3Fvd711s1uf8a8vhzdEDXL0kfRXl4Dnz4sYuQ oCJkU/GGO2qq/9UvGb6CVYIpFo/viwym6CWh3xWWBMaSbZyj6Qkkx5poQ5BDSjRfGgqB BIHZWLynJ1Zkta5VMdcks7bINBF002U6DyGIw5g13XW3CbL479JESX1wY1Vc3EbczBl3 yDIe/uZ70uujUgVsWHUlfHPH3KeOoOCPwJbwHMdmPEMOuUndXVZsMr1JmptIf0Jzhurb mgnw== X-Gm-Message-State: AHPjjUhloUEN7yKfihX9cRLyhzz8v96T+NChspwxPPSGLUVORWBN4q1O Czq5AefyMXyIGvhGH64= X-Google-Smtp-Source: ADKCNb5X+R2XFGm33UkM8AwBjTsoUroTtlKDjC5ioxIbdYWxN1ykeHXeyDIOa6dNM60UIfxWVLPD8A== X-Received: by 10.223.132.230 with SMTP id 93mr3665576wrg.172.1504390904703; Sat, 02 Sep 2017 15:21:44 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id w10sm2531582wra.47.2017.09.02.15.21.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Sep 2017 15:21:44 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2017 23:21:34 +0100 Message-Id: <20170902222135.17862-3-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170902222135.17862-1-sw@jkqxz.net> References: <20170902222135.17862-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 3/4] lavc: Add wrapped_avframe decoder 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Intended for use with hardware frames for which rawvideo is not sufficient. --- Kindof nasty. Any thoughts on better ways of achieving the same result (hardware frames out of lavd) very welcome! libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 2 +- libavcodec/wrapped_avframe.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 999632cf9e..943e5db511 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -653,6 +653,7 @@ OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o wmv2data.o \ OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2data.o \ msmpeg4.o msmpeg4enc.o msmpeg4data.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o +OBJS-$(CONFIG_WRAPPED_AVFRAME_DECODER) += wrapped_avframe.o OBJS-$(CONFIG_WRAPPED_AVFRAME_ENCODER) += wrapped_avframe.o OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index ce0bc7ecf3..625720578f 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -377,7 +377,7 @@ static void register_all(void) REGISTER_DECODER(VQA, vqa); REGISTER_DECODER(BITPACKED, bitpacked); REGISTER_DECODER(WEBP, webp); - REGISTER_ENCODER(WRAPPED_AVFRAME, wrapped_avframe); + REGISTER_ENCDEC (WRAPPED_AVFRAME, wrapped_avframe); REGISTER_ENCDEC (WMV1, wmv1); REGISTER_ENCDEC (WMV2, wmv2); REGISTER_DECODER(WMV3, wmv3); diff --git a/libavcodec/wrapped_avframe.c b/libavcodec/wrapped_avframe.c index 14360320ff..e66f0cfa4c 100644 --- a/libavcodec/wrapped_avframe.c +++ b/libavcodec/wrapped_avframe.c @@ -75,6 +75,28 @@ static int wrapped_avframe_encode(AVCodecContext *avctx, AVPacket *pkt, return 0; } +static int wrapped_avframe_decode(AVCodecContext *avctx, void *data, + int *got_frame, AVPacket *pkt) +{ + AVFrame *in, *out; + int err; + + if (pkt->size < sizeof(AVFrame)) + return AVERROR(EINVAL); + + in = (AVFrame*)pkt->data; + out = data; + + err = ff_decode_frame_props(avctx, out); + if (err < 0) + return err; + + av_frame_move_ref(out, in); + + *got_frame = 1; + return 0; +} + AVCodec ff_wrapped_avframe_encoder = { .name = "wrapped_avframe", .long_name = NULL_IF_CONFIG_SMALL("AVFrame to AVPacket passthrough"), @@ -83,3 +105,12 @@ AVCodec ff_wrapped_avframe_encoder = { .encode2 = wrapped_avframe_encode, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; + +AVCodec ff_wrapped_avframe_decoder = { + .name = "wrapped_avframe", + .long_name = NULL_IF_CONFIG_SMALL("AVPacket to AVFrame passthrough"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_WRAPPED_AVFRAME, + .decode = wrapped_avframe_decode, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, +};