From patchwork Sun Sep 24 05:39:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "LongChair ." X-Patchwork-Id: 5250 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp1293627jaa; Sat, 23 Sep 2017 22:39:57 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAKtaBL3MOZjqIsJ5qskmA3S5vQQdyNnoyenbNRf6SP3CkYhG3sqMwOZZ2DYNAhDbO0nDL+ X-Received: by 10.28.103.195 with SMTP id b186mr7755613wmc.86.1506231597577; Sat, 23 Sep 2017 22:39:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506231597; cv=none; d=google.com; s=arc-20160816; b=V3B2bJxbbFCFaTTav0NboBa+mkuSp00bBuCSnof6REMvat4/NJ1V9DeU/PIOVvbnNp skfzRCRCBQoqVyiVmVGyWxx0Ba/ryyyWdUoER8IK3n5GnZuWo7/gx9U57McwL++uhKf4 /+U8cVFV/x9ZeBrbGPke7az1NnpHil7NlIqqfkWI2k5ZBhymcOLG8/BARZKOUM277Tfd MrKKLJfOpg2O9oQgtS11a1ogrZ6aRJMl4kfj/2yIlV9B3SKfI6xH0MMMEfW4dSAnCc0J eI2J0B82P/FNiwNsiD84K4NDWDIcvhEWvuZYJbJqmOdbR7mnK2BsqWM3So3X7voMUBfK jWhw== 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:in-reply-to :references:message-id:date:thread-index:thread-topic:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=GcNv3PPuFk5eQL7aDQrFKg30jrBb1LMudqvEajX9ghI=; b=bONIPAmMX89s1y4RYMMZLLppzlvghhZidZCWx0zmvCNDoluglbkmpV6KE9czyxCByD G/d/oky8dkgPneMixS655cetBEVk5ChA5a5hddhMEQRm+0eNGeH8Soez7O9gs3GoJ0I0 NOxQfurc+xyFajMewNDHRaDqdKaYxuyEnOBovmEFl2yrhXSn7o2EzjoGtEPCpFArlFkv XFTxCVUwIXdfBOVMh+hNXxu6SbdJGpUfRvJlsoNs4jwFVL8F1cP/aY87tCW6yTp2cy+z lvpLlt3QPIHAHC5P77HN1BCW18BzqnQ+V4UXvesa8gpmrcZoR48djiw4rrFvaDbPN82D q1pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=RzSjY/3P; 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=QUARANTINE 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 s125si2527357wme.256.2017.09.23.22.39.56; Sat, 23 Sep 2017 22:39:57 -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.s=selector1 header.b=RzSjY/3P; 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=QUARANTINE 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 2ABF1680A9E; Sun, 24 Sep 2017 08:39:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-oln040092002075.outbound.protection.outlook.com [40.92.2.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 773F0680649 for ; Sun, 24 Sep 2017 08:39:37 +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=McbilvdCcO8RIy4Y6TAAxY1ReDabznZXNro0M9+pp/k=; b=RzSjY/3PNELVfhshL0RIb6XEvMkqSdF4xrJJTC9kxoq1x6E6ozvmOqvNowNw+SIMMZxGDqz3ZCCwZfqxfgYcF4mOPSiQUI+2HHAfg4GyTjZ+5ZXasK8ECDZhVXu4fSoHXvkEyGeS/dnxhxVlp6X6GqSGEuxA1TBdJoFKnYEUDXvW0RRvMYZJDF8scGzflqvN4xKTijW/XYY8eWvUYvVY1lTIb2v7jXl1ywR7fRHzf12FcpBw+kKYgk2wNCjKy9ATWCKZD00ePWlZ7pIKyif4Cr9zuVtgyJB53HDbrKkJ46dITGNDAeY0ZpyEZL64QozaXUqa1u4WfUOEqtUyGe+5hg== Received: from SN1NAM01FT013.eop-nam01.prod.protection.outlook.com (10.152.64.52) by SN1NAM01HT017.eop-nam01.prod.protection.outlook.com (10.152.65.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.35.14; Sun, 24 Sep 2017 05:39:46 +0000 Received: from MWHPR17MB1614.namprd17.prod.outlook.com (10.152.64.54) by SN1NAM01FT013.mail.protection.outlook.com (10.152.64.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.56.11 via Frontend Transport; Sun, 24 Sep 2017 05:39:46 +0000 Received: from MWHPR17MB1614.namprd17.prod.outlook.com ([10.173.242.16]) by MWHPR17MB1614.namprd17.prod.outlook.com ([10.173.242.16]) with mapi id 15.20.0077.011; Sun, 24 Sep 2017 05:39:46 +0000 From: "LongChair ." To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] [PATCH v7] Add support for RockChip Media Process Platform Thread-Index: AQHTNPeHOMS4Qctp8Ui0I3oultKWig== Date: Sun, 24 Sep 2017 05:39:45 +0000 Message-ID: References: In-Reply-To: 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:8CD707B42AC5C605B5EF879748A23573541E1A866D6E3236A853D6EE8C3C62BA; UpperCasedChecksum:05FAE158D1C94D6B4AE273B51DC314B358485D536F7ED79C6AFBD4BFAB15AC78; SizeAsReceived:7154; Count:47 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [vJm5KUsbviGrwtOYnGb23mykN3P6TjK+] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SN1NAM01HT017; 6:5lx9NzMJ1qQP2UbRbycAmJvqLKmAKX9oRC5fJOwtpylZlN9QXuAGVtMU8fDCm2uzLbHfZ+ffPc0C77jW8MEQgoOwMjieGaF319mtfsZd/83cvWGXABaAVbDAJcqZuD1EXgMHXs6m+1bk974vyk99wJEUeS4rjo9zu3pZ91TwhfxMW+eLENf+OcvA3G/7vpjGpwTadJQadbCV0GF8e3KTKswFmHjYxdwXEN5Av5McjsY60awaE5NupM49c8YG2pIPzi/oBjLJewJMcC8R3sUeHIiA9GiJauhJMvVMGCg8z0MZz6RF862WqPg0F7bUHE+jH1f1MH0NyJAI9mdBHOCy1A==; 5:BIY4WaTd4ijKn3IXcA9nh1xXfoSEC7PXwx+oWDAfBtV8tANKP+2EZnuh3hVCEtUct8/q2NgqyGa4Ipk7DsMP6tO5auWsXzg+9DetWLEHk6VHKOiwQVkW5r/VV+NOO/dVjfD21I2K1Fpx793rj98hSw==; 24:DjV/nUon3sgy81dCbjHa+XVSczlo8AGmdQUA+A2qWRNpeukkjEDv69/M6DNZG2H3OFWCUYu4aa9vB8MCXU883UeiAP2MGXxjLpqgBe8OYrg=; 7:Cd9ezrPA6j3lJ/my8ZryOcODibF5BO/FdnCnL6K/+5GGs3iwKyPOyPVK23rqxQ+XnWk5/XU0qfusHialbiVNyJJTGpDsyKatMe1z3qxI8+rhwUq+3GbRKvpiHvZoBZRVP+OQcB/5q8E4LN3J6+r5EMc+tgjRmZPOFIaEBBKNspUOKSArc90kSjttH5L0urP43sRnBTkTNCaU0YCm5xFnDerVfy8RPp592hPwcGUQuB0= x-incomingheadercount: 47 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: 92871c7a-160f-420d-6108-08d5030ea931 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322404)(1601125374)(1603101448)(1701031045)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:SN1NAM01HT017; x-ms-exchange-slblob-mailprops: gjx25WM8ZNWqLpJmXNddFnxzMxBZ84VXcxxqPPHdICCq6XfwH7DjxwklXemZPKZ+FdWRRwMD1AW3S1G9lBq1XFg1krXOoPGogvEEoQ72sCd/e2M205yUWpknQ3r8Xw2D41to69siOJV7NyxewenfKkMkJoGbiiRwbQ3uuToPFBgU4dJYChJezITo6HhQxhHNCPF9fiFBtEQ+BRgqVDZz4t8TJONY3QxAT5AVyCI2TttkZ5CzQ6pEBcnQNaNY6fEYrnI83xTo8vA7bAE3D1bXvIJMPZ6VHKNVIY8YdsblK2OHVKLK/RwFayJKVsr8fIUfEQOQA+q9ROh6+gGt8q+C31NPfYPdXbj+k7WWWHlEROMAwrpZORJWZfCFU4gEbgATgVBdpD7JM+KmeKf1mkcxZdsxbZ5odlnKD6gDdG9Uh1RyXRtgNHDcuTjnbOmFgkVMvnRVn6y2filTExZkcf4ShJugmmJl50brZg14v5dtP4EHwu4uRa2MPBQhffQJsei8UrxioTOWUHYQVECTgfkvGSz7srZIJTmDUMo4igH0Pa4Za1bIDOsJsothVjsK1cdzJIXoILa/K0rB4wFq7kemUY0sm7ybwkJJSdYGnXmKopeLzQm4vFvlQxpqfSVGrLv4s5BTfrdpOHfiR44VQ9NuTIFTeQLZt5EXORTbtGhOJ9a87Gk0kEqbdLDJoGx5DKOOHkbxIJpzbhoXcTt2D8YBYGxHiMeRJJpB14gWlxpIB+0= x-ms-traffictypediagnostic: SN1NAM01HT017: x-exchange-antispam-report-test: UriScan:(130873036417446)(194151415913766); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(444000031); SRVR:SN1NAM01HT017; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1NAM01HT017; x-forefront-prvs: 0440AC9990 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:SN1NAM01HT017; H:MWHPR17MB1614.namprd17.prod.outlook.com; FPR:; SPF:None; LANG:; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2017 05:39:46.0491 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM01HT017 Subject: [FFmpeg-devel] [PATCH] [PATCH v7] Add support for RockChip Media Process Platform 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: Lionel CHAZALLON This adds hardware decoding for h264 / HEVC / VP8 using MPP Rockchip API. Will return frames holding an AVDRMFrameDescriptor struct in buf[0] that allows drm / dmabuf usage. Was tested on RK3288 (TinkerBoard) and RK3328. Changes from Previous patch : - Frame colorspace info is now filled. - Frame interlacing is now filled (Note : currently had a bug in mpp which will be fixed soon by rockchip, will set the to progressive). - hw_frame_context returns none as format for the rockchip specific 10 bits. - Added support for VP9 codec. - removed MPG4 codec : it seems that MPP doesn't handle properly all the MPEG4 formats - removed MPEG2 : there is still an issue with MPEG2 decoder, this is being investigated by RockChip. - the ION format has been kept for MPP init (rather than DRM) as this is the only one working right, using DRM format will cause assertions upon close. - Other minor comments have been taken into account --- Changelog | 2 +- configure | 15 ++ libavcodec/Makefile | 4 + libavcodec/allcodecs.c | 4 + libavcodec/rkmppdec.c | 591 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 615 insertions(+), 1 deletion(-) create mode 100644 libavcodec/rkmppdec.c diff --git a/Changelog b/Changelog index 678dcda..0006430 100644 --- a/Changelog +++ b/Changelog @@ -50,7 +50,7 @@ version : - KMS screen grabber - CUDA thumbnail filter - V4L2 mem2mem HW assisted codecs - +- Rockchip MPP hardware decoding version 3.3: - CrystalHD decoder moved to new decode API diff --git a/configure b/configure index 16fc2bd..a08653c 100755 --- a/configure +++ b/configure @@ -316,6 +316,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] @@ -1548,6 +1549,7 @@ EXTERNAL_LIBRARY_VERSION3_LIST=" libopencore_amrnb libopencore_amrwb libvo_amrwbenc + rkmpp " EXTERNAL_LIBRARY_GPLV3_LIST=" @@ -2782,6 +2784,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" h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264" h264_vaapi_encoder_select="vaapi_encode golomb" h264_vda_decoder_deps="vda" @@ -2799,6 +2803,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" hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC" hevc_vaapi_encoder_select="vaapi_encode golomb" hevc_v4l2m2m_decoder_deps="v4l2_m2m hevc_v4l2_m2m" @@ -2845,12 +2851,14 @@ 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_vaapi_encoder_deps="VAEncPictureParameterBufferVP8" vp8_vaapi_encoder_select="vaapi_encode" vp8_v4l2m2m_decoder_deps="v4l2_m2m vp8_v4l2_m2m" vp8_v4l2m2m_encoder_deps="v4l2_m2m vp8_v4l2_m2m" vp9_cuvid_decoder_deps="cuda cuvid" vp9_mediacodec_decoder_deps="mediacodec" +vp9_rkmpp_decoder_deps="rkmpp" vp9_vaapi_encoder_deps="VAEncPictureParameterBufferVP9" vp9_vaapi_encoder_select="vaapi_encode" vp9_v4l2m2m_decoder_deps="v4l2_m2m vp9_v4l2_m2m" @@ -6060,6 +6068,13 @@ enabled openssl && { use_pkg_config openssl openssl/ssl.h OPENSSL_init check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || die "ERROR: openssl not found"; } +enabled rkmpp && { { require_pkg_config rockchip_mpp rockchip/rk_mpi.h mpp_create || + die "ERROR : Rockchip MPP was not found."; } && + { check_func_headers rockchip/rk_mpi_cmd.h "MPP_DEC_GET_FREE_PACKET_SLOT_COUNT" || + die "ERROR: Rockchip MPP is outdated, please get a more recent one."; } && + { enabled libdrm || + die "ERROR: rkmpp requires --enable-libdrm"; } + } if enabled gcrypt; then GCRYPT_CONFIG="${cross_prefix}libgcrypt-config" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1b17c27..c4ec09b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -341,6 +341,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_H264_V4L2M2M_DECODER) += v4l2_m2m_dec.o @@ -357,6 +358,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_HEVC_V4L2M2M_DECODER) += v4l2_m2m_dec.o OBJS-$(CONFIG_HEVC_V4L2M2M_ENCODER) += v4l2_m2m_enc.o @@ -636,6 +638,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_VP8_V4L2M2M_DECODER) += v4l2_m2m_dec.o OBJS-$(CONFIG_VP8_V4L2M2M_ENCODER) += v4l2_m2m_enc.o @@ -644,6 +647,7 @@ OBJS-$(CONFIG_VP9_DECODER) += vp9.o vp9data.o vp9dsp.o vp9lpf.o vp9r vp9dsp_8bpp.o vp9dsp_10bpp.o vp9dsp_12bpp.o OBJS-$(CONFIG_VP9_CUVID_DECODER) += cuvid.o OBJS-$(CONFIG_VP9_MEDIACODEC_DECODER) += mediacodecdec.o +OBJS-$(CONFIG_VP9_RKMPP_DECODER) += rkmppdec.o OBJS-$(CONFIG_VP9_VAAPI_ENCODER) += vaapi_encode_vp9.o OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o OBJS-$(CONFIG_VP9_V4L2M2M_DECODER) += v4l2_m2m_dec.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index db2db15..f5ef280 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -215,6 +215,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); @@ -222,6 +223,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_ENCDEC (HEVC_V4L2M2M, hevc_v4l2m2m); REGISTER_DECODER(HNM4_VIDEO, hnm4_video); REGISTER_DECODER(HQ_HQA, hq_hqa); @@ -380,8 +382,10 @@ static void register_all(void) REGISTER_DECODER(VP6F, vp6f); REGISTER_DECODER(VP7, vp7); REGISTER_DECODER(VP8, vp8); + REGISTER_DECODER(VP8_RKMPP, vp8_rkmpp); REGISTER_ENCDEC (VP8_V4L2M2M, vp8_v4l2m2m); REGISTER_DECODER(VP9, vp9); + REGISTER_DECODER(VP9_RKMPP, vp9_rkmpp); REGISTER_DECODER(VP9_V4L2M2M, vp9_v4l2m2m); REGISTER_DECODER(VQA, vqa); REGISTER_DECODER(BITPACKED, bitpacked); diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c new file mode 100644 index 0000000..5b04a55 --- /dev/null +++ b/libavcodec/rkmppdec.c @@ -0,0 +1,591 @@ +/* + * RockChip MPP Video Decoder + * Copyright (c) 2017 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 "internal.h" +#include "libavutil/buffer.h" +#include "libavutil/common.h" +#include "libavutil/frame.h" +#include "libavutil/hwcontext.h" +#include "libavutil/hwcontext_drm.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; + + AVBufferRef *frames_ref; + AVBufferRef *device_ref; +} RKMPPDecoder; + +typedef struct { + AVClass *av_class; + AVBufferRef *decoder_ref; +} RKMPPDecodeContext; + +typedef struct { + MppFrame frame; + AVBufferRef *decoder_ref; +} RKMPPFrameContext; + +static MppCodingType rkmpp_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; + case AV_CODEC_ID_VP9: return MPP_VIDEO_CodingVP9; + default: return MPP_VIDEO_CodingUnused; + } +} + +static int rkmpp_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 rkmpp_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; + int 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 rkmpp_close_decoder(AVCodecContext *avctx) +{ + RKMPPDecodeContext *rk_context = avctx->priv_data; + av_buffer_unref(&rk_context->decoder_ref); + return 0; +} + +static void rkmpp_release_decoder(void *opaque, uint8_t *data) +{ + RKMPPDecoder *decoder = (RKMPPDecoder *)data; + + if (decoder->mpi) { + 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_buffer_unref(&decoder->frames_ref); + av_buffer_unref(&decoder->device_ref); + + av_free(decoder); +} + +static int rkmpp_init_decoder(AVCodecContext *avctx) +{ + RKMPPDecodeContext *rk_context = avctx->priv_data; + RKMPPDecoder *decoder = NULL; + MppCodingType codectype = MPP_VIDEO_CodingUnused; + int ret = MPP_NOK; + RK_S64 paramS64; + RK_S32 paramS32; + + avctx->pix_fmt = AV_PIX_FMT_DRM_PRIME; + + // 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), rkmpp_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 = rkmpp_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; + } + + ret = mpp_check_support_format(MPP_CTX_DEC, codectype); + if (ret != MPP_OK) { + av_log(avctx, AV_LOG_ERROR, "Codec type (%d) unsupported by MPP\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"); + + decoder->device_ref = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_DRM); + if (!decoder->device_ref) { + ret = AVERROR(ENOMEM); + goto fail; + } + ret = av_hwdevice_ctx_init(decoder->device_ref); + if (ret < 0) + goto fail; + + return 0; + +fail: + av_log(avctx, AV_LOG_ERROR, "Failed to initialize RKMPP decoder.\n"); + rkmpp_close_decoder(avctx); + return ret; +} + +static int rkmpp_send_packet(AVCodecContext *avctx, const AVPacket *avpkt) +{ + RKMPPDecodeContext *rk_context = avctx->priv_data; + RKMPPDecoder *decoder = (RKMPPDecoder *)rk_context->decoder_ref->data; + int ret = MPP_NOK; + + // handle EOF + if (!avpkt->size) { + av_log(avctx, AV_LOG_DEBUG, "End of stream.\n"); + decoder->eos_reached = 1; + ret = rkmpp_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 = rkmpp_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 = rkmpp_write_data(avctx, avpkt->data, avpkt->size, avpkt->pts); + if (ret && ret!=AVERROR(EAGAIN)) + av_log(avctx, AV_LOG_ERROR, "Failed to write data to decoder (code = %d)\n", ret); + + return ret; +} + +static void rkmpp_release_frame(void *opaque, uint8_t *data) +{ + AVDRMFrameDescriptor *desc = (AVDRMFrameDescriptor *)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(desc); +} + +static int rkmpp_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; + int ret = MPP_NOK; + MppFrame mppframe = NULL; + MppBuffer buffer = NULL; + AVDRMFrameDescriptor *desc = NULL; + AVDRMLayerDescriptor *layer = NULL; + int retrycount = 0; + int format, mode; + + // 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 && !decoder->first_frame) { + 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)) { + AVHWFramesContext *hwframes; + + 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; + + av_buffer_unref(&decoder->frames_ref); + + decoder->frames_ref = av_hwframe_ctx_alloc(decoder->device_ref); + if (!decoder->frames_ref) { + ret = AVERROR(ENOMEM); + goto fail; + } + + format = (int)mpp_frame_get_fmt(mppframe); + + hwframes = (AVHWFramesContext*)decoder->frames_ref->data; + hwframes->format = AV_PIX_FMT_DRM_PRIME; + hwframes->sw_format = rkmpp_get_frameformat(format) == DRM_FORMAT_NV12 ? AV_PIX_FMT_NV12 : AV_PIX_FMT_NONE; + hwframes->width = avctx->width; + hwframes->height = avctx->height; + ret = av_hwframe_ctx_init(decoder->frames_ref); + if (ret < 0) + goto fail; + + // 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)) { + av_log(avctx, AV_LOG_DEBUG, "Received a discard frame.\n"); + ret = AVERROR(EAGAIN); + goto fail; + } else if (mpp_frame_get_errinfo(mppframe)) { + av_log(avctx, AV_LOG_ERROR, "Received a errinfo frame.\n"); + ret = AVERROR_UNKNOWN; + 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_DRM_PRIME; + frame->width = mpp_frame_get_width(mppframe); + frame->height = mpp_frame_get_height(mppframe); + frame->pts = mpp_frame_get_pts(mppframe); + frame->color_range = mpp_frame_get_color_range(mppframe); + frame->color_primaries = mpp_frame_get_color_primaries(mppframe); + frame->color_trc = mpp_frame_get_color_trc(mppframe); + frame->colorspace = mpp_frame_get_colorspace(mppframe); + + mode = mpp_frame_get_mode(mppframe); + frame->interlaced_frame = ((mode & MPP_FRAME_FLAG_FIELD_ORDER_MASK) == MPP_FRAME_FLAG_DEINTERLACED); + frame->top_field_first = ((mode & MPP_FRAME_FLAG_FIELD_ORDER_MASK) == MPP_FRAME_FLAG_TOP_FIRST); + + + // now setup the frame buffer info + buffer = mpp_frame_get_buffer(mppframe); + if (buffer) { + desc = av_mallocz(sizeof(AVDRMFrameDescriptor)); + if (!desc) { + ret = AVERROR(ENOMEM); + goto fail; + } + + desc->nb_objects = 1; + desc->objects[0].fd = mpp_buffer_get_fd(buffer); + desc->objects[0].size = mpp_buffer_get_size(buffer); + + desc->nb_layers = 1; + layer = &desc->layers[0]; + layer->format = rkmpp_get_frameformat(mpp_frame_get_fmt(mppframe)); + layer->nb_planes = 2; + + layer->planes[0].object_index = 0; + layer->planes[0].offset = 0; + layer->planes[0].pitch = mpp_frame_get_hor_stride(mppframe); + + layer->planes[1].object_index = 0; + layer->planes[1].offset = layer->planes[0].pitch * mpp_frame_get_ver_stride(mppframe); + layer->planes[1].pitch = layer->planes[0].pitch; + + // 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[0] = (uint8_t *)desc; + frame->buf[0] = av_buffer_create((uint8_t *)desc, sizeof(*desc), rkmpp_release_frame, + framecontextref, AV_BUFFER_FLAG_READONLY); + + if (!frame->buf[0]) { + ret = AVERROR(ENOMEM); + goto fail; + } + + frame->hw_frames_ctx = av_buffer_ref(decoder->frames_ref); + if (!frame->hw_frames_ctx) { + 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 (desc) + av_free(desc); + + return ret; +} + +static int rkmpp_receive_frame(AVCodecContext *avctx, AVFrame *frame) +{ + RKMPPDecodeContext *rk_context = avctx->priv_data; + RKMPPDecoder *decoder = (RKMPPDecoder *)rk_context->decoder_ref->data; + int 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 = rkmpp_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 rkmpp_retrieve_frame(avctx, frame); +} + +static void rkmpp_flush(AVCodecContext *avctx) +{ + RKMPPDecodeContext *rk_context = avctx->priv_data; + RKMPPDecoder *decoder = (RKMPPDecoder *)rk_context->decoder_ref->data; + int 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 RKMPP_DEC_CLASS(NAME) \ + static const AVClass rkmpp_##NAME##_dec_class = { \ + .class_name = "rkmpp_" #NAME "_dec", \ + .version = LIBAVUTIL_VERSION_INT, \ + }; + +#define RKMPP_DEC(NAME, ID, BSFS) \ + RKMPP_DEC_CLASS(NAME) \ + 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 = rkmpp_init_decoder, \ + .close = rkmpp_close_decoder, \ + .receive_frame = rkmpp_receive_frame, \ + .flush = rkmpp_flush, \ + .priv_class = &rkmpp_##NAME##_dec_class, \ + .capabilities = AV_CODEC_CAP_DELAY, \ + .caps_internal = AV_CODEC_CAP_AVOID_PROBING, \ + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_DRM_PRIME, \ + AV_PIX_FMT_NONE}, \ + .bsfs = BSFS, \ + }; + +RKMPP_DEC(h264, AV_CODEC_ID_H264, "h264_mp4toannexb") +RKMPP_DEC(hevc, AV_CODEC_ID_HEVC, "hevc_mp4toannexb") +RKMPP_DEC(vp8, AV_CODEC_ID_VP8, NULL) +RKMPP_DEC(vp9, AV_CODEC_ID_VP9, NULL)