From patchwork Sun Jun 11 05:24:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "LongChair ." X-Patchwork-Id: 3904 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.195 with SMTP id 186csp385392vsk; Sat, 10 Jun 2017 22:24:30 -0700 (PDT) X-Received: by 10.28.113.21 with SMTP id m21mr243614wmc.83.1497158670687; Sat, 10 Jun 2017 22:24:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497158670; cv=none; d=google.com; s=arc-20160816; b=WfwJUDQXBHKvNLH1OSNoY2SilDJcxkY6S9jZz93CDIPpw5DFMS7djI2KQZboyjPBra Hw2dgZXCmrsSVkiLmI6+E9dGLrLnB0oU3eWY//kjB/5y7xSOD/fols9hVS3i/VxfuR9N sQNJ1zEHA+T7dVDqPAA/GoMQYmyfavkrHH3AsC4ClTtinDzFQFwWiPly2LYYECvj53pb 56zBoAfcqZlS92ds6QoBQbTzqaiWepmC+6mQiedt92wG7EPb7pXUtdyg1DLNO+zsS7FB O39BB0OVBBSUgytQ1yer2ZExmKFJt/UeJMPlqWNaTWAfAUKxnLh7mwx8w94PJjMJmdb5 wSGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:spamdiagnosticmetadata :spamdiagnosticoutput:content-language:accept-language:message-id :date:thread-index:thread-topic:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=Zhn/wWx6U79ZKM4o0yJGdoyxOkxm3VxW6bYST9CcjSc=; b=VpBeZNqLAz/n0wahOjh6+MzV3xR1+VLMQyxUslGMQs61icjPBLRrEPJeOf777FxkZx LnJZQSDnsK58c0oReJJE6hRe4PbZPVV5dhFC+IDGKSF39vo6hqJ/o6hhP+FODnMxDykf CSoB2SaUWkwLr32NEF3WOSr9qOLeewVD7LW+bHfs2Vtw9/1xL0ED5JUdSPxp+vMLsnTH 2miS8oCJsRI+AXMnhMVpYzzQpM4FuX4Ty2i5Jm6XA/hvJ2BO0CzBTQwiGOArfjS8mba/ rOvFrky9Xoix84y8LAIXhMIIBiuYn62XH5/hFMOhf0PfyjIe8RDiQNhDAb0wdYrBQo3X ufYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.b=LpUg5qt8; 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=hotmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g10si4175209wmc.16.2017.06.10.22.24.29; Sat, 10 Jun 2017 22:24:30 -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=@hotmail.com header.b=LpUg5qt8; 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=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DA906898D3; Sun, 11 Jun 2017 08:24:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-oln040092004016.outbound.protection.outlook.com [40.92.4.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD2F96891E0 for ; Sun, 11 Jun 2017 08:24:17 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=wBdUTiqZLEnads0cht8rn5CX9hwAHAxL54ThKTnnr90=; b=LpUg5qt8eZJAhTX+XpaPMRittPL+m0AhfCDW2LZO1nfnLyxubTvBJnh43JBmxcZOUS+BwO+hiZ17W5dCV6u98EiBhIn7b7UaJQAENz4Bu6AFSNaiReZghLWKuDek3C1UhoDyn69qyZIQGJpUDPkaeTGNs5v3vBWU+AVw2IEOY9ca43WBvcSh8dK3zxoSYdYR1ErtszI3NNSBeITYrEYfTGwA0u2goQRUYjOrPfIav9O6RN8i978vyLQ10Wcq3jmoLdavsoFXcdtnIyedulyNl+NbrtG7PFrxyDg4ATGu7RO4tYthumbzrxgSGsBZK/A9Z86zVzHJapRUombj7iWD4Q== Received: from CY1NAM02FT006.eop-nam02.prod.protection.outlook.com (10.152.74.53) by CY1NAM02HT181.eop-nam02.prod.protection.outlook.com (10.152.74.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1101.12; Sun, 11 Jun 2017 05:24:16 +0000 Received: from CY4PR1701MB1782.namprd17.prod.outlook.com (10.152.74.56) by CY1NAM02FT006.mail.protection.outlook.com (10.152.74.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1143.11 via Frontend Transport; Sun, 11 Jun 2017 05:24:16 +0000 Received: from CY4PR1701MB1782.namprd17.prod.outlook.com ([10.171.211.141]) by CY4PR1701MB1782.namprd17.prod.outlook.com ([10.171.211.141]) with mapi id 15.01.1157.017; Sun, 11 Jun 2017 05:24:16 +0000 From: "LongChair ." To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] Add support for RockChip Media Process Platform This adds hardware decoding for h264 / HEVC / VP8 using MPP Rockchip API. Will return frames holding a av_drmprime struct that allows drm / dmabuf usage. Thread-Index: AQHS4nL4S1L4Ig/L90KaP5Slpk8aug== Date: Sun, 11 Jun 2017 05:24:16 +0000 Message-ID: Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: ffmpeg.org; dkim=none (message not signed) header.d=none; ffmpeg.org; dmarc=none action=none header.from=hotmail.com; x-incomingtopheadermarker: OriginalChecksum:332734AB197A651B245D4910B3E05F3E436F8B44DBA91FACE913F00B21276A0C; UpperCasedChecksum:15B8B621231E4EF041A91933313F5FEFD096861D63E897BFB26EE0D711D1AF89; SizeAsReceived:7477; Count:44 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [b29Nn0YnescYvx18tOcHu6tvN1nN/rQC] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY1NAM02HT181; 24:umGb9t0sMrckb2IaurfFtQbTrDPsX49tawg5M7kOkbmc+Wrz3i9DUUQzRjcr56OzoySZfOoArIuZDMroHHQvirFzmkKmvmd81ttdHBPikQY=; 7:IFKVER6qD4G9uSOEe32NjPD2lRaRrEstlMZ4S4sWfJnjTsfNTacYTCGrkwCwDb55WwdQVlw24pKeP6zmGURdmdamwt+6v7qLeB++N698Co/xomph+WNI4/fhb3opSsF5ux0AqpDZkm0b6RJT/SSVZX1pbBKzwkHpi+mqZu2EatMfObXjmAAYBg9OORuQxsiEA5ktyGO4K6HiyeU7nPnPY0MU4quclgpQAtaU+Nw+dc8T8k/jNbRxwa/Gh7i190stbbNAKihbVTjFjnpdfEh/1Su9jfWYOiYSUKegjK6e4Sr8j08nifczyb6iyh3Rukwg x-incomingheadercount: 44 x-eopattributedmessage: 0 x-forefront-antispam-report: EFV:NLI; SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:CY1NAM02HT181; H:CY4PR1701MB1782.namprd17.prod.outlook.com; FPR:; SPF:None; LANG:en; x-ms-traffictypediagnostic: CY1NAM02HT181: x-ms-office365-filtering-correlation-id: 2479f97f-42ba-44f0-a063-08d4b08a1a52 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322274)(1601125374)(1603101448)(1701031045); SRVR:CY1NAM02HT181; x-ms-exchange-slblob-mailprops: citmFLqyTFQi1eZSIA+9Gpq7GhARS79g9g2NVjGY5w19S+V3ZCA89GGeykRqqRO6LHZUM7Oz+kV2zxGXWIk/kfA3QheSyCk/aIyA5No6SuMBX+OgxKdr/gpdFdW/wRl2cejzTatNZJIFMhAJTcx3sBlya8YqyN5TIJxJJoYTlp4yNinNSviYdQ85pnlqqWYqaSG7NRl2tPovmmHOl7iS6ta2TsKYeBIw8i7AkCNwPUcS1/qEslW82LbQSLWk7037OgRp0IqrFYovuow62UgF7E4eVn4+kA8lLPsCy9nYG/3phdtxIClvZytMZS5FYuUVrMEvU9cBzgIGhRcmPT0lTxJLwuySV1Y0p+98jprucaNQmWb3+hcLiezcfD8UUMaFvrVlMArn965g7faNFO76YTSjLrTyg+pNY0eJ6pODVDEGMmJVbAgZPugcffZPFAeQUfB4hYQai0bSB6gBMNMe9eZL0i43dwIcnNBV4I3CtT2hAaEwxwD04kraQJUSqvUxkDO/jAbDtRUJB0qZ2CxUjMOqVMYTas3kqaoxlcX1VXPVV2sMm2bZfD+MXbtktpmVNFAfd2McK9qb47DsE2EN1uR3WPlSV3W4j+A5PyBafL9zdm4ma+he+bszflSoM/uD6h56iOBfZBppWeyqgdnORjFR0ZmSby/5kCMb0SDhHHY+FyDXUUu3nHRxNmcJCNwHcGkfujnJIjGSN0qhyjCGsEWc0hOnRFbNcWcP0yfNp0OzWQ3aU2LUZsttUAs39CxLc+XRyNhd2i8rApj4Lw4ID33G7I3KoP1XeiNFNQ6juH8= x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(444000031); SRVR:CY1NAM02HT181; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1NAM02HT181; x-forefront-prvs: 03355EE97E spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jun 2017 05:24:16.4211 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1NAM02HT181 Subject: [FFmpeg-devel] [PATCH] Add support for RockChip Media Process Platform This adds hardware decoding for h264 / HEVC / VP8 using MPP Rockchip API. Will return frames holding a av_drmprime struct that allows drm / dmabuf usage. 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: "LongChair ." Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: LongChair --- Changelog | 1 + configure | 12 ++ libavcodec/Makefile | 4 + libavcodec/allcodecs.c | 6 + libavcodec/drmprime.h | 17 ++ libavcodec/rkmppdec.c | 522 +++++++++++++++++++++++++++++++++++++++++++++++++ libavutil/pixdesc.c | 4 + libavutil/pixfmt.h | 5 + 8 files changed, 571 insertions(+) create mode 100644 libavcodec/drmprime.h create mode 100644 libavcodec/rkmppdec.c diff --git a/Changelog b/Changelog index 3533bdc..498e433 100644 --- a/Changelog +++ b/Changelog @@ -52,6 +52,7 @@ version 3.3: - Removed asyncts filter (use af_aresample instead) - Intel QSV-accelerated VP8 video decoding - VAAPI-accelerated deinterlacing +- Addition of Rockchip MPP harware decoding version 3.2: diff --git a/configure b/configure index 4ec8f21..883fc84 100755 --- a/configure +++ b/configure @@ -304,6 +304,7 @@ External library support: --disable-nvenc disable Nvidia video encoding code [autodetect] --enable-omx enable OpenMAX IL code [no] --enable-omx-rpi enable OpenMAX IL code for Raspberry Pi [no] + --enable-rkmpp enable Rockchip Media Process Platform code [no] --disable-vaapi disable Video Acceleration API (mainly Unix/Intel) code [autodetect] --disable-vda disable Apple Video Decode Acceleration code [autodetect] --disable-vdpau disable Nvidia Video Decode and Presentation API for Unix code [autodetect] @@ -1607,6 +1608,7 @@ HWACCEL_LIBRARY_LIST=" libmfx mmal omx + rkmpp " DOCUMENT_LIST=" @@ -2616,6 +2618,7 @@ h264_dxva2_hwaccel_select="h264_decoder" h264_mediacodec_hwaccel_deps="mediacodec" h264_mmal_hwaccel_deps="mmal" h264_qsv_hwaccel_deps="libmfx" +h264_rkmpp_hwaccel_deps="rkmpp" h264_vaapi_hwaccel_deps="vaapi" h264_vaapi_hwaccel_select="h264_decoder" h264_vda_hwaccel_deps="vda" @@ -2634,6 +2637,7 @@ hevc_mediacodec_hwaccel_deps="mediacodec" hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC" hevc_dxva2_hwaccel_select="hevc_decoder" hevc_qsv_hwaccel_deps="libmfx" +hevc_rkmpp_hwaccel_deps="rkmpp" hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC" hevc_vaapi_hwaccel_select="hevc_decoder" hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC" @@ -2696,6 +2700,7 @@ vp9_cuvid_hwaccel_deps="cuda cuvid" vp9_cuvid_hwaccel_select="vp9_cuvid_decoder" vp8_mediacodec_hwaccel_deps="mediacodec" vp8_qsv_hwaccel_deps="libmfx" +vp8_rkmpp_hwaccel_deps="rkmpp" vp9_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_VP9" vp9_d3d11va_hwaccel_select="vp9_decoder" vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9" @@ -2736,6 +2741,8 @@ h264_qsv_decoder_deps="libmfx" h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel" h264_qsv_encoder_deps="libmfx" h264_qsv_encoder_select="qsvenc" +h264_rkmpp_decoder_deps="rkmpp" +h264_rkmpp_decoder_select="h264_mp4toannexb_bsf rkmpp h264_rkmpp_hwaccel" h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264" h264_vaapi_encoder_select="vaapi_encode golomb" h264_vda_decoder_deps="vda" @@ -2751,6 +2758,8 @@ hevc_qsv_decoder_deps="libmfx" hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec hevc_qsv_hwaccel" hevc_qsv_encoder_deps="libmfx" hevc_qsv_encoder_select="hevcparse qsvenc" +hevc_rkmpp_decoder_deps="rkmpp" +hevc_rkmpp_decoder_select="hevc_mp4toannexb_bsf rkmpp hevc_rkmpp_hwaccel" hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC" hevc_vaapi_encoder_select="vaapi_encode golomb" mjpeg_cuvid_decoder_deps="cuda cuvid" @@ -2789,6 +2798,8 @@ vp8_cuvid_decoder_deps="cuda cuvid" vp8_mediacodec_decoder_deps="mediacodec" vp8_qsv_decoder_deps="libmfx" vp8_qsv_decoder_select="qsvdec vp8_qsv_hwaccel vp8_parser" +vp8_rkmpp_decoder_deps="rkmpp" +vp8_rkmpp_decoder_select="rkmpp vp8_rkmpp_hwaccel" vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8" vp8_vaapi_encoder_select="vaapi_encode" vp9_cuvid_decoder_deps="cuda cuvid" @@ -5917,6 +5928,7 @@ enabled mmal && { check_lib mmal interface/mmal/mmal.h mmal_port_co check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host; } || die "ERROR: mmal not found" && check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; } +enabled rkmpp && { check_lib rkmpp rockchip/rk_mpi.h mpp_create "-lrockchip_mpp" || die "ERROR : Rockchip MPP was not found."; } enabled netcdf && require_pkg_config netcdf netcdf.h nc_inq_libvers enabled openal && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do check_lib openal 'AL/al.h' alGetError "${al_extralibs}" && break; done } || diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0818950..1f83813 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -18,6 +18,7 @@ HEADERS = avcodec.h \ videotoolbox.h \ vorbis_parser.h \ xvmc.h \ + drmprime.h \ OBJS = allcodecs.o \ audioconvert.o \ @@ -334,6 +335,7 @@ OBJS-$(CONFIG_H264_VDA_DECODER) += vda_h264_dec.o OBJS-$(CONFIG_H264_OMX_ENCODER) += omx.o OBJS-$(CONFIG_H264_QSV_DECODER) += qsvdec_h2645.o OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o +OBJS-$(CONFIG_H264_RKMPP_DECODER) += rkmppdec.o OBJS-$(CONFIG_H264_VAAPI_ENCODER) += vaapi_encode_h264.o vaapi_encode_h26x.o OBJS-$(CONFIG_H264_VIDEOTOOLBOX_ENCODER) += videotoolboxenc.o OBJS-$(CONFIG_HAP_DECODER) += hapdec.o hap.o @@ -348,6 +350,7 @@ OBJS-$(CONFIG_NVENC_HEVC_ENCODER) += nvenc_hevc.o OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec_h2645.o OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o \ hevc_data.o +OBJS-$(CONFIG_HEVC_RKMPP_DECODER) += rkmppdec.o OBJS-$(CONFIG_HEVC_VAAPI_ENCODER) += vaapi_encode_h265.o vaapi_encode_h26x.o OBJS-$(CONFIG_HNM4_VIDEO_DECODER) += hnm4video.o OBJS-$(CONFIG_HQ_HQA_DECODER) += hq_hqa.o hq_hqadata.o hq_hqadsp.o \ @@ -618,6 +621,7 @@ OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp56rac.o OBJS-$(CONFIG_VP8_CUVID_DECODER) += cuvid.o OBJS-$(CONFIG_VP8_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_VP8_QSV_DECODER) += qsvdec_other.o +OBJS-$(CONFIG_VP8_RKMPP_DECODER) += rkmppdec.o OBJS-$(CONFIG_VP8_VAAPI_ENCODER) += vaapi_encode_vp8.o OBJS-$(CONFIG_VP9_DECODER) += vp9.o vp9data.o vp9dsp.o vp9lpf.o vp9recon.o \ vp9block.o vp9prob.o vp9mvs.o vp56rac.o \ diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 89fadcd..95d90fb 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -70,6 +70,7 @@ static void register_all(void) REGISTER_HWACCEL(H264_MEDIACODEC, h264_mediacodec); REGISTER_HWACCEL(H264_MMAL, h264_mmal); REGISTER_HWACCEL(H264_QSV, h264_qsv); + REGISTER_HWACCEL(H264_RKMPP, h264_rkmpp); REGISTER_HWACCEL(H264_VAAPI, h264_vaapi); REGISTER_HWACCEL(H264_VDA, h264_vda); REGISTER_HWACCEL(H264_VDA_OLD, h264_vda_old); @@ -80,6 +81,7 @@ static void register_all(void) REGISTER_HWACCEL(HEVC_DXVA2, hevc_dxva2); REGISTER_HWACCEL(HEVC_MEDIACODEC, hevc_mediacodec); REGISTER_HWACCEL(HEVC_QSV, hevc_qsv); + REGISTER_HWACCEL(HEVC_RKMPP, hevc_rkmpp); REGISTER_HWACCEL(HEVC_VAAPI, hevc_vaapi); REGISTER_HWACCEL(HEVC_VDPAU, hevc_vdpau); REGISTER_HWACCEL(MJPEG_CUVID, mjpeg_cuvid); @@ -112,6 +114,7 @@ static void register_all(void) REGISTER_HWACCEL(VP8_CUVID, vp8_cuvid); REGISTER_HWACCEL(VP8_MEDIACODEC, vp8_mediacodec); REGISTER_HWACCEL(VP8_QSV, vp8_qsv); + REGISTER_HWACCEL(VP8_RKMPP, vp8_rkmpp); REGISTER_HWACCEL(VP9_CUVID, vp9_cuvid); REGISTER_HWACCEL(VP9_D3D11VA, vp9_d3d11va); REGISTER_HWACCEL(VP9_DXVA2, vp9_dxva2); @@ -204,6 +207,7 @@ static void register_all(void) REGISTER_DECODER(H264_MEDIACODEC, h264_mediacodec); REGISTER_DECODER(H264_MMAL, h264_mmal); REGISTER_DECODER(H264_QSV, h264_qsv); + REGISTER_DECODER(H264_RKMPP, h264_rkmpp); REGISTER_DECODER(H264_VDA, h264_vda); #if FF_API_VDPAU REGISTER_DECODER(H264_VDPAU, h264_vdpau); @@ -211,6 +215,7 @@ static void register_all(void) REGISTER_ENCDEC (HAP, hap); REGISTER_DECODER(HEVC, hevc); REGISTER_DECODER(HEVC_QSV, hevc_qsv); + REGISTER_DECODER(HEVC_RKMPP, hevc_rkmpp); REGISTER_DECODER(HNM4_VIDEO, hnm4_video); REGISTER_DECODER(HQ_HQA, hq_hqa); REGISTER_DECODER(HQX, hqx); @@ -363,6 +368,7 @@ static void register_all(void) REGISTER_DECODER(VP6F, vp6f); REGISTER_DECODER(VP7, vp7); REGISTER_DECODER(VP8, vp8); + REGISTER_DECODER(VP8_RKMPP, vp8_rkmpp); REGISTER_DECODER(VP9, vp9); REGISTER_DECODER(VQA, vqa); REGISTER_DECODER(BITPACKED, bitpacked); diff --git a/libavcodec/drmprime.h b/libavcodec/drmprime.h new file mode 100644 index 0000000..44816db --- /dev/null +++ b/libavcodec/drmprime.h @@ -0,0 +1,17 @@ +#ifndef AVCODEC_DRMPRIME_H +#define AVCODEC_DRMPRIME_H + +#include + +#define AV_DRMPRIME_NUM_PLANES 4 // maximum number of planes + +typedef struct av_drmprime { + + int strides[AV_DRMPRIME_NUM_PLANES]; // stride in byte of the according plane + int offsets[AV_DRMPRIME_NUM_PLANES]; // offset from start in byte of the according plane + int fds[AV_DRMPRIME_NUM_PLANES]; // file descriptor for the plane, (0) if unused. + uint32_t format; // FOURC_CC drm format for the image + +} av_drmprime; + +#endif // AVCODEC_DRMPRIME_H diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c new file mode 100644 index 0000000..0251f3b --- /dev/null +++ b/libavcodec/rkmppdec.c @@ -0,0 +1,522 @@ +/* + * RockChip MPP Video Decoder + * Copyright (c) 2015 Lionel CHAZALLON + * + * 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 +#include +#include +#include +#include +#include + +#include "avcodec.h" +#include "decode.h" +#include "drmprime.h" +#include "internal.h" +#include "libavutil/buffer.h" +#include "libavutil/common.h" +#include "libavutil/frame.h" +#include "libavutil/imgutils.h" +#include "libavutil/log.h" + +#define RECEIVE_FRAME_TIMEOUT 100 +#define FRAMEGROUP_MAX_FRAMES 16 + +typedef struct { + MppCtx ctx; + MppApi *mpi; + MppBufferGroup frame_group; + + char first_frame; + char first_packet; + char eos_reached; +} RKMPPDecoder; + +typedef struct { + AVClass *av_class; + AVBufferRef *decoder_ref; +} RKMPPDecodeContext; + +typedef struct { + MppFrame frame; + AVBufferRef *decoder_ref; +} RKMPPFrameContext; + +static MppCodingType ffrkmpp_get_codingtype(AVCodecContext *avctx) +{ + switch (avctx->codec_id) { + case AV_CODEC_ID_H264: return MPP_VIDEO_CodingAVC; + case AV_CODEC_ID_HEVC: return MPP_VIDEO_CodingHEVC; + case AV_CODEC_ID_VP8: return MPP_VIDEO_CodingVP8; + default: return MPP_VIDEO_CodingUnused; + } +} + +static int ffrkmpp_get_frameformat(MppFrameFormat mppformat) +{ + switch (mppformat) { + case MPP_FMT_YUV420SP: return DRM_FORMAT_NV12; +#ifdef DRM_FORMAT_NV12_10 + case MPP_FMT_YUV420SP_10BIT: return DRM_FORMAT_NV12_10; +#endif + default: return 0; + } +} + +static int ffrkmpp_write_data(AVCodecContext *avctx, uint8_t *buffer, int size, int64_t pts) +{ + RKMPPDecodeContext *rk_context = avctx->priv_data; + RKMPPDecoder *decoder = (RKMPPDecoder *)rk_context->decoder_ref->data; + MPP_RET ret = MPP_NOK; + MppPacket packet; + + // create the MPP packet + ret = mpp_packet_init(&packet, buffer, size); + if (ret != MPP_OK) { + av_log(avctx, AV_LOG_ERROR, "Failed to init MPP packet (code = %d)\n", ret); + return AVERROR_UNKNOWN; + } + + mpp_packet_set_pts(packet, pts); + + if (!buffer) + mpp_packet_set_eos(packet); + + ret = decoder->mpi->decode_put_packet(decoder->ctx, packet); + if (ret != MPP_OK) { + if (ret == MPP_ERR_BUFFER_FULL) { + av_log(avctx, AV_LOG_DEBUG, "Buffer full writing %d bytes to decoder\n", size); + ret = AVERROR(EAGAIN); + } else + ret = AVERROR_UNKNOWN; + } + else + av_log(avctx, AV_LOG_DEBUG, "Wrote %d bytes to decoder\n", size); + + mpp_packet_deinit(&packet); + + return ret; +} + +static int ffrkmpp_close_decoder(AVCodecContext *avctx) +{ + RKMPPDecodeContext *rk_context = avctx->priv_data; + av_buffer_unref(&rk_context->decoder_ref); + return 0; +} + +static void ffrkmpp_release_decoder(void *opaque, uint8_t *data) +{ + RKMPPDecoder *decoder = (RKMPPDecoder *)data; + + decoder->mpi->reset(decoder->ctx); + mpp_destroy(decoder->ctx); + decoder->ctx = NULL; + + if (decoder->frame_group) { + mpp_buffer_group_put(decoder->frame_group); + decoder->frame_group = NULL; + } + + av_free(decoder); +} + +static int ffrkmpp_init_decoder(AVCodecContext *avctx) +{ + RKMPPDecodeContext *rk_context = avctx->priv_data; + RKMPPDecoder *decoder = NULL; + MppCodingType codectype = MPP_VIDEO_CodingUnused; + MPP_RET ret = MPP_NOK; + RK_S64 paramS64; + RK_S32 paramS32; + + if ((ret = ff_get_format(avctx, avctx->codec->pix_fmts)) < 0) + return ret; + + avctx->pix_fmt = ret; + + // create a decoder and a ref to it + decoder = av_mallocz(sizeof(RKMPPDecoder)); + if (!decoder) { + ret = AVERROR(ENOMEM); + goto fail; + } + + rk_context->decoder_ref = av_buffer_create((uint8_t *)decoder, sizeof(*decoder), ffrkmpp_release_decoder, + NULL, AV_BUFFER_FLAG_READONLY); + if (!rk_context->decoder_ref) { + av_free(decoder); + ret = AVERROR(ENOMEM); + goto fail; + } + + av_log(avctx, AV_LOG_DEBUG, "Initializing RKMPP decoder.\n"); + + codectype = ffrkmpp_get_codingtype(avctx); + if (codectype == MPP_VIDEO_CodingUnused) { + av_log(avctx, AV_LOG_ERROR, "Unknown codec type (%d).\n", avctx->codec_id); + ret = AVERROR_UNKNOWN; + goto fail; + } + + // Create the MPP context + ret = mpp_create(&decoder->ctx, &decoder->mpi); + if (ret != MPP_OK) { + av_log(avctx, AV_LOG_ERROR, "Failed to create MPP context (code = %d).\n", ret); + ret = AVERROR_UNKNOWN; + goto fail; + } + + // initialize mpp + ret = mpp_init(decoder->ctx, MPP_CTX_DEC, codectype); + if (ret != MPP_OK) { + av_log(avctx, AV_LOG_ERROR, "Failed to initialize MPP context (code = %d).\n", ret); + ret = AVERROR_UNKNOWN; + goto fail; + } + + // make decode calls blocking with a timeout + paramS32 = MPP_POLL_BLOCK; + ret = decoder->mpi->control(decoder->ctx, MPP_SET_OUTPUT_BLOCK, ¶mS32); + if (ret != MPP_OK) { + av_log(avctx, AV_LOG_ERROR, "Failed to set blocking mode on MPI (code = %d).\n", ret); + ret = AVERROR_UNKNOWN; + goto fail; + } + + paramS64 = RECEIVE_FRAME_TIMEOUT; + ret = decoder->mpi->control(decoder->ctx, MPP_SET_OUTPUT_BLOCK_TIMEOUT, ¶mS64); + if (ret != MPP_OK) { + av_log(avctx, AV_LOG_ERROR, "Failed to set block timeout on MPI (code = %d).\n", ret); + ret = AVERROR_UNKNOWN; + goto fail; + } + + ret = mpp_buffer_group_get_internal(&decoder->frame_group, MPP_BUFFER_TYPE_ION); + if (ret) { + av_log(avctx, AV_LOG_ERROR, "Failed to retrieve buffer group (code = %d)\n", ret); + ret = AVERROR_UNKNOWN; + goto fail; + } + + ret = decoder->mpi->control(decoder->ctx, MPP_DEC_SET_EXT_BUF_GROUP, decoder->frame_group); + if (ret) { + av_log(avctx, AV_LOG_ERROR, "Failed to assign buffer group (code = %d)\n", ret); + ret = AVERROR_UNKNOWN; + goto fail; + } + + ret = mpp_buffer_group_limit_config(decoder->frame_group, 0, FRAMEGROUP_MAX_FRAMES); + if (ret) { + av_log(avctx, AV_LOG_ERROR, "Failed to set buffer group limit (code = %d)\n", ret); + ret = AVERROR_UNKNOWN; + goto fail; + } + + decoder->first_packet = 1; + + av_log(avctx, AV_LOG_DEBUG, "RKMPP decoder initialized successfully.\n"); + return 0; + +fail: + av_log(avctx, AV_LOG_ERROR, "Failed to initialize RKMPP decoder.\n"); + ffrkmpp_close_decoder(avctx); + return ret; +} + +static int ffrkmpp_send_packet(AVCodecContext *avctx, const AVPacket *avpkt) +{ + RKMPPDecodeContext *rk_context = avctx->priv_data; + RKMPPDecoder *decoder = (RKMPPDecoder *)rk_context->decoder_ref->data; + MPP_RET ret = MPP_NOK; + + // handle EOF + if (!avpkt->size) { + av_log(avctx, AV_LOG_DEBUG, "End of stream.\n"); + decoder->eos_reached = 1; + ret = ffrkmpp_write_data(avctx, NULL, 0, 0); + if (ret) + av_log(avctx, AV_LOG_ERROR, "Failed to send EOS to decoder (code = %d)\n", ret); + return ret; + } + + // on first packet, send extradata + if (decoder->first_packet) { + if (avctx->extradata_size) { + ret = ffrkmpp_write_data(avctx, avctx->extradata, + avctx->extradata_size, + avpkt->pts); + if (ret) { + av_log(avctx, AV_LOG_ERROR, "Failed to write extradata to decoder (code = %d)\n", ret); + return ret; + } + } + decoder->first_packet = 0; + } + + // now send packet + ret = ffrkmpp_write_data(avctx, avpkt->data, avpkt->size, avpkt->pts); + if (ret) + av_log(avctx, AV_LOG_ERROR, "Failed to write data to decoder (code = %d)\n", ret); + + return ret; +} + +static void ffrkmpp_release_frame(void *opaque, uint8_t *data) +{ + av_drmprime *primedata = (av_drmprime *)data; + AVBufferRef *framecontextref = (AVBufferRef *)opaque; + RKMPPFrameContext *framecontext = (RKMPPFrameContext *)framecontextref->data; + + mpp_frame_deinit(&framecontext->frame); + av_buffer_unref(&framecontext->decoder_ref); + av_buffer_unref(&framecontextref); + + av_free(primedata); +} + +static int ffrkmpp_retrieve_frame(AVCodecContext *avctx, AVFrame *frame) +{ + RKMPPDecodeContext *rk_context = avctx->priv_data; + RKMPPDecoder *decoder = (RKMPPDecoder *)rk_context->decoder_ref->data; + RKMPPFrameContext *framecontext = NULL; + AVBufferRef *framecontextref = NULL; + MPP_RET ret = MPP_NOK; + MppFrame mppframe = NULL; + MppBuffer buffer = NULL; + av_drmprime *primedata = NULL; + int retrycount = 0; + + // on start of decoding, MPP can return -1, which is supposed to be expected + // this is due to some internal MPP init which is not completed, that will + // only happen in the first few frames queries, but should not be interpreted + // as an error, Therefore we need to retry a couple times when we get -1 + // in order to let it time to complete it's init, then we sleep a bit between retries. +retry_get_frame: + ret = decoder->mpi->decode_get_frame(decoder->ctx, &mppframe); + if (ret != MPP_OK && ret != MPP_ERR_TIMEOUT) { + if (retrycount < 5) { + av_log(avctx, AV_LOG_DEBUG, "Failed to get a frame, retrying (code = %d, retrycount = %d)\n", ret, retrycount); + usleep(10000); + retrycount++; + goto retry_get_frame; + } else { + av_log(avctx, AV_LOG_ERROR, "Failed to get a frame from MPP (code = %d)\n", ret); + goto fail; + } + } + + if (mppframe) { + // Check wether we have a special frame or not + if (mpp_frame_get_info_change(mppframe)) { + av_log(avctx, AV_LOG_INFO, "Decoder noticed an info change (%dx%d), format=%d\n", + (int)mpp_frame_get_width(mppframe), (int)mpp_frame_get_height(mppframe), + (int)mpp_frame_get_fmt(mppframe)); + + avctx->width = mpp_frame_get_width(mppframe); + avctx->height = mpp_frame_get_height(mppframe); + + decoder->mpi->control(decoder->ctx, MPP_DEC_SET_INFO_CHANGE_READY, NULL); + decoder->first_frame = 1; + + // here decoder is fully initialized, we need to feed it again with data + ret = AVERROR(EAGAIN); + goto fail; + } else if (mpp_frame_get_eos(mppframe)) { + av_log(avctx, AV_LOG_DEBUG, "Received a EOS frame.\n"); + decoder->eos_reached = 1; + ret = AVERROR_EOF; + goto fail; + } else if (mpp_frame_get_discard(mppframe) || mpp_frame_get_errinfo(mppframe)) { + av_log(avctx, AV_LOG_DEBUG, "Received a discard/errinfo frame.\n"); + ret = AVERROR(EAGAIN); + goto fail; + } + + // here we should have a valid frame + av_log(avctx, AV_LOG_DEBUG, "Received a frame.\n"); + + // setup general frame fields + frame->format = AV_PIX_FMT_RKMPP; + frame->width = mpp_frame_get_width(mppframe); + frame->height = mpp_frame_get_height(mppframe); + frame->pts = mpp_frame_get_pts(mppframe); + + // now setup the frame buffer info + buffer = mpp_frame_get_buffer(mppframe); + if (buffer) { + primedata = av_mallocz(sizeof(av_drmprime)); + if (!primedata) { + ret = AVERROR(ENOMEM); + goto fail; + } + + primedata->strides[0] = mpp_frame_get_hor_stride(mppframe); + primedata->strides[1] = primedata->strides[0]; + primedata->offsets[0] = 0; + primedata->offsets[1] = primedata->strides[0] * mpp_frame_get_ver_stride(mppframe); + primedata->fds[0] = mpp_buffer_get_fd(buffer); + primedata->format = ffrkmpp_get_frameformat(mpp_frame_get_fmt(mppframe)); + + // we also allocate a struct in buf[0] that will allow to hold additionnal information + // for releasing properly MPP frames and decoder + framecontextref = av_buffer_allocz(sizeof(*framecontext)); + if (!framecontextref) { + ret = AVERROR(ENOMEM); + goto fail; + } + + // MPP decoder needs to be closed only when all frames have been released. + framecontext = (RKMPPFrameContext *)framecontextref->data; + framecontext->decoder_ref = av_buffer_ref(rk_context->decoder_ref); + framecontext->frame = mppframe; + + frame->data[3] = (uint8_t *)primedata; + frame->buf[0] = av_buffer_create((uint8_t *)primedata, sizeof(*primedata), ffrkmpp_release_frame, + framecontextref, AV_BUFFER_FLAG_READONLY); + + if (!frame->buf[0]) { + ret = AVERROR(ENOMEM); + goto fail; + } + + decoder->first_frame = 0; + return 0; + } else { + av_log(avctx, AV_LOG_ERROR, "Failed to retrieve the frame buffer, frame is dropped (code = %d)\n", ret); + mpp_frame_deinit(&mppframe); + } + } else if (decoder->eos_reached) { + return AVERROR_EOF; + } else if (ret == MPP_ERR_TIMEOUT) { + av_log(avctx, AV_LOG_DEBUG, "Timeout when trying to get a frame from MPP\n"); + } + + return AVERROR(EAGAIN); + +fail: + if (mppframe) + mpp_frame_deinit(&mppframe); + + if (framecontext) + av_buffer_unref(&framecontext->decoder_ref); + + if (framecontextref) + av_buffer_unref(&framecontextref); + + if (primedata) + av_free(primedata); + + return ret; +} + +static int ffrkmpp_receive_frame(AVCodecContext *avctx, AVFrame *frame) +{ + RKMPPDecodeContext *rk_context = avctx->priv_data; + RKMPPDecoder *decoder = (RKMPPDecoder *)rk_context->decoder_ref->data; + MPP_RET ret = MPP_NOK; + AVPacket pkt = {0}; + RK_S32 freeslots; + + if (!decoder->eos_reached) { + // we get the available slots in decoder + ret = decoder->mpi->control(decoder->ctx, MPP_DEC_GET_FREE_PACKET_SLOT_COUNT, &freeslots); + if (ret != MPP_OK) { + av_log(avctx, AV_LOG_ERROR, "Failed to get decoder free slots (code = %d).\n", ret); + return ret; + } + + if (freeslots > 0) { + ret = ff_decode_get_packet(avctx, &pkt); + if (ret < 0 && ret != AVERROR_EOF) { + return ret; + } + + ret = ffrkmpp_send_packet(avctx, &pkt); + av_packet_unref(&pkt); + + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to send packet to decoder (code = %d)\n", ret); + return ret; + } + } + + // make sure we keep decoder full + if (freeslots > 1 && decoder->first_frame) + return AVERROR(EAGAIN); + } + + return ffrkmpp_retrieve_frame(avctx, frame); +} + +static void ffrkmpp_flush(AVCodecContext *avctx) +{ + RKMPPDecodeContext *rk_context = avctx->priv_data; + RKMPPDecoder *decoder = (RKMPPDecoder *)rk_context->decoder_ref->data; + MPP_RET ret = MPP_NOK; + + av_log(avctx, AV_LOG_DEBUG, "Flush.\n"); + + ret = decoder->mpi->reset(decoder->ctx); + if (ret == MPP_OK) { + decoder->first_frame = 1; + decoder->first_packet = 1; + } else + av_log(avctx, AV_LOG_ERROR, "Failed to reset MPI (code = %d)\n", ret); +} + +#define FFRKMPP_DEC_HWACCEL(NAME, ID) \ + AVHWAccel ff_##NAME##_rkmpp_hwaccel = { \ + .name = #NAME "_rkmpp", \ + .type = AVMEDIA_TYPE_VIDEO,\ + .id = ID, \ + .pix_fmt = AV_PIX_FMT_RKMPP,\ + }; + +#define FFRKMPP_DEC_CLASS(NAME) \ + static const AVClass ffrkmpp_##NAME##_dec_class = { \ + .class_name = "rkmpp_" #NAME "_dec", \ + .version = LIBAVUTIL_VERSION_INT, \ + }; + +#define FFRKMPP_DEC(NAME, ID, BSFS) \ + FFRKMPP_DEC_CLASS(NAME) \ + FFRKMPP_DEC_HWACCEL(NAME, ID) \ + AVCodec ff_##NAME##_rkmpp_decoder = { \ + .name = #NAME "_rkmpp", \ + .long_name = NULL_IF_CONFIG_SMALL(#NAME " (rkmpp)"), \ + .type = AVMEDIA_TYPE_VIDEO, \ + .id = ID, \ + .priv_data_size = sizeof(RKMPPDecodeContext), \ + .init = ffrkmpp_init_decoder, \ + .close = ffrkmpp_close_decoder, \ + .receive_frame = ffrkmpp_receive_frame, \ + .flush = ffrkmpp_flush, \ + .priv_class = &ffrkmpp_##NAME##_dec_class, \ + .capabilities = AV_CODEC_CAP_DELAY, \ + .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, \ + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RKMPP, \ + AV_PIX_FMT_NONE}, \ + .bsfs = #BSFS, \ + }; + +FFRKMPP_DEC(h264, AV_CODEC_ID_H264, h264_mp4toannexb) +FFRKMPP_DEC(hevc, AV_CODEC_ID_HEVC, hevc_mp4toannexb) +FFRKMPP_DEC(vp8, AV_CODEC_ID_VP8, ) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index d4a7a8b..c2a90cf 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2028,6 +2028,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .name = "cuda", .flags = AV_PIX_FMT_FLAG_HWACCEL, }, + [AV_PIX_FMT_RKMPP] = { + .name = "rkmpp", + .flags = AV_PIX_FMT_FLAG_HWACCEL, + }, [AV_PIX_FMT_AYUV64LE] = { .name = "ayuv64le", .nb_components = 4, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 6b7eea8..c40b41e 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -248,6 +248,11 @@ enum AVPixelFormat { */ AV_PIX_FMT_CUDA, + /** + * HW acceleration though Rockchip Media Process Platform, data[3] contains a av_drmprime pointer + */ + AV_PIX_FMT_RKMPP, + AV_PIX_FMT_0RGB=0x123+4,///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGBXRGBX... X=unused/undefined AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, XBGRXBGR... X=unused/undefined