From patchwork Wed Aug 9 11:19:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Ramirez-Ortiz X-Patchwork-Id: 4666 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp823386vsu; Wed, 9 Aug 2017 04:20:44 -0700 (PDT) X-Received: by 10.28.67.68 with SMTP id q65mr5580638wma.162.1502277644708; Wed, 09 Aug 2017 04:20:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502277644; cv=none; d=google.com; s=arc-20160816; b=iBjDqasmrpFYksTKcJzVRJbsyGCABe6ko/fHFt3Sg1Nf1UyOGgC/L4j5RDRjaoWZ+p mUjwV9g5OlEi//Mr68+XiOvhbcsJ2nu1nLU9rerWFPn8uIJmOshHH8X68TTdxbZJOuAJ eA753v7Qw787pR1gyRUuSCb0Sr1qFWsBjisCHk2CUKZn+1fI39084BpgTjy9e8hSPY0t K4JwZIk93LBu4FBfABhEARsm0iSPNo3gbgELbTM1olNmDvjRY/+otTax2q16bKCMB/q9 RYcOnebkm0fzVPWiNcHVnCl1hXk48Yh7sCzjFYJdyfq2Y6V2qZ/+h/yActB4ZlEjiIT/ WqSg== 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=p1+g8WmxubP9MCUeF4oho7VDIjWbQAKPNrpi1y7o1s8=; b=LugnVqcS8GSYh22oALGQkDvIiEsIMrF3FyxbkIkJaODVg5y6xKDlLRsBgExThgqsSK BZfcmGEgxd3/OeWCmQkqBCWBnSOvAgrTbo/6hfR1ssBqX7VPXkEDr8x63R671kVneUvm 1Z+2Q7fUygelglgvuab+pcQYvVEcgyxxuPphnOKakiq0xM3T8pkVoh3kRjFxxmGT2ZPl l4K+VoAfsJ9QCi30JjCSDZZAjee4ZYppqq3CNPkBbzyRy/idaJz0vGJ3A1AtR1gFWyjE O+vYKRDx+kI6UmIsLLHufNNU8ZmeyMk+py/LVSRJipTB/Ko0URkBTtXoGuw/YZn0wM27 W80g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=iytjrbgZ; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v99si3071960wrb.289.2017.08.09.04.20.44; Wed, 09 Aug 2017 04:20:44 -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=@linaro.org header.s=google header.b=iytjrbgZ; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7C9A2689A8F; Wed, 9 Aug 2017 14:20:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 13ECB689754 for ; Wed, 9 Aug 2017 14:19:59 +0300 (EEST) Received: by mail-wm0-f45.google.com with SMTP id t201so28613294wmt.0 for ; Wed, 09 Aug 2017 04:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=78+/MmjJMtujOxGPEAyN+GwWiNFU8KZa1xf5UqWu+6w=; b=iytjrbgZggZliKOVbnC4RNazv6prAvb4LvwlOrX1xCRGB+44MTMUXyEm5V5mCIfdjn EDejyNd5Jpm10Dfu7c/p2FXyd0GJS0EgwUdjFGlaMJkuTmatqfoA862l1Xv4DcTvJ+Gy oxu6XXkEVbkSrlyyv382MGH3Cs0Z7yhVFYS4M= 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:in-reply-to :references; bh=78+/MmjJMtujOxGPEAyN+GwWiNFU8KZa1xf5UqWu+6w=; b=L+woENPL0ZlBhfJaz6Sk/lCgTldaag+7oOdLHIcyWEfK3aMIgNzZLZQD/qQ2MzRS7S vDAm2c1Ty7ySIpEI8a2UQDAV/NBkljXBwbFQDH0iTD0Eh6CYF2pEPgaPLKOIigDer0SA zo8kfwYfZTuqVopkgwrpM2UBOok/f2B7Au8mlymtPOtM7ZIIrEHC93ZclKlsmH8LNGed s5D8aN2M9zbgZMEIzq3g3rVS4KjeGXFzREfIrr1DndwksM7NLjC2c3fyfwtrVPzJ3UyJ Qsut0D+XIVSFFQbMXaGZJNkmPy6O40+NBRTQQe/nrbGbBSHXxToaNHGFhHrCs95e8Uwo Dmjg== X-Gm-Message-State: AHYfb5hlzemuvGYThYdqLng/P8HGb0RusjVsCUzn/pBYWRJbUf+uH2km XtVT4pKR5rPcdMl1 X-Received: by 10.28.32.150 with SMTP id g144mr4655920wmg.70.1502277601052; Wed, 09 Aug 2017 04:20:01 -0700 (PDT) Received: from igloo.80.58.61.254 (39.red-81-40-130.staticip.rima-tde.net. [81.40.130.39]) by smtp.gmail.com with ESMTPSA id 134sm3136849wmw.24.2017.08.09.04.19.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Aug 2017 04:19:59 -0700 (PDT) From: Jorge Ramirez-Ortiz To: jorge.ramirez-ortiz@linaro.org, sw@jkqxz.net, ffmpeg-devel@ffmpeg.org, michael@niedermayer.cc Date: Wed, 9 Aug 2017 13:19:48 +0200 Message-Id: <1502277589-12397-4-git-send-email-jorge.ramirez-ortiz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502277589-12397-1-git-send-email-jorge.ramirez-ortiz@linaro.org> References: <1502277589-12397-1-git-send-email-jorge.ramirez-ortiz@linaro.org> Subject: [FFmpeg-devel] [PATCHv5 3/4] libavcodec: v4l2: add codec formats 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: nicolas.dechesne@linaro.org, stanimir.varbanov@linaro.org, aballier@gentoo.org MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" In addition, enable the multi planar raw formats. Reviewed-by: Jorge Ramirez Tested-by: Jorge Ramirez --- libavcodec/v4l2_fmt.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/libavcodec/v4l2_fmt.c b/libavcodec/v4l2_fmt.c index 855cc64..2cda6b2 100644 --- a/libavcodec/v4l2_fmt.c +++ b/libavcodec/v4l2_fmt.c @@ -58,7 +58,43 @@ const struct v4l_fmt_map avpriv_v4l_fmt_conversion_table[] = { { AV_PIX_FMT_BAYER_GRBG8, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_SGRBG8 , FF_V4L_PACK_AVPACKET | FF_V4L_PACK_AVFRAME }, { AV_PIX_FMT_BAYER_RGGB8, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_SRGGB8 , FF_V4L_PACK_AVPACKET | FF_V4L_PACK_AVFRAME }, #endif - { AV_PIX_FMT_NONE, AV_CODEC_ID_NONE, 0 }, +#ifdef V4L2_PIX_FMT_NV12M + { AV_PIX_FMT_NV12, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_NV12M , FF_V4L_PACK_AVFRAME }, +#endif +#ifdef V4L2_PIX_FMT_NV21M + { AV_PIX_FMT_NV21, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_NV21M , FF_V4L_PACK_AVFRAME }, +#endif +#ifdef V4L2_PIX_FMT_YUV420M + { AV_PIX_FMT_YUV420P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV420M , FF_V4L_PACK_AVFRAME }, +#endif +#ifdef V4L2_PIX_FMT_NV16M + { AV_PIX_FMT_NV16, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_NV16M , FF_V4L_PACK_AVFRAME }, +#endif +#ifdef V4L2_PIX_FMT_DV + { AV_PIX_FMT_NONE, AV_CODEC_ID_DVVIDEO, V4L2_PIX_FMT_DV , FF_V4L_PACK_AVPACKET }, +#endif +#ifdef V4L2_PIX_FMT_H263 + { AV_PIX_FMT_NONE, AV_CODEC_ID_H263, V4L2_PIX_FMT_H263 , FF_V4L_PACK_AVPACKET }, +#endif +#ifdef V4L2_PIX_FMT_MPEG1 + { AV_PIX_FMT_NONE, AV_CODEC_ID_MPEG1VIDEO, V4L2_PIX_FMT_MPEG1 , FF_V4L_PACK_AVPACKET }, +#endif +#ifdef V4L2_PIX_FMT_MPEG2 + { AV_PIX_FMT_NONE, AV_CODEC_ID_MPEG2VIDEO, V4L2_PIX_FMT_MPEG2 , FF_V4L_PACK_AVPACKET }, +#endif +#ifdef V4L2_PIX_FMT_VC1_ANNEX_G + { AV_PIX_FMT_NONE, AV_CODEC_ID_VC1, V4L2_PIX_FMT_VC1_ANNEX_G, FF_V4L_PACK_AVPACKET }, +#endif +#ifdef V4L2_PIX_FMT_VP8 + { AV_PIX_FMT_NONE, AV_CODEC_ID_VP8, V4L2_PIX_FMT_VP8 , FF_V4L_PACK_AVPACKET }, +#endif +#ifdef V4L2_PIX_FMT_HEVC + { AV_PIX_FMT_NONE, AV_CODEC_ID_HEVC, V4L2_PIX_FMT_HEVC , FF_V4L_PACK_AVPACKET}, +#endif +#ifdef V4L2_PIX_FMT_VP9 + { AV_PIX_FMT_NONE, AV_CODEC_ID_VP9, V4L2_PIX_FMT_VP9 , FF_V4L_PACK_AVPACKET }, +#endif + { AV_PIX_FMT_NONE, AV_CODEC_ID_NONE, 0 , FF_V4L_PACK_AVPACKET | FF_V4L_PACK_AVFRAME }, }; uint32_t avpriv_v4l_fmt_ff2v4l(enum AVPixelFormat pix_fmt, enum AVCodecID codec_id, int pack_flags)