From patchwork Sat Dec 2 23:14:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 6516 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2804203jah; Sat, 2 Dec 2017 15:22:46 -0800 (PST) X-Google-Smtp-Source: AGs4zMYIA319xmyC2rujtNQri/OfVhhqCPOJA+kHoz9VqEYpOMytAo7847BcDjKaBjfcDICFjQmS X-Received: by 10.223.190.2 with SMTP id n2mr4355966wrh.44.1512256966213; Sat, 02 Dec 2017 15:22:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512256966; cv=none; d=google.com; s=arc-20160816; b=HrGlUZL+mnyTyEsy2vFUoTl6kE2/KqoAGLIiynaHHO9Fsq+wGUaai7Th8TebPEK6op MSYFNAD6/qnWJeJ4MZCfRQYZ+xrJV0cJEMSsztT4SuwCyKYmANwiY9ftQYHwPjuiQ3gc zzsVlcqDU2DCbNmVmju91TGtYbizwB7Wf0rYnqiEmBHY4cx5p9fMyXS6Mjq6bisrkLEf bmqfzWF5UY2HlUEwCxcQGVw3i4DoyPa6p9myC4AGH04jSsvdKZO5pgnld7gPd38+1/Hk OKVUvFmU4gFNlM1Btma+PtzKJfBIGMJb3FGx0mz+3bhBboh6lq36X9EGBW519ZupcaJO fdFg== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=rlBqAC32rhyiyZRKfcSHozx5pzZHqFTJbdYYu+apGcc=; b=MSHcpP91KRWyEn1qD5v4CqnyaqUhV+UUF05dNuR5PHoiydCYdhk1b/AQp3XbJWwySZ S3vIFhtbbtiwTsAiN3rWebrMsWp5SCzKgZvmw2QD5tSmryt8+NT4Gculq1XdzDnFfUEW N2KMXcziaBUyWzVm9I5bnRGhtsvXsR0NdO9JYMRzrGFaTB3RQYYXBife1DAb6rj2ug7h zZ3PBn88LKLYhSIPc4Xn7EBgvNUhazPBm/o1uPMIMb4pDSDjxCoAIJEJ3XfCOrwkpC7+ plDNrk0kbA+82TXtX1pWho17Iu7J4W7nHQVj2SvuFdUinJI3dGSOzcH7JNg3dtTQpz6b zuUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=bxFXY3pf; 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 e131si445941wmg.169.2017.12.02.15.22.45; Sat, 02 Dec 2017 15:22:46 -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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=bxFXY3pf; 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 B093568A213; Sun, 3 Dec 2017 01:22:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f194.google.com (mail-io0-f194.google.com [209.85.223.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B39B268A1F2 for ; Sun, 3 Dec 2017 01:22:33 +0200 (EET) Received: by mail-io0-f194.google.com with SMTP id w127so14932797iow.11 for ; Sat, 02 Dec 2017 15:22:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=3LjrGpYdzzyaBuEdie5a5n2ufUDFhyvj8jrWYq4Mr+I=; b=bxFXY3pfvSKhTF6DStL1JNCdgTbqLLjkvafhN5PFmNiGzRhhvOthGO+gfisYKLMVr6 DJhG+fzOiHy58Cps/1518wbzxQM4XQVluE9DeZvvFjMEb0MNeNSNtZjYTAHy+dg2NJZu evCen85WVD0vPqLmvdgBIj5jpViybsEIhNZk4y7XWYHSLloPZ8OoNi1IigkI0RM9uzCf VjCibk2Azg+0Tp1lXuGBPkMdLQGlcCbqn7qkdkauBmszsp6QB4QCszJ4g+IAl1DIizJn UjEtbWYZ8pKTsfkBZh1uv+y+QPkI/hodZZ1sL/NmbquIHjO/lXvpiY6Ww3GsmewvfBfa sBQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=3LjrGpYdzzyaBuEdie5a5n2ufUDFhyvj8jrWYq4Mr+I=; b=mOiawJNmF49ooHIHaCTHQvkEeBq+O6xydd8o9TQzIUPJSV23PfamQ5sXCW9l0tE9Lh yY1/qoLMHT6YOWP5OeBr47s7wHSB7k+PrUFOsECBT8pVB30pZIPnxOj3E/dZUT5k8p2S js5k6ycKKEPVPGTVvmeaf3c3uRaEwskB+5rMEQQf+SF4SNp89erlgrIwmVAa9yJFQhuC KUb3AY/vMUfaDxPYl0nx5hZQEXg5WQDjya6ctDvzjdf36veL9P8ivzFclNsjt8xKQR9o ZKuFf9PVwwWRENI4mE8l3U0nJXQo6xY63YCWBvL+Vkni3c5zTpLobBMlT3tJ2SHHGCQe RTRw== X-Gm-Message-State: AJaThX7YJ90E91l67Gr0fi0424npbQuaOFSJN3WLXLZpfmVm5Q+ZvxF4 KjUh368QAVlbVvrQsmihef0/wPeW X-Received: by 10.107.162.131 with SMTP id l125mr20108488ioe.153.1512256459984; Sat, 02 Dec 2017 15:14:19 -0800 (PST) Received: from localhost.localdomain (24-196-247-173.dhcp.reno.nv.charter.com. [24.196.247.173]) by smtp.gmail.com with ESMTPSA id w71sm4330504iof.49.2017.12.02.15.14.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 02 Dec 2017 15:14:19 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Dec 2017 15:14:08 -0800 Message-Id: <20171202231409.32371-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.13.6 (Apple Git-96) Subject: [FFmpeg-devel] [PATCH 1/2] libavutil/hwcontext: add AV_HWDEVICE_TYPE_MEDIACODEC 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: matthieu.bouron@stupeflix.com, sw@jkqxz.net, Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta --- libavutil/Makefile | 2 ++ libavutil/hwcontext.c | 4 ++++ libavutil/hwcontext.h | 1 + libavutil/hwcontext_mediacodec.c | 50 ++++++++++++++++++++++++++++++++++++++++ libavutil/hwcontext_mediacodec.h | 34 +++++++++++++++++++++++++++ 5 files changed, 91 insertions(+) create mode 100644 libavutil/hwcontext_mediacodec.c create mode 100644 libavutil/hwcontext_mediacodec.h diff --git a/libavutil/Makefile b/libavutil/Makefile index 721784086c..6b12acea68 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -166,6 +166,7 @@ OBJS-$(CONFIG_OPENCL) += hwcontext_opencl.o OBJS-$(CONFIG_VAAPI) += hwcontext_vaapi.o OBJS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.o OBJS-$(CONFIG_VDPAU) += hwcontext_vdpau.o +OBJS-$(CONFIG_MEDIACODEC) += hwcontext_mediacodec.o OBJS += $(COMPAT_OBJS:%=../compat/%) @@ -181,6 +182,7 @@ SKIPHEADERS-$(CONFIG_OPENCL) += hwcontext_opencl.h SKIPHEADERS-$(CONFIG_VAAPI) += hwcontext_vaapi.h SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.h SKIPHEADERS-$(CONFIG_VDPAU) += hwcontext_vdpau.h +SKIPHEADERS-$(CONFIG_MEDIACODEC) += hwcontext_mediacodec.h SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h SKIPHEADERS-$(HAVE_ATOMICS_SUNCC) += atomic_suncc.h SKIPHEADERS-$(HAVE_ATOMICS_WIN32) += atomic_win32.h diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index f47158f811..31ac12807b 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -56,6 +56,9 @@ static const HWContextType * const hw_table[] = { #if CONFIG_VIDEOTOOLBOX &ff_hwcontext_type_videotoolbox, #endif +#if CONFIG_MEDIACODEC + &ff_hwcontext_type_mediacodec, +#endif NULL, }; @@ -69,6 +72,7 @@ static const char *const hw_type_names[] = { [AV_HWDEVICE_TYPE_VAAPI] = "vaapi", [AV_HWDEVICE_TYPE_VDPAU] = "vdpau", [AV_HWDEVICE_TYPE_VIDEOTOOLBOX] = "videotoolbox", + [AV_HWDEVICE_TYPE_MEDIACODEC] = "mediacodec", }; enum AVHWDeviceType av_hwdevice_find_type_by_name(const char *name) diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h index 8d27b987df..f5a4b62387 100644 --- a/libavutil/hwcontext.h +++ b/libavutil/hwcontext.h @@ -35,6 +35,7 @@ enum AVHWDeviceType { AV_HWDEVICE_TYPE_D3D11VA, AV_HWDEVICE_TYPE_DRM, AV_HWDEVICE_TYPE_OPENCL, + AV_HWDEVICE_TYPE_MEDIACODEC, }; typedef struct AVHWDeviceInternal AVHWDeviceInternal; diff --git a/libavutil/hwcontext_mediacodec.c b/libavutil/hwcontext_mediacodec.c new file mode 100644 index 0000000000..b0d8993e15 --- /dev/null +++ b/libavutil/hwcontext_mediacodec.c @@ -0,0 +1,50 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" + +#include "buffer.h" +#include "common.h" +#include "hwcontext.h" +#include "hwcontext_internal.h" +#include "hwcontext_mediacodec.h" + +static int mc_device_create(AVHWDeviceContext *ctx, const char *device, + AVDictionary *opts, int flags) +{ + if (device && device[0]) { + av_log(ctx, AV_LOG_ERROR, "Device selection unsupported.\n"); + return AVERROR_UNKNOWN; + } + + return 0; +} + +const HWContextType ff_hwcontext_type_mediacodec = { + .type = AV_HWDEVICE_TYPE_MEDIACODEC, + .name = "mediacodec", + + .device_hwctx_size = sizeof(AVMediaCodecDeviceContext), + + .device_create = mc_device_create, + + .pix_fmts = (const enum AVPixelFormat[]){ + AV_PIX_FMT_MEDIACODEC, + AV_PIX_FMT_NONE + }, +}; diff --git a/libavutil/hwcontext_mediacodec.h b/libavutil/hwcontext_mediacodec.h new file mode 100644 index 0000000000..3d2c91d2f2 --- /dev/null +++ b/libavutil/hwcontext_mediacodec.h @@ -0,0 +1,34 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_HWCONTEXT_MEDIACODEC_H +#define AVUTIL_HWCONTEXT_MEDIACODEC_H + +/** + * MediaCodec details. + * + * Allocated as AVHWDeviceContext.hwctx + */ +typedef struct AVMediaCodecDeviceContext { + /** + * android/view/Surface handle, to be filled by the user. + */ + void *surface; +} AVMediaCodecDeviceContext; + +#endif /* AVUTIL_HWCONTEXT_MEDIACODEC_H */