From patchwork Tue Sep 3 01:02:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 14861 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 791C8449F2B for ; Tue, 3 Sep 2019 04:03:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 630FC687FBF; Tue, 3 Sep 2019 04:03:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73512687FBA for ; Tue, 3 Sep 2019 04:03:17 +0300 (EEST) Received: by mail-oi1-f193.google.com with SMTP id k22so11487822oiw.11 for ; Mon, 02 Sep 2019 18:03:17 -0700 (PDT) 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:in-reply-to:references :mime-version:content-transfer-encoding; bh=j0mb/Mco3D9jje6M94XsuwfyxQqvhzxumiJCygwmtfA=; b=ifz2yQwgHdfYYdISo4s6YxTS4p+629RN8T5Q/Veo6wOqEkdNa69c/rcQGyuOu07eex AB8QRo66nVvB5YD2ZHa6oGUAdFMk83WKIUq/90n8XHNCUUu+CGP/nf/4XhiKg6t6XAN1 Su4NMqwJevVChmf+v4Vj/LqApmUpuQR+EBbsZaIaqKg78xt+OUXcRG/XLT/tzQZ57Up6 xfepTnRPTC3RO7qOixCve14sTStUZt9ydjx8CHoZn83G1V1wR99iqSQ66LrOyKjjdqJT hknXq0CpXsCPIMQYiD7AhQbCjd2pRKBRXJqsevf/fwutf1LD1rGZyiXc8i757XPePWoq xVhQ== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=j0mb/Mco3D9jje6M94XsuwfyxQqvhzxumiJCygwmtfA=; b=r9jVxxMwmZZGEZ6tdzrlAfav66ZmcqvRVxSBgcN/keRF5d/6n7wpuxjgoGLRmFWcEh uLmuBV1TsLiekjh2gjJ0ZZUBLscCr/n8L9wb+3WHU5pD5LgVqkz80K1K05leqNZFSs/3 xRecw9UAEtNlOSTaaOow1f3wQB2wemEJCO07NZnYjlyc7b9FOPrAqYWUFPTWcRR6dlXA jUnEQ/i319B6ohmW9D2C00RVDkhXDBScaB5tMSwDGX9QC4mPTKkSxA2VE1l2ZubcdxNi NUeJ67eJvjmWtkkM3AdgJ4wAFYQ5jIVaIT5gLENpgB4WPc6N8CF6/xXEcN2ocZGRRe38 5vLQ== X-Gm-Message-State: APjAAAXlizGZL0hj/WkuVjdds8BjAAqiBSKsqb9IFzBmOX5807s24m5E 7ifRpA9K57P7Legox6bdWPJX0RNk6hk= X-Google-Smtp-Source: APXvYqxQ7iS2l0x1/kHxYS/6VAbRx6VVSR+O9NmkMeEYtfAtJpPJ1Jony3auS0+9msPt35nvPAA3hA== X-Received: by 2002:aca:dc43:: with SMTP id t64mr19356594oig.99.1567472595772; Mon, 02 Sep 2019 18:03:15 -0700 (PDT) Received: from tmm1-imac.lan (ip184-189-221-177.sb.sd.cox.net. [184.189.221.177]) by smtp.gmail.com with ESMTPSA id a21sm4299633oie.9.2019.09.02.18.03.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Sep 2019 18:03:15 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Sep 2019 18:02:22 -0700 Message-Id: <20190903010230.96236-18-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903010230.96236-1-ffmpeg@tmm1.net> References: <20190903010230.96236-1-ffmpeg@tmm1.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/25] avcodec/v4l2_m2m_enc: add support for AV_PIX_FMT_DRM_PRIME 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: lorusak@gmail.com, Aman Gupta , jorge.ramirez.ortiz@gmail.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta --- libavcodec/v4l2_m2m_enc.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 4849bc26c5..4ccfe77322 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -302,11 +302,27 @@ static av_cold int v4l2_encode_init(AVCodecContext *avctx) /* output context */ output->av_codec_id = AV_CODEC_ID_RAWVIDEO; output->av_pix_fmt = avctx->pix_fmt; + if (output->av_pix_fmt == AV_PIX_FMT_DRM_PRIME) + output->sw_pix_fmt = AV_PIX_FMT_NV12; /* capture context */ capture->av_codec_id = avctx->codec_id; capture->av_pix_fmt = AV_PIX_FMT_NONE; + if (avctx->hw_device_ctx) { + s->device_ref = av_buffer_ref(avctx->hw_device_ctx); + } else { + s->device_ref = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_DRM); + if (!s->device_ref) + return AVERROR(ENOMEM); + + ret = av_hwdevice_ctx_init(s->device_ref); + if (ret < 0) { + av_buffer_unref(&s->device_ref); + return ret; + } + } + ret = ff_v4l2_m2m_codec_init(priv); if (ret) { av_log(avctx, AV_LOG_ERROR, "can't configure encoder\n"); @@ -353,6 +369,10 @@ static const AVOption options[] = { .send_frame = v4l2_send_frame, \ .receive_packet = v4l2_receive_packet, \ .close = v4l2_encode_close, \ + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_NV12, \ + AV_PIX_FMT_YUV420P, \ + AV_PIX_FMT_DRM_PRIME, \ + AV_PIX_FMT_NONE}, \ .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY, \ .wrapper_name = "v4l2m2m", \ };