From patchwork Wed Apr 20 09:54:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 35355 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp780838pzh; Wed, 20 Apr 2022 02:54:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeMahTHx5jb0Hjp/Gu+G6B0DlTt5bcrwiqqvbItfmVMvIb06GK6QGARM39M0UJO74idmi4 X-Received: by 2002:a17:907:97cc:b0:6df:83bc:314c with SMTP id js12-20020a17090797cc00b006df83bc314cmr17368223ejc.587.1650448466148; Wed, 20 Apr 2022 02:54:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650448466; cv=none; d=google.com; s=arc-20160816; b=bDX9k5+4Le1qYBDoP8mOYeN1Cz6vXQREd46+9j0IMuU53jZyAg7V4OQF0ZgJfRG49U +nQ0BzDnG3tq7Pp4yGg8j7mYi7FUxILRRv6bvmjgA6JHUma1Mdzm6EH48FXE0G4joKdT 9T/lURNNAgEzUxBK6jqLycYodkX4/1B/SWfelaYUSW/ppBAhq0ITHQ9PKD1Gm+8Ph+4i AwKkOvHwAevln1DvWk7w/ZJr/np9FDQF33zktnsJedIuFfJ0G3gVm1HHUvnuGDyEfqWJ YGCQr5SoHdxr0tnAt1DQaS+hegfxwuyKgloNyxTL7FxDEnftrz7a3XAuM1fPAsJespyB W1Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:references:cms-type:content-language :thread-index:mime-version:message-id:date:to:from:dkim-signature :dkim-filter:delivered-to; bh=wvvNonoqI1xuMmJvZamsvA+YQZGQE7l5TLpoInVfh+8=; b=UFmgnTGsrjNuxbOCdeHqf09eml2ffa0A06nL4QVAq2lRlpcXKEGhfFZEA8+N+vAUex oNea4wZNyS52xuSZIsBEBU2guClUE0lfLlh3Z2sRApY2nReqsvXv0eTPKPblIHCnrdGz iIWtb1khZqbdYxwA0vKbQAiJc/MzHa7i7ATydXm4A2lIgUhMpVAmu4nu+bINp1rIWDJh YIqDqHff2CLs7tfuvPvmf61WB0QPmA/bjaGlbog0a3QSHEn4ns6Ozcj4olWqg5bsFyh/ yp67ogaGoH8Zg+5C/qde5RcLfRyqLeTj/XUPCmVNsgjVKM2i0vgl4rjeEyypUOYWHKvJ 71HA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=LKAcCULL; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bk14-20020a170906b0ce00b006e7edaf2b8asi1381283ejb.371.2022.04.20.02.54.25; Wed, 20 Apr 2022 02:54:26 -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=@samsung.com header.s=mail20170921 header.b=LKAcCULL; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E26368B39E; Wed, 20 Apr 2022 12:54:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A0C568AE71 for ; Wed, 20 Apr 2022 12:54:14 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20220420095411euoutp028236861823a79fcca943ba2669aaf166~nkh9jsyKu0636006360euoutp02J for ; Wed, 20 Apr 2022 09:54:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20220420095411euoutp028236861823a79fcca943ba2669aaf166~nkh9jsyKu0636006360euoutp02J DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1650448452; bh=cHfGNT3hyBVUzTWq7Tf/mehUIj01111p14XgRah64B0=; h=From:To:Subject:Date:References:From; b=LKAcCULLFRueE+fYPcp+bELIsrk7P7uIyNlKkf5T6ATWOEiSH0SObF4ctVZv/Qgwx dQALPd/VEJ48t4znZtTmCUSCHh5DsXRKdd8IfMMBR7O3HbpXRoe1Y5n/6KunHdPOyY qxpLQQsKOhsNRyRO42psylO2gWAXvgWjbr4BvNyU= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20220420095411eucas1p29e3a95c555b553420e2efa42a048b004~nkh9YXqUh1275412754eucas1p2j for ; Wed, 20 Apr 2022 09:54:11 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id DB.13.09887.348DF526; Wed, 20 Apr 2022 10:54:11 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20220420095411eucas1p17c2f7371da691825f631f12562d415c0~nkh8-GO8M1311213112eucas1p1e for ; Wed, 20 Apr 2022 09:54:11 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20220420095411eusmtrp1f3bb15bd44b90a35356d0710c2ec8a0f~nkh8_gc1_2999129991eusmtrp1l for ; Wed, 20 Apr 2022 09:54:11 +0000 (GMT) X-AuditID: cbfec7f4-471ff7000000269f-8f-625fd843ccd9 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 62.54.09404.348DF526; Wed, 20 Apr 2022 10:54:11 +0100 (BST) Received: from AMDN3260 (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20220420095411eusmtip2d7cd86de83be74e4a9dbd7ae4e416298~nkh8voL742102221022eusmtip2p for ; Wed, 20 Apr 2022 09:54:11 +0000 (GMT) From: "Dawid Kozinski" To: Date: Wed, 20 Apr 2022 11:54:10 +0200 Message-ID: <004a01d8549c$95c3fb30$c14bf190$@samsung.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AdhUl1+2XCGH7BnYS0y2ibafPOHR/g== Content-Language: pl X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJIsWRmVeSWpSXmKPExsWy7djPc7rON+KTDE48UrP49ukMswOjx59F m1kCGKO4bFJSczLLUov07RK4Mi4cPstccCC0YkHPU6YGxnmuXYycHBICJhL3e84zdTFycQgJ rGCUeHrrOjNIQkhgEpNE7yQliMREJokFp5ayw3QsfTCNBSKxnFHiUftyNoiONiaJQ8v5QWw2 AX2JmYs+gcVFBGQlVv+bAmYLC4RK7DjwlQXEZhFQlViwcBnYNl4BS4mZfa+YIGxBiZMzn4DV MAsYSSxZPZ8JwpaX2P52DjPEEQoSP58uY4WYryfxYukSRogaEYkbj1oYQY6TEPjILjHj+Rc2 iAYXid+bW6E+EJZ4dXwLlC0jcXpyD9AyDiC7WOJQvwOEWSNx6Ec6RIW1xNvG44wQtqPE06XL oar5JG68FYTYyicxadt0Zogwr0RHmxCEqSLR1ykG0Sgl8XQZzO0eEvP6r7JOYFScheTdWUje nYXk3VlI3lrAyLKKUTy1tDg3PbXYKC+1XK84Mbe4NC9dLzk/dxMjMDWc/nf8yw7G5a8+6h1i ZOJgPMQowcGsJMIbOjM+SYg3JbGyKrUoP76oNCe1+BCjNAeLkjhvcuaGRCGB9MSS1OzU1ILU IpgsEwenVAOT0ty/UuXXr97UWOYy5eUntZUHvWfqbjTsm/mcYd7OhRPv3bryMuJRc8p1dsOv ocn+uVtUfvtb6V9c/qe2z/dXVrz29tbqpRL7DMUVjHwkt33fEjjx9t0sJ4Hj7x/V7sqsXffQ SHTPqVd1P+cKTzuZdUNQms1zhdPZyfb7a+V/aM8q4ju/8vLPxUHd9+rsr75PkIgXvbK/51Gb rseNe9oejQonZ3bMnPJXxOUKt3gNo9RUqS7/iklvT639/mPB3Ou5n3Z4nq/xtwx+ttOiS/rA iXVRmc/LYlm+nPhxc56a65OMrQrvJPPD1n3qa/r/svPFvGmdvptLNKRqZj3LMy36nW1jWvNH aKO0v3Ywv/SmWiWW4oxEQy3mouJEAPq0Uo98AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOLMWRmVeSWpSXmKPExsVy+t/xe7rON+KTDA7cErD49ukMswOjx59F m1kCGKP0bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0 Mi4cPstccCC0YkHPU6YGxnmuXYycHBICJhJLH0xj6WLk4hASWMoo0bVnPSNEQkpi6dJFULaw xJ9rXWwQRS1MEsfaZ7GBJNgE9CVmLvoEZosIyEqs/jcFzBYWCJb4dv47C4jNIqAqsWDhMmYQ m1fAUmJm3ysmCFtQ4uTMJ2A1zEBXNB7uhrLlJba/ncMMsVhB4ufTZawQ8/UkXixdwghRIyJx 41EL4wRGgVlIRs1CMmoWklGzkLQsYGRZxSiSWlqcm55bbKRXnJhbXJqXrpecn7uJERji2479 3LKDceWrj3qHGJk4GA8xSnAwK4nwhs6MTxLiTUmsrEotyo8vKs1JLT7EaAr020RmKdHkfGCU 5ZXEG5oZmBqamFkamFqaGSuJ83oWdCQKCaQnlqRmp6YWpBbB9DFxcEo1MPHyZRYIPli0t23a rMSmCPnVquuko7R+c3a05r4od+PTDdtcNr0ubPOHF7Y/WkQUjgkfVVW6ZfQ9Z0v7n06upRE9 ObMKDMLKmLiPvc3ebprleMuPZUEh15d5LelTXEq7vQ6wHCz1KDicvOZf26HD0jnpFbzeMw69 PmnceK7r2+Lus0G5v5y5Vnz2WBa5fP3BM7oRy35fOBMxxcr8qm30xdaeI6cYJW/Ffz0UM+Hc sqUCmkqLQ2+HHP3nuvmeGYO/8oF3huz3C5m4ektsPOczZWUcYUqvLvFOsDJQfTPjV933+JMK HhIb2hstufauTqi6/ep7iPBd/Q0nl1ybeInz9ef1jnEnFu9+n6r2R9JaTomlOCPRUIu5qDgR AAbyf2b6AgAA X-CMS-MailID: 20220420095411eucas1p17c2f7371da691825f631f12562d415c0 X-Msg-Generator: CA X-RootMTR: 20220420095411eucas1p17c2f7371da691825f631f12562d415c0 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220420095411eucas1p17c2f7371da691825f631f12562d415c0 References: Subject: [FFmpeg-devel] [PATCH 1/3] Provided support for MPEG-5 EVC (Essential Video Coding) codec X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: J/FV5RWctiqf ####################################### 1. Genaral info ####################################### The patch provided below contains an integration layer between ffmpeg framework and EVC codec implementation. In nutshell, it enables using EVC codec (encoding, decoding) by the means of ffmpeg API. I'd like to emphasize one more time, that (as mentioned before) it isn't codec implementation. The provided implementation serves as an integration layer between ffmpeg framework and the EVC codec. EVC codec has been published as two separate libraries. The first one called XEVE (eXtra-fast Essential Video Encoder) is an opensource MPEG-5 EVC encoder. The second one called XEVD (eXtra-fast Essential Video Decoder ) is an opensource MPEG-5 EVC decoder. For more information on both libraries please follow the links below: * https://github.com/mpeg5/xeve * https://github.com/mpeg5/xevd The patch provided below should be apply to FFmpeg 5.0 release (commit b655beb025cb54ba19cad89e731990910643f208 release/5.0) ####################################### 2. Building ####################################### 3.1. Download, build and install dependencies Dependencies: * eXtra-fast Essential Video Encoder (XEVE) (https://github.com/mpeg5/xeve) * eXtra-fast Essential Video Decoder (XEVD) (https://github.com/mpeg5/xevd) ------------------- 2.1.1. XEVE ------------------- git clone git@github.com:mpeg5/xeve.git cd xeve ------------------- base profile ------------------- mkdir build_base cd buid_base cmake .. -DSET_PROF=BASE make make install ------------------- main profile ------------------- mkdir build_main cd buid_base cmake .. -DSET_PROF=MAIN make make install ------------------- 2.1.2. XEVD ------------------- git clone git@github.com:mpeg5/xeve.git cd xeve ------------------- base profile ------------------- mkdir build_base cd buid_base cmake .. -DSET_PROF=BASE make make install ------------------- main profile ------------------- mkdir build_main cd buid_base cmake .. -DSET_PROF=MAIN make make install --------------------------------------- 2.2. Build ffmpeg with libxeve and libxevd --------------------------------------- It is required ffmpeg to be configfured with --enable-libxeve and --enable- libxevd Please find below exaple configuration. PATH="$HOME/bin:$PATH" PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure \ --prefix="$HOME/ffmpeg_build" \ --pkg-config-flags="--static" \ --extra-cflags="-I$HOME/ffmpeg_build/include" \ --extra-ldflags="-L$HOME/ffmpeg_build/lib" \ --extra-libs="-lpthread -lm" \ --bindir="$HOME/bin" \ --enable-gpl \ --enable-gnutls \ --enable-libaom \ --enable-libass \ --enable-libfdk-aac \ --enable-libfreetype \ --enable-libmp3lame \ --enable-libopus \ --enable-libdav1d \ --enable-libvorbis \ --enable-libvpx \ --enable-libx264 \ --enable-libx265 \ --enable-libxeve \ --enable-libxevd \ --enable-nonfree && \ PATH="$HOME/bin:$PATH" make -j $(nproc) make install ####################################### 3. Examples ####################################### Please find below examples on how to use EVC coded with ffmpeg commandline tool. (All samples are available in https://drive.google.com/drive/folders/1YtCLlSuTAjpLziTKI_QBuQrIOm2ss9LB?usp =sharing ) #!/bin/bash #======================================= #(YUV420P) -> (EVC) #======================================= ffmpeg -f rawvideo -pix_fmt yuv420p -s:v 352x288 -r 30 -i Test_Video_cif.yuv -c:v libxeve -f rawvideo Test_Video_cif.yuv.evc ffplay -autoexit Test_Video_cif.yuv.evc #======================================= #(YUV420P10LE) -> (EVC) #======================================= ffmpeg -f rawvideo -pix_fmt yuv420p10le -s:v 352x288 -r 30 -i Test_Video_cif_10le.yuv -c:v libxeve -f rawvideo Test_Video_cif_10le.yuv.evc ffplay -autoexit Test_Video_cif_10le.yuv.evc #======================================= #(EVC) -> (YUV420P) #======================================= ffmpeg -i Test_Video_cif.yuv.evc -pix_fmt yuv420p Test_Video_cif.evc.yuv ffplay -autoexit -f rawvideo -pixel_format yuv420p -video_size 352x288 Test_Video_cif.evc.yuv #======================================= #(EVC) -> (YUV420Pi10LE) #======================================= ffmpeg -i Test_Video_cif_10le.yuv.evc -pix_fmt yuv420p10le Test_Video_cif_10le.evc.yuv ffplay -autoexit -f rawvideo -pixel_format yuv420p10le -video_size 352x288 Test_Video_cif_10le.evc.yuv #======================================= #(YUV420P) -> (MP4) #======================================= ffmpeg -f rawvideo -pix_fmt yuv420p -s:v 352x288 -r 30 -i Test_Video_cif.yuv -c:v libxeve -f rawvideo Test_Video_cif.yuv.mp4 ffplay -autoexit Test_Video_cif.yuv.mp4 #======================================= #(YUV420P10LE) -> (MP4) #======================================= ffmpeg -f rawvideo -pix_fmt yuv420p10le -s:v 352x288 -r 30 -i Test_Video_cif_10le.yuv -c:v libxeve -f rawvideo Test_Video_cif_10le.yuv.mp4 ffplay -autoexit Test_Video_cif_10le.yuv.mp4 #======================================= #(MP4) -> (YUV420P) #======================================= ffmpeg -i Test_Video_cif.yuv.mp4 -f rawvideo -pix_fmt yuv420p Test_Video_cif.mp4.yuv ffplay -autoexit -f rawvideo -pixel_format yuv420p -video_size 352x288 Test_Video_cif.mp4.yuv #======================================= #(MP4) -> (YUV420P10LE) #======================================= ffmpeg -i Test_Video_cif_10le.yuv.mp4 -f rawvideo -pix_fmt yuv420p10le Test_Video_cif_10le.mp4.yuv ffplay -autoexit -f rawvideo -pixel_format yuv420p10le -video_size 352x288 Test_Video_cif_10le.mp4.yuv #======================================= #(EVC) -> (MP4) #======================================= ffmpeg -i Test_Video_cif.yuv.evc -c:v copy Test_Video_cif.evc.mp4 ffplay -autoexit Test_Video_cif.evc.mp4 #======================================= #(MP4) -> (EVC) #======================================= ffmpeg -i Test_Video_cif.evc.mp4 -vcodec copy -an -f rawvideo Test_Video_cif.evc.mp4.evc ffplay -autoexit Test_Video_cif.evc.mp4.evc #======================================= #(MP4 [h264,aac]) -> (MP4 [evc,aac]) #======================================= ffmpeg -i Test_Video_cif.mp4 -c:v libxeve Test_Video_cif_evc.mp4 ffplay -autoexit Test_Video_cif_evc.mp4 Prerequisites that must be met before adding new codec - Added new entry to codec IDs list - Added new entry to the codec descriptor list - Bumped libavcodec minor version - Changes in Changelog and MAINTAINERS files Signed-off-by: Dawid Kozinski --- Changelog | 3 ++- MAINTAINERS | 2 ++ libavcodec/codec_desc.c | 8 ++++++++ libavcodec/codec_id.h | 1 + libavcodec/profiles.c | 6 ++++++ libavcodec/profiles.h | 1 + libavcodec/version.h | 2 +- 7 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 5a32cf0d5c..21ebc11ff4 100644 --- a/Changelog +++ b/Changelog @@ -106,7 +106,8 @@ version 5.0: - VideoToolbox ProRes encoder - anlmf audio filter - IMF demuxer (experimental) - +- eXtra-fast Essential Video Encoder (XEVE) +- eXtra-fast Essential Video Decoder (XEVD) version 4.4: - AudioToolbox output device diff --git a/MAINTAINERS b/MAINTAINERS index c065e94498..7cbff1fe9c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -203,6 +203,7 @@ Codecs: libvpx* James Zern libxavs.c Stefan Gehrer libxavs2.c Huiwen Ren + libxev*.c, evc_parser.c Dawid Kozinski libzvbi-teletextdec.c Marton Balint lzo.h, lzo.c Reimar Doeffinger mdec.c Michael Niedermayer @@ -422,6 +423,7 @@ Muxers/Demuxers: dv.c Roman Shaposhnik electronicarts.c Peter Ross epafdec.c Paul B Mahol + evcdec.c Dawid Kozinski ffm* Baptiste Coudurier flic.c Mike Melanson flvdec.c Michael Niedermayer diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 0974ee03de..d05ea20db1 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1862,6 +1862,14 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("GEM Raster image"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_EVC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "evc", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-5 EVC (Essential Video Coding)"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_evc_profiles), + }, /* various PCM "codecs" */ { diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index ab265ec584..55b69a5db5 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -308,6 +308,7 @@ enum AVCodecID { AV_CODEC_ID_SIMBIOSIS_IMX, AV_CODEC_ID_SGA_VIDEO, AV_CODEC_ID_GEM, + AV_CODEC_ID_EVC, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index 7af7fbeb13..a31244e0db 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -181,4 +181,10 @@ const AVProfile ff_arib_caption_profiles[] = { { FF_PROFILE_UNKNOWN } }; +const AVProfile ff_evc_profiles[] = { + { FF_PROFILE_EVC_BASELINE, "Baseline" }, + { FF_PROFILE_EVC_MAIN, "Main" }, + { FF_PROFILE_UNKNOWN }, +}; + #endif /* !CONFIG_SMALL */ diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h index 41a19aa9ad..cf92b5f126 100644 --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@ -72,5 +72,6 @@ extern const AVProfile ff_sbc_profiles[]; extern const AVProfile ff_prores_profiles[]; extern const AVProfile ff_mjpeg_profiles[]; extern const AVProfile ff_arib_caption_profiles[]; +extern const AVProfile ff_evc_profiles[]; #endif /* AVCODEC_PROFILES_H */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 4d77431842..fb1a0feec6 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 59 -#define LIBAVCODEC_VERSION_MINOR 18 +#define LIBAVCODEC_VERSION_MINOR 19 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ From patchwork Wed Apr 20 09:54:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 35356 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp780908pzh; Wed, 20 Apr 2022 02:54:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1NPsKZFk1YEUb03NUHFcFmrgTal8gLwfgFE/oE+rHbE6Zfq2VHglkQH4Nsub48qnYz1Hj X-Received: by 2002:a17:907:7204:b0:6e8:c19e:93da with SMTP id dr4-20020a170907720400b006e8c19e93damr17282437ejc.695.1650448479402; Wed, 20 Apr 2022 02:54:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650448479; cv=none; d=google.com; s=arc-20160816; b=Nc8799g5L15dsNCu3EPHsLpIXfKwsdPOUXNRIEwN0iUKXvchL2FvO/nrobl1WhFqro Qfb5Z/JmvxyLZC8zVYbO/+uhRe/mQnL5XlxpralzycM9v804i353qtgtte9I1kxJpwj9 kzBcIwzdNmITKBxQqbaDQdiPfTgQwQaJ0ZfMp5T1BQjhV0lvvb6m4/RBE/N5oGi5w2qL ypJzKzOvpoMc2/vaSMjE/C3OWwkkbY5qNEbvIUlNElYBfnzmYgaTbXbwcxRLMro4pCbt 65cXJLHfGcB6tqnbcLPZmAxPjdt9Q8gad/gBwbtih++OmnSleekSmjFJOKWy1aFeMob8 T3aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:references:cms-type:content-language :thread-index:mime-version:message-id:date:to:from:dkim-signature :dkim-filter:delivered-to; bh=LOnlg7tpgEGGRByb97yDlRv3tdC5kIesNhZbLWLGTks=; b=BApqHRdplO+hdrDRYCQcqmw3kzu1dUv1z7OlCKWnonPU5AKOkm58dbNVSsc3dH22lF j2Nt3JRUe+h47cm9RN2oLijHNOaytWt1yyz6e8FhFOJTXqX29HZCJRAe9VCh37toFFRn Q6hPXQEzJAZfNqwyyQi68fMGAlZReedOSIcyV7K8hN6eSk/EF7168EKZ7FCh3rNz4OAj a/POamg9VfoBmD39bdqsj3Cnp6MxU23VpHX0w5zXv5zmO3qUoELWPzmz7X/uB34XQ61/ ITy/sWVLNWBqBj9KX0fBMaMi9eMDOegYVxfFPUv2Wox5ITtbNmmCkxPbr++0tS21gAky MXlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=JTgkm4cs; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k22-20020a1709063e1600b006e6c2773fe0si1402815eji.133.2022.04.20.02.54.38; Wed, 20 Apr 2022 02:54:39 -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=@samsung.com header.s=mail20170921 header.b=JTgkm4cs; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A43368B3A8; Wed, 20 Apr 2022 12:54:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4213268B3AA for ; Wed, 20 Apr 2022 12:54:26 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20220420095424euoutp0115994f08c2a5ba4b41b88e7617f582aa~nkiJrkWzF2813228132euoutp013 for ; Wed, 20 Apr 2022 09:54:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20220420095424euoutp0115994f08c2a5ba4b41b88e7617f582aa~nkiJrkWzF2813228132euoutp013 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1650448465; bh=cT+7u/e9V8z88rpb+PQm3jsh6ogkorj6ehww/XKSEwg=; h=From:To:Subject:Date:References:From; b=JTgkm4csA1kJj9OVCT7KXIRt8CMuLhi5elLwyeZCv3tVRnURxuMukAscM1vIOrYFT OsZLFWYg9v6luw+V6YhpAZcUKThrpkZK/up7b2hftpSCg+xQzVqN2Qk/00vKjcIBcp 40P4MIuXKP1fCUXTyJRCrrfN9nyblqzIDpQQaKhU= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20220420095424eucas1p163d7e1b4e3477ae2f302b39b14ae8683~nkiJXK-v11517915179eucas1p1d for ; Wed, 20 Apr 2022 09:54:24 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id B8.BA.10260.058DF526; Wed, 20 Apr 2022 10:54:24 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20220420095424eucas1p13b9dc5cacc7b763a05ac32ca25b14e69~nkiI8o9tw1106711067eucas1p1w for ; Wed, 20 Apr 2022 09:54:24 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20220420095424eusmtrp1442a150eccff8233ead10e0fcde47a6d~nkiI79fPU3040230402eusmtrp1C for ; Wed, 20 Apr 2022 09:54:24 +0000 (GMT) X-AuditID: cbfec7f5-bddff70000002814-c5-625fd8509574 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 4C.54.09404.058DF526; Wed, 20 Apr 2022 10:54:24 +0100 (BST) Received: from AMDN3260 (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20220420095423eusmtip21a21e6dd0560177166a7a231f3b905fa~nkiIhjOyW2497824978eusmtip2H for ; Wed, 20 Apr 2022 09:54:23 +0000 (GMT) From: "Dawid Kozinski" To: Date: Wed, 20 Apr 2022 11:54:23 +0200 Message-ID: <004b01d8549c$9d4e10c0$d7ea3240$@samsung.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AdhUmHRG21djPLYiTp2H7hro6YaHjg== Content-Language: pl X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87oBN+KTDJ7dULD49ukMswOjx59F m1kCGKO4bFJSczLLUov07RK4MrZ++sFSsOc3R8Wn7b/YGhinXuXoYuTkkBAwkZh6ZTdLFyMX h5DACkaJ5g/3GCGcSUwSZzZeZ4NwJjJJXDq8hRmmZfGUFnaIxHJGiXdL70P1tzFJ7D7UAFbF JqAvMXPRJzYQW0RAVmL1vylgtrBAqMS1eavAbBYBVYmFq76A2bwClhLHnh1hh7AFJU7OfMIC YjMLaEssW/gaarOCxM+ny1ghZupJTHi7lQ2iRkTixqMWsLslBL6yS+x7MYsNosFF4t3Rbihb WOLV8S3sELaMxOnJPUALOIDsYolD/Q4QZo3EoR/pEBXWEm8bjzOChJkFNCXW79KHCDtK3Lnw ixmimk/ixltBiAP4JCZtmw4V5pXoaBOCMFUk+jrFIBqlJJ4umwP1hofEoj2b2ScwKs5C8u0s JN/OQvLVLIQTFjCyrGIUTy0tzk1PLTbOSy3XK07MLS7NS9dLzs/dxAhMD6f/Hf+6g3HFq496 hxiZOBgPMUpwMCuJ8IbOjE8S4k1JrKxKLcqPLyrNSS0+xCjNwaIkzpucuSFRSCA9sSQ1OzW1 ILUIJsvEwSnVwLRdgzMjcP6NJ2JpGiqrlLi9pSXuFLZ9PWtvevT3zqMFC+9pxCsc2rY/avLC Va+Pf0vacZ7jNU+tV9Slhodbd924E7Y+vE7qf2fyh7vbq223xkxtf6J/j+WVv821JJaV2R67 npyUmbX/x6XHmUf+1XIU8Kusv1N3uLL8SMadtf7Kulr81vfr7zxlCJl7s/Pgn0nPeP0Tb86N S01J4FylK+ci9ck++93CKZUOhRwZbxgPm21NUWWSLnn58wVnW8G32DCNq/25tzs+22Y3NllN i2ycV3c84D9rzsmggwc8N0Wp8R2fU9l2qn3zvEnL/1pUWx3o12m7FhCbPXNhi2pK3q0aoxUb PZ5ePNP4RGzxJD8lluKMREMt5qLiRABr+TROfgMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJLMWRmVeSWpSXmKPExsVy+t/xe7oBN+KTDPY1slh8+3SG2YHR48+i zSwBjFF6NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6 GeseL2Mt+HCateLBqn72BsbjrSxdjJwcEgImEountLB3MXJxCAksZZRYte4pI0RCSmLp0kVQ trDEn2tdbBBFLUwSH1fMYwdJsAnoS8xc9IkNxBYRkJVY/W8KmC0sECzxrOUGM4jNIqAqsXDV F7A4r4ClxLFnR9ghbEGJkzOfgF3BLKAt8fTmUzh72cLXzBCLFSR+Pl3GCjFfT2LC261sEDUi EjcetTBOYBSYhWTULCSjZiEZNQtJywJGllWMIqmlxbnpucVGesWJucWleel6yfm5mxiBYb7t 2M8tOxhXvvqod4iRiYPxEKMEB7OSCG/ozPgkId6UxMqq1KL8+KLSnNTiQ4ymQL9NZJYSTc4H RlpeSbyhmYGpoYmZpYGppZmxkjivZ0FHopBAemJJanZqakFqEUwfEwenVAPT6pMvQ1/N/sDy +/WBoA3MWw6XhdxpCRErZWhYvP+SgOvuJ82/LDb/DPwpsMON5fOt1U9l59pnFucUJXfLzpz5 9USQpdWtoCMv3/HsX1BiNpt15fukvthDNUqJzU6+0dYfbh1Ptl4Vt+cO06tnqR+KVfOMjTOe Ky3mtLy9ndXtTuSp2vR23rOKsnuu6fPs/Hpqs9Tch1/eLvB54z61JuCR2NO46pjlH68XyUhc 1tt/7qGXW8mO2Q1Z7idWLfd9sDI2XyhGK/syo+WiwLfxbLo7Xq9zOvtkrV8b59aCU/cTszut FvwueH+2NWQjP9/v+xcdDs33L+t6duIbk+Y+puMvP5o0Tdn2v6IydatN4eHs60osxRmJhlrM RcWJAMGGKmf8AgAA X-CMS-MailID: 20220420095424eucas1p13b9dc5cacc7b763a05ac32ca25b14e69 X-Msg-Generator: CA X-RootMTR: 20220420095424eucas1p13b9dc5cacc7b763a05ac32ca25b14e69 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220420095424eucas1p13b9dc5cacc7b763a05ac32ca25b14e69 References: Subject: [FFmpeg-devel] [PATCH 2/3] Provided support for MPEG-5 EVC (Essential Video Coding) codec X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pOd+EoWUuOMp - Added xeve encoder wrapper - Added xevd dencoder wrapper - Added documentation for xeve and xevd wrappers - Added parser for EVC format - Changes in project configuration file and libavcodec Makefile Signed-off-by: Dawid Kozinski --- configure | 10 + doc/decoders.texi | 23 + doc/encoders.texi | 112 ++++ doc/general_contents.texi | 19 + libavcodec/Makefile | 3 + libavcodec/allcodecs.c | 2 + libavcodec/avcodec.h | 3 + libavcodec/evc_parser.c | 514 +++++++++++++++++ libavcodec/libxevd.c | 443 +++++++++++++++ libavcodec/libxeve.c | 1139 +++++++++++++++++++++++++++++++++++++ libavcodec/parsers.c | 1 + 11 files changed, 2269 insertions(+) create mode 100644 libavcodec/evc_parser.c create mode 100644 libavcodec/libxevd.c create mode 100644 libavcodec/libxeve.c -- 2.17.1 diff --git a/configure b/configure index 7a62f0c248..ef3b3cfc1d 100755 --- a/configure +++ b/configure @@ -289,6 +289,8 @@ External library support: --enable-libwebp enable WebP encoding via libwebp [no] --enable-libx264 enable H.264 encoding via x264 [no] --enable-libx265 enable HEVC encoding via x265 [no] + --enable-libxeve enable MPEG-5 Essential Video Coding (EVC) encoding via libxeve [no] + --enable-libxevd enable MPEG-5 Essential Video Coding (EVC) decoding via libxevd [no] --enable-libxavs enable AVS encoding via xavs [no] --enable-libxavs2 enable AVS2 encoding via xavs2 [no] --enable-libxcb enable X11 grabbing using XCB [autodetect] @@ -1880,6 +1882,8 @@ EXTERNAL_LIBRARY_LIST=" openssl pocketsphinx vapoursynth + libxeve + libxevd " HWACCEL_AUTODETECT_LIBRARY_LIST=" @@ -2453,6 +2457,7 @@ CONFIG_EXTRA=" h264pred h264qpel hevcparse + evcparse hpeldsp huffman huffyuvdsp @@ -3252,6 +3257,7 @@ mpegaudio_parser_select="mpegaudioheader" mpegvideo_parser_select="mpegvideo" mpeg4video_parser_select="h263dsp mpegvideo qpeldsp" vc1_parser_select="vc1dsp" +evc_parser_select="evcparse" # bitstream_filters aac_adtstoasc_bsf_select="adts_header mpeg4audio" @@ -3377,6 +3383,8 @@ libx264_encoder_select="atsc_a53" libx264rgb_encoder_deps="libx264" libx264rgb_encoder_select="libx264_encoder" libx265_encoder_deps="libx265" +libxeve_encoder_deps="libxeve" +libxevd_decoder_deps="libxevd" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" libxvid_encoder_deps="libxvid" @@ -6659,6 +6667,8 @@ enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x check_cpp_condition libx262 x264.h "X264_MPEG2" enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && require_cpp_condition libx265 x265.h "X265_BUILD >= 70" +enabled libxeve && require_pkg_config libxeve "xeve >= 1.0.0" "xeve.h" xeve_encode +enabled libxevd && require_pkg_config libxevd "xevd >= 1.0.0" "xevd.h" xevd_decode enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore diff --git a/doc/decoders.texi b/doc/decoders.texi index 49ab735dce..9277e20be9 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -126,6 +126,29 @@ Set amount of frame threads to use during decoding. The default value is 0 (auto @end table +@section libxevd + +eXtra-fast Essential Video Decoder (XEVD) MPEG-5 EVC decoder wrapper. + +This decoder requires the presence of the libxevd headers and library +during configuration. You need to explicitly configure the build with +@option{--enable-libxevd}. + +The xevd project website is at @url{https://github.com/mpeg5/xevd}. + +@subsection Options + +The following options are supported by the libxevd wrapper. +The xevd-equivalent options or values are listed in parentheses for easy migration. + +To get a more accurate and extensive documentation of the libxevd options, +invoke the command @code{xevd_app --help} or consult the libxevd documentation. + +@table @option +@item threads (@emph{threads}) +Force to use a specific number of threads +@end table + @c man end VIDEO DECODERS @chapter Audio Decoders diff --git a/doc/encoders.texi b/doc/encoders.texi index e3b61de5a1..87aaaa0dbc 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2815,6 +2815,118 @@ ffmpeg -i input -c:v libxavs2 -xavs2-params RdoqLevel=0 output.avs2 @end example @end table +@section libxeve + +eXtra-fast Essential Video Encoder (XEVE) MPEG-5 EVC encoder wrapper. + +This encoder requires the presence of the libxeve headers and library +during configuration. You need to explicitly configure the build with +@option{--enable-libxeve}. + +@float NOTE +Many libxeve encoder options are mapped to FFmpeg global codec options, +while unique encoder options are provided through private options. +Additionally the xeve-params private options allows one to pass a list +of key=value tuples as accepted by the libxeve @code{parse_xeve_params} function. +@end float + +The xeve project website is at @url{https://github.com/mpeg5/xeve}. + +@subsection Options + +The following options are supported by the libxeve wrapper. +The xeve-equivalent options or values are listed in parentheses for easy migration. + +@float NOTE +To reduce the duplication of documentation, only the private options +and some others requiring special attention are documented here. For +the documentation of the undocumented generic options, see +@ref{codec-options,,the Codec Options chapter}. +@end float + +@float NOTE +To get a more accurate and extensive documentation of the libxeve options, +invoke the command @code{xeve_app --help} or consult the libxeve documentation. +@end float + +@table @option +@item b (@emph{bitrate}) +Set target video bitrate in bits/s. +Note that FFmpeg’s b option is expressed in bits/s, while xeve’s bitrate is in kilobits/s. + +@item bf (@emph{bframes}) +Set the maximum number of B frames (1,3,7,15). + +@item g (@emph{keyint}) +Set the GOP size (I-picture period). + +@item preset (@emph{preset}) +Set the xeve preset. +Set the encoder preset value to determine encoding speed [fast, medium, slow, placebo] + +@item tune (@emph{tune}) +Set the encoder tune parameter [psnr, zerolatency] + +@item profile (@emph{profile}) +Set the encoder profile [0: baselie; 1: main] + +@item crf (@emph{crf}) +Set the quality for constant quality mode. +Constant rate factor <-1..51> [default: 32] + +@item qp (@emph{qp}) +Set constant quantization rate control method parameter. +Quantization parameter qp <0..51> [default: 32] + +@item threads (@emph{threads}) +Force to use a specific number of threads + +@item xeve-params +Set xeve options using a list of @var{key}=@var{value} couples separated +by ":". + +For example to specify libxeve encoding options with @option{-xeve-params}: + +@example +ffmpeg -i input -c:v libxeve -xeve-params profile=main:tune=zerolatency:preset=fast:q=17:bframes=15:bitrate=100k output.mp4 +@end example +@end table + +@subsubsection Supported key values for xeve-params + +Set xeve options using a list of @var{key}=@var{value} couples separated + +@table @option + +@item hash +Embed the picture signature (HASH) for conformance checking in decoding, (0: Off, 1: On) + +@item vbv-bufsize +Set the VBV buffer size: Kbits(none,K,k), Mbits(M,m) + +@item rc-type +Set the rate control type, (0: OFF, 1: ABR, 2: CRF) + +@item bframes +Set the maximum number of B frames (1,3,7,15) + +@item profile +Set the PROFILE (main, baseline) + +@item preset +Set the encoder PRESET (fast, medium, slow, placebo) + +@item tune +Set the encoder TUNE (psnr, zerolatency) + +@item bitrate +Set the Bitrate in terms of kilo-bits per second: Kbps(none,K,k), Mbps(M,m) + +@item qp +Set the QP value (0~51) + +@end table + @section libxvid Xvid MPEG-4 Part 2 encoder wrapper. diff --git a/doc/general_contents.texi b/doc/general_contents.texi index df1692c8df..544b496f0c 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -336,6 +336,22 @@ libxavs2 is under the GNU Public License Version 2 or later details), you must upgrade FFmpeg's license to GPL in order to use it. @end float +@section eXtra-fast Essential Video Encoder (XEVE) + +FFmpeg can make use of the XEVE library for EVC video encoding. + +Go to @url{https://github.com/mpeg5/xeve} and follow the instructions for +installing the XEVE library. Then pass @code{--enable-libxeve} to configure to +enable it. + +@section eXtra-fast Essential Video Decoder (XEVD) + +FFmpeg can make use of the XEVD library for EVC video decoding. + +Go to @url{https://github.com/mpeg5/xevd} and follow the instructions for +installing the XEVD library. Then pass @code{--enable-libxevd} to configure to +enable it. + @section ZVBI ZVBI is a VBI decoding library which can be used by FFmpeg to decode DVB @@ -583,6 +599,7 @@ library: @item raw DTS @tab X @tab X @item raw DTS-HD @tab @tab X @item raw E-AC-3 @tab X @tab X +@item raw EVC @tab X @tab X @item raw FLAC @tab X @tab X @item raw GSM @tab @tab X @item raw H.261 @tab X @tab X @@ -912,6 +929,8 @@ following image formats are supported: @item Electronic Arts TQI video @tab @tab X @item Escape 124 @tab @tab X @item Escape 130 @tab @tab X +@item EVC / MPEG-5 Part 1 @tab X @tab X + @tab encoding and decoding supported through external libraries libxeve and libxevd @item FFmpeg video codec #1 @tab X @tab X @tab lossless codec (fourcc: FFV1) @item Flash Screen Video v1 @tab X @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3adf1536d8..8134f40e3e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1087,6 +1087,8 @@ OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER) += libwebpenc_common.o libwebpenc_anim OBJS-$(CONFIG_LIBX262_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o +OBJS-$(CONFIG_LIBXEVE_ENCODER) += libxeve.o +OBJS-$(CONFIG_LIBXEVD_DECODER) += libxevd.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o OBJS-$(CONFIG_LIBXAVS2_ENCODER) += libxavs2.o OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o @@ -1152,6 +1154,7 @@ OBJS-$(CONFIG_VP9_PARSER) += vp9_parser.o OBJS-$(CONFIG_WEBP_PARSER) += webp_parser.o OBJS-$(CONFIG_XBM_PARSER) += xbm_parser.o OBJS-$(CONFIG_XMA_PARSER) += xma_parser.o +OBJS-$(CONFIG_EVC_PARSER) += evc_parser.o # bitstream filters OBJS-$(CONFIG_AAC_ADTSTOASC_BSF) += aac_adtstoasc_bsf.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index d1e10197de..12e6c92f65 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -783,6 +783,8 @@ extern LIBX264_CONST AVCodec ff_libx264_encoder; #endif extern const AVCodec ff_libx264rgb_encoder; extern AVCodec ff_libx265_encoder; +extern const AVCodec ff_libxeve_encoder; +extern const AVCodec ff_libxevd_decoder; extern const AVCodec ff_libxavs_encoder; extern const AVCodec ff_libxavs2_encoder; extern const AVCodec ff_libxvid_encoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7ee8bc2b7c..a070e0f1d7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1643,6 +1643,9 @@ typedef struct AVCodecContext { #define FF_PROFILE_KLVA_SYNC 0 #define FF_PROFILE_KLVA_ASYNC 1 +#define FF_PROFILE_EVC_BASELINE 0 +#define FF_PROFILE_EVC_MAIN 1 + /** * level * - encoding: Set by user. diff --git a/libavcodec/evc_parser.c b/libavcodec/evc_parser.c new file mode 100644 index 0000000000..7c41eb9af4 --- /dev/null +++ b/libavcodec/evc_parser.c @@ -0,0 +1,514 @@ +/* + * EVC AVC format parser + * + * Copyright (C) 2021 Dawid Kozinski + * + * 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 "libavutil/common.h" + +#include "parser.h" +#include "golomb.h" + +#define EVC_NAL_HEADER_SIZE 2 /* byte */ +#define MAX_SPS_CNT 16 /* defined value in EVC standard */ + +// The sturcture reflects SPS RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.1 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +typedef struct EVCParserSPS { + int sps_seq_parameter_set_id; // ue(v) + int profile_idc; // u(8) + int level_idc; // u(8) + int toolset_idc_h; // u(32) + int toolset_idc_l; // u(32) + int chroma_format_idc; // ue(v) + int pic_width_in_luma_samples; // ue(v) + int pic_height_in_luma_samples; // ue(v) + int bit_depth_luma_minus8; // ue(v) + int bit_depth_chroma_minus8; // ue(v) + + int sps_btt_flag; // u(1) + int log2_ctu_size_minus5; // ue(v) + int log2_min_cb_size_minus2; // ue(v) + int log2_diff_ctu_max_14_cb_size; // ue(v) + int log2_diff_ctu_max_tt_cb_size; // ue(v) + int log2_diff_min_cb_min_tt_cb_size_minus2; // ue(v) + + int sps_suco_flag; // u(1) + int log2_diff_ctu_size_max_suco_cb_size; // ue(v) + int log2_diff_max_suco_min_suco_cb_size; // ue(v) + + int sps_admvp_flag; // u(1) + int sps_affine_flag; // u(1) + int sps_amvr_flag; // u(1) + int sps_dmvr_flag; // u(1) + int sps_mmvd_flag; // u(1) + int sps_hmvp_flag; // u(1) + + int sps_eipd_flag; // u(1) + int sps_ibc_flag; // u(1) + int log2_max_ibc_cand_size_minus2; // ue(v) + + int sps_cm_init_flag; // u(1) + int sps_adcc_flag; // u(1) + + int sps_iqt_flag; // u(1) + int sps_ats_flag; // u(1) + + int sps_addb_flag; // u(1) + int sps_alf_flag; // u(1) + int sps_htdf_flag; // u(1) + int sps_rpl_flag; // u(1) + int sps_pocs_flag; // u(1) + int sps_dquant_flag; // u(1) + int sps_dra_flag; // u(1) + + int log2_max_pic_order_cnt_lsb_minus4; // ue(v) + int log2_sub_gop_length; // ue(v) + int log2_ref_pic_gap_length; // ue(v) + + int max_num_tid0_ref_pics; // ue(v) + + int sps_max_dec_pic_buffering_minus1; // ue(v) + int long_term_ref_pic_flag; // u(1) + int rpl1_same_as_rpl0_flag; // u(1) + int num_ref_pic_list_in_sps[2]; // ue(v) + + int picture_cropping_flag; // u(1) + int picture_crop_left_offset; // ue(v) + int picture_crop_right_offset; // ue(v) + int picture_crop_top_offset; // ue(v) + int picture_crop_bottom_offset; // ue(v) + +} EVCParserSPS; + +typedef struct EVCParserContext { + ParseContext pc; + EVCParserSPS sps[MAX_SPS_CNT]; + int is_avc; + int nal_length_size; + int to_read; + int incomplete_nalu_prefix_read; // The flag is set to 1 when an incomplete NAL unit prefix has been read + + int got_sps; + int got_pps; + int got_sei; + int got_slice; +} EVCParserContext; + +static int get_nalu_type(const uint8_t *bs, int bs_size, AVCodecContext *avctx) +{ + int unit_type_plus1 = 0; + XEVD_INFO info; + int ret; + + if(bs_size >= EVC_NAL_HEADER_SIZE) { + ret = xevd_info((void *)bs, EVC_NAL_HEADER_SIZE, 1, &info); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot get bitstream information\n"); + return -1; + } + unit_type_plus1 = info.nalu_type; + + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bs, int bs_size, AVCodecContext *avctx) +{ + uint32_t len = 0; + XEVD_INFO info; + int ret; + + if(bs_size >= XEVD_NAL_UNIT_LENGTH_BYTE) { + ret = xevd_info((void *)bs, XEVD_NAL_UNIT_LENGTH_BYTE, 1, &info); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot get bitstream information\n"); + return 0; + } + len = info.nalu_len; + if(len == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream size!\n"); + return 0; + } + } + + return len; +} + +// @see ISO_IEC_23094-1 (7.3.2.1 SPS RBSP syntax) +static EVCParserSPS *parse_sps(const uint8_t *bs, int bs_size, EVCParserContext *ev) +{ + GetBitContext gb; + EVCParserSPS *sps; + int sps_seq_parameter_set_id; + + if(init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + sps_seq_parameter_set_id = get_ue_golomb(&gb); + + if(sps_seq_parameter_set_id >= MAX_SPS_CNT) + return NULL; + + sps = &ev->sps[sps_seq_parameter_set_id]; + sps->sps_seq_parameter_set_id = sps_seq_parameter_set_id; + + // the Baseline profile is indicated by profile_idc eqal to 0 + // the Main profile is indicated by profile_idc eqal to 1 + sps->profile_idc = get_bits(&gb, 8); + + sps->level_idc = get_bits(&gb, 8); + + skip_bits_long(&gb, 32); /* skip toolset_idc_h */ + skip_bits_long(&gb, 32); /* skip toolset_idc_l */ + + // 0 - monochrome + // 1 - 4:2:0 + // 2 - 4:2:2 + // 3 - 4:4:4 + sps->chroma_format_idc = get_ue_golomb(&gb); + + sps->pic_width_in_luma_samples = get_ue_golomb(&gb); + sps->pic_height_in_luma_samples = get_ue_golomb(&gb); + + sps->bit_depth_luma_minus8 = get_ue_golomb(&gb); + sps->bit_depth_chroma_minus8 = get_ue_golomb(&gb); + + sps->sps_btt_flag = get_bits(&gb, 1); + if(sps->sps_btt_flag) { + sps->log2_ctu_size_minus5 = get_ue_golomb(&gb); + sps->log2_min_cb_size_minus2 = get_ue_golomb(&gb); + sps->log2_diff_ctu_max_14_cb_size = get_ue_golomb(&gb); + sps->log2_diff_ctu_max_tt_cb_size = get_ue_golomb(&gb); + sps->log2_diff_min_cb_min_tt_cb_size_minus2 = get_ue_golomb(&gb); + } + + sps->sps_suco_flag = get_bits(&gb, 1); + if(sps->sps_suco_flag) { + sps->log2_diff_ctu_size_max_suco_cb_size = get_ue_golomb(&gb); + sps->log2_diff_max_suco_min_suco_cb_size = get_ue_golomb(&gb); + } + + sps->sps_admvp_flag = get_bits(&gb, 1); + if(sps->sps_admvp_flag) { + sps->sps_affine_flag = get_bits(&gb, 1); + sps->sps_amvr_flag = get_bits(&gb, 1); + sps->sps_dmvr_flag = get_bits(&gb, 1); + sps->sps_mmvd_flag = get_bits(&gb, 1); + sps->sps_hmvp_flag = get_bits(&gb, 1); + } + + sps->sps_eipd_flag = get_bits(&gb, 1); + if(sps->sps_eipd_flag) { + sps->sps_ibc_flag = get_bits(&gb, 1); + if(sps->sps_ibc_flag) + sps->log2_max_ibc_cand_size_minus2 = get_ue_golomb(&gb); + } + + sps->sps_cm_init_flag = get_bits(&gb, 1); + if(sps->sps_cm_init_flag) + sps->sps_adcc_flag = get_bits(&gb, 1); + + sps->sps_iqt_flag = get_bits(&gb, 1); + if(sps->sps_iqt_flag) + sps->sps_ats_flag = get_bits(&gb, 1); + + sps->sps_addb_flag = get_bits(&gb, 1); + sps->sps_alf_flag = get_bits(&gb, 1); + sps->sps_htdf_flag = get_bits(&gb, 1); + sps->sps_rpl_flag = get_bits(&gb, 1); + sps->sps_pocs_flag = get_bits(&gb, 1); + sps->sps_dquant_flag = get_bits(&gb, 1); + sps->sps_dra_flag = get_bits(&gb, 1); + + if(sps->sps_pocs_flag) + sps->log2_max_pic_order_cnt_lsb_minus4 = get_ue_golomb(&gb); + + if(!sps->sps_pocs_flag || !sps->sps_rpl_flag) { + sps->log2_sub_gop_length = get_ue_golomb(&gb); + if(sps->log2_sub_gop_length == 0) + sps->log2_ref_pic_gap_length = get_ue_golomb(&gb); + } + + return sps; +} + +static int parse_nal_units(AVCodecParserContext *s, const uint8_t *bs, + int bs_size, AVCodecContext *avctx) +{ + EVCParserContext *ev = s->priv_data; + int nalu_type, nalu_size; + unsigned char *bits = (unsigned char *)bs; + int bits_size = bs_size; + + avctx->codec_id = AV_CODEC_ID_EVC; + + nalu_size = read_nal_unit_length(bits, bits_size, avctx); + if(nalu_size == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit size: (%d)\n", nalu_size); + return -1; + } + + bits += XEVD_NAL_UNIT_LENGTH_BYTE; + bits_size -= XEVD_NAL_UNIT_LENGTH_BYTE; + + nalu_type = get_nalu_type(bits, bits_size, avctx); + + bits += EVC_NAL_HEADER_SIZE; + bits_size -= EVC_NAL_HEADER_SIZE; + + if (nalu_type == XEVD_NUT_SPS) { // NAL Unit type: SPS (Sequence Parameter Set) + EVCParserSPS *sps; + + sps = parse_sps(bits, bits_size, ev); + + avctx->coded_width = sps->pic_width_in_luma_samples; + avctx->coded_height = sps->pic_height_in_luma_samples; + avctx->width = sps->pic_width_in_luma_samples; + avctx->height = sps->pic_height_in_luma_samples; + + if(sps->profile_idc == 0) avctx->profile = FF_PROFILE_EVC_BASELINE; + else if (sps->profile_idc == 1) avctx->profile = FF_PROFILE_EVC_MAIN; + else { + av_log(avctx, AV_LOG_ERROR, "Not supported profile (%d)\n", sps->profile_idc); + return -1; + } + + // Currently XEVD decoder supports ony YCBCR420_10LE chroma format for EVC stream + switch(sps->chroma_format_idc) { + case 0: /* YCBCR400_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR400_10LE: Not supported chroma format\n"); + avctx->pix_fmt = AV_PIX_FMT_GRAY10LE; + return -1; + case 1: /* YCBCR420_10LE */ + avctx->pix_fmt = AV_PIX_FMT_YUV420P10LE; + break; + case 2: /* YCBCR422_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR422_10LE: Not supported chroma format\n"); + avctx->pix_fmt = AV_PIX_FMT_YUV422P10LE; + return -1; + case 3: /* YCBCR444_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR444_10LE: Not supported chroma format\n"); + avctx->pix_fmt = AV_PIX_FMT_YUV444P10LE; + return -1; + default: + avctx->pix_fmt = AV_PIX_FMT_NONE; + av_log(avctx, AV_LOG_ERROR, "Unknown supported chroma format\n"); + return -1; + } + + // The current implementation of parse_sps function doesn't handle VUI parameters parsing, + // so at the moment it's impossible to initialize has_b_frames and max_b_frames AVCodecContex fields here. + // Currently, initialization of has_b_frames and max_b_frames AVCodecContex fields have been moved to + // libxevd_decode function where we can use xevd_config function being a part of xevd library API + // to get the needed information. + // However, if it will be needed, parse_sps function should be extended to handle VUI parameters parsing + // and the following lines should be used to initialize has_b_frames and max_b_frames fields of the AVCodecContex. + // + // sps->vui_parameters.num_reorder_pics + // if (sps->bitstream_restriction_flag && sps->vui_parameters.num_reorder_pics) { + // avctx->has_b_frames = sps->vui_parameters.num_reorder_pics; + // } + + ev->got_sps = 1; + + } else if (nalu_type == XEVD_NUT_PPS) // NAL Unit type: PPS (Video Parameter Set) + ev->got_pps = 1; + else if(nalu_type == XEVD_NUT_SEI) // NAL unit type: SEI (Supplemental Enhancement Information) + ev->got_sei = 1; + else if (nalu_type == XEVD_NUT_IDR || nalu_type == XEVD_NUT_NONIDR) // NAL Unit type: Coded slice of a IDR or non-IDR picture + ev->got_slice++; + else { + av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit type: %d\n", nalu_type); + return -1; + } + + return 0; +} + +/** + * Find the end of the current frame in the bitstream. + * @return the position of the first byte of the next frame, or END_NOT_FOUND + */ +static int evc_find_frame_end(AVCodecParserContext *s, const uint8_t *buf, + int buf_size, AVCodecContext *avctx) +{ + EVCParserContext *ev = s->priv_data; + + if(!ev->to_read) { + int nal_unit_size = 0; + int next = END_NOT_FOUND; + + // This is the case when buffer size is not enough for buffer to store NAL unit length + if(buf_size < XEVD_NAL_UNIT_LENGTH_BYTE) { + ev->to_read = XEVD_NAL_UNIT_LENGTH_BYTE; + ev->nal_length_size = buf_size; + ev->incomplete_nalu_prefix_read = 1; + + return END_NOT_FOUND; + } + + nal_unit_size = read_nal_unit_length(buf, buf_size, avctx); + ev->nal_length_size = XEVD_NAL_UNIT_LENGTH_BYTE; + + next = nal_unit_size + XEVD_NAL_UNIT_LENGTH_BYTE; + ev->to_read = next; + if(next < buf_size) + return next; + else + return END_NOT_FOUND; + } else if(ev->to_read > buf_size) { + return END_NOT_FOUND; + } else { + if(ev->incomplete_nalu_prefix_read == 1) { + EVCParserContext *ev = s->priv_data; + ParseContext *pc = &ev->pc; + uint8_t nalu_len[XEVD_NAL_UNIT_LENGTH_BYTE] = {0}; + int nal_unit_size = 0; + + // 1. pc->buffer contains previously read bytes of NALU prefix + // 2. buf contains the rest of NAL unit prefix bytes + // + // ~~~~~~~ + // EXAMPLE + // ~~~~~~~ + // + // In the following example we assumed that the number of already read NAL Unit prefix bytes is equal 1 + // + // ---------- + // pc->buffer -> conatins already read bytes + // ---------- + // __ pc->index == 1 + // | + // V + // ------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | ... | N | + // ------------------------------------------------------- + // | 0x00 | 0xXX | 0xXX | 0xXX | 0xXX | ... | 0xXX | + // ------------------------------------------------------- + // + // ---------- + // buf -> contains newly read bytes + // ---------- + // ------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | ... | N | + // ------------------------------------------------------- + // | 0x00 | 0x00 | 0x3C | 0xXX | 0xXX | ... | 0xXX | + // ------------------------------------------------------- + // + for(int i = 0; i < XEVD_NAL_UNIT_LENGTH_BYTE; i++) { + if(i < pc->index) + nalu_len[i] = pc->buffer[i]; + else + nalu_len[i] = buf[i - pc->index]; + } + + // ---------- + // nalu_len + // ---------- + // --------------------------------- + // | 0 | 1 | 2 | 3 | + // --------------------------------- + // | 0x00 | 0x00 | 0x00 | 0x3C | + // --------------------------------- + // | NALU LENGTH | + // --------------------------------- + // NAL Unit lenght = 60 (0x0000003C) + + nal_unit_size = read_nal_unit_length(nalu_len, XEVD_NAL_UNIT_LENGTH_BYTE, avctx); + + ev->to_read = nal_unit_size + XEVD_NAL_UNIT_LENGTH_BYTE - pc->index; + + ev->incomplete_nalu_prefix_read = 0; + + if(ev->to_read > buf_size) + return END_NOT_FOUND; + else + return ev->to_read; + } + return ev->to_read; + } + + return END_NOT_FOUND; +} + +static int evc_parser_init(AVCodecParserContext *s) +{ + EVCParserContext *ev = s->priv_data; + + ev->got_sps = 0; + ev->got_pps = 0; + ev->got_sei = 0; + ev->got_slice = 0; + ev->nal_length_size = XEVD_NAL_UNIT_LENGTH_BYTE; + ev->incomplete_nalu_prefix_read = 0; + + return 0; +} + +static int evc_parse(AVCodecParserContext *s, AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + int next; + EVCParserContext *ev = s->priv_data; + ParseContext *pc = &ev->pc; + int is_dummy_buf = !buf_size; + const uint8_t *dummy_buf = buf; + + if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) + next = buf_size; + else { + next = evc_find_frame_end(s, buf, buf_size, avctx); + if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + ev->to_read -= buf_size; + return buf_size; + } + } + + is_dummy_buf &= (dummy_buf == buf); + + if (!is_dummy_buf) + parse_nal_units(s, buf, buf_size, avctx); + + *poutbuf = buf; + *poutbuf_size = buf_size; + ev->to_read -= next; + + return next; +} + +AVCodecParser ff_evc_parser = { + .codec_ids = { AV_CODEC_ID_EVC }, + .priv_data_size = sizeof(EVCParserContext), + .parser_init = evc_parser_init, + .parser_parse = evc_parse, + .parser_close = ff_parse_close, +}; diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c new file mode 100644 index 0000000000..e8d4eae73a --- /dev/null +++ b/libavcodec/libxevd.c @@ -0,0 +1,443 @@ +/* + * libxevd decoder + * EVC (MPEG-5 Essential Video Coding) decoding using XEVD MPEG-5 EVC decoder library + * + * Copyright (C) 2021 Dawid Kozinski + * + * 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 + */ + +#if defined(_MSC_VER) +#define XEVD_API_IMPORTS 1 +#endif + +#include +#include + +#include + +#include "libavutil/internal.h" +#include "libavutil/common.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "libavutil/pixfmt.h" +#include "libavutil/imgutils.h" + +#include "avcodec.h" +#include "internal.h" +#include "packet_internal.h" + +#define XEVD_PARAM_BAD_NAME -1 +#define XEVD_PARAM_BAD_VALUE -2 + +#define EVC_NAL_HEADER_SIZE 2 /* byte */ + +/** + * The structure stores all the states associated with the instance of Xeve MPEG-5 EVC decoder + * The first field is a pointer to an AVClass struct (@see https://ffmpeg.org/doxygen/trunk/structAVClass.html#details). + */ +typedef struct XevdContext { + const AVClass *class; + + XEVD id; // XEVD instance identifier @see xevd.h + XEVD_CDSC cdsc; // decoding parameters @see xevd.h + + int decod_frames; // number of decoded frames + int packet_count; // number of packets created by decoder + + // configuration parameters + AVDictionary *xevd_opts; // xevd configuration read from a : separated list of key=value parameters + +} XevdContext; + +/** + * The function returns a pointer to a variable of type XEVD_CDSC. + * XEVD_CDSC contains all decoder parameters that should be initialized before its use. + * + * The field values of the XEVD_CDSC structure are populated based on: + * - the corresponding field values of the AvCodecConetxt structure, + * - the xevd decoder specific option values, + * (the full list of options available for the xevd encoder is displayed after executing the command ./ffmpeg --help decoder = libxevd) + * - and the xevd encoder options specified as a list of key-value pairs following the xevd-params option + * + * Order of input processing and populating the XEVD_CDSC structure + * 1. first, the corresponding fields of the AVCodecContext structure are processed, (i.e -threads 4) + * 2. then xevd-specific options are added as AVOption to the xevd AVCodec implementation (i.e -threads 3) + * 3. finally, the options specified after the xevd-params option as the parameter list of type key value are processed (i.e -xevd-params "m=2") + * + * Some options can be set in different ways. In this case, please follow the above-mentioned order of processing. + * The most recent assignments overwrite the previous values. + * + * @param[in] avctx codec context + * @param[out] cdsc contains all encoder parameters that should be initialized before its use + * + * @return 0 on success, negative error code on failure + */ +static int get_conf(AVCodecContext *avctx, XEVD_CDSC *cdsc) +{ + int cpu_count = av_cpu_count(); + + /* clear XEVS_CDSC structure */ + memset(cdsc, 0, sizeof(XEVD_CDSC)); + + /* init XEVD_CDSC */ + if(avctx->thread_count <= 0) + cdsc->threads = (cpu_count < XEVD_MAX_TASK_CNT) ? cpu_count : XEVD_MAX_TASK_CNT; + else if(avctx->thread_count > XEVD_MAX_TASK_CNT) + cdsc->threads = XEVD_MAX_TASK_CNT; + else + cdsc->threads = avctx->thread_count; + + return XEVD_OK; +} + +/** + * Read NAL unit length + * @param bs input data (bitstream) + * @return the length of NAL unit on success, 0 value on failure + */ +static uint32_t read_nal_unit_length(const uint8_t *bs, int bs_size, AVCodecContext *avctx) +{ + uint32_t len = 0; + XEVD_INFO info; + int ret; + + if(bs_size == XEVD_NAL_UNIT_LENGTH_BYTE) { + ret = xevd_info((void *)bs, XEVD_NAL_UNIT_LENGTH_BYTE, 1, &info); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot get bitstream information\n"); + return 0; + } + len = info.nalu_len; + if(len == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream size! [%d]\n", bs_size); + return 0; + } + } + + return len; +} + +/** + * @param[in] xectx the structure that stores all the state associated with the instance of Xeve MPEG-5 EVC decoder + * @param[out] avctx codec context + * @return 0 on success, negative value on failure + */ +static int export_stream_params(const XevdContext *xectx, AVCodecContext *avctx) +{ + int ret; + int size; + int color_space; + + avctx->pix_fmt = AV_PIX_FMT_YUV420P10; + + size = 4; + ret = xevd_config(xectx->id, XEVD_CFG_GET_CODED_WIDTH, &avctx->coded_width, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get coded_width\n"); + return -1; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_CODED_HEIGHT, &avctx->coded_height, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get coded_height\n"); + return -1; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_WIDTH, &avctx->width, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get width\n"); + return -1; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_HEIGHT, &avctx->height, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get height\n"); + return -1; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_COLOR_SPACE, &color_space, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get color_space\n"); + return -1; + } + switch(color_space) { + case XEVD_CS_YCBCR400_10LE: + avctx->pix_fmt = AV_PIX_FMT_GRAY10LE; + break; + case XEVD_CS_YCBCR420_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV420P10LE; + break; + case XEVD_CS_YCBCR422_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV422P10LE; + break; + case XEVD_CS_YCBCR444_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV444P10LE; + break; + default: + av_log(avctx, AV_LOG_ERROR, "Unknown color space\n"); + avctx->pix_fmt = AV_PIX_FMT_NONE; + return -1; + } + + // the function returns sps->num_reorder_pics + ret = xevd_config(xectx->id, XEVD_CFG_GET_MAX_CODING_DELAY, &avctx->max_b_frames, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get max_coding_delay\n"); + return -1; + } + + avctx->has_b_frames = (avctx->max_b_frames) ? 1 : 0; + + avctx->color_primaries = AVCOL_PRI_UNSPECIFIED; + avctx->color_trc = AVCOL_TRC_UNSPECIFIED; + avctx->colorspace = AVCOL_SPC_UNSPECIFIED; + + return 0; +} + +/** + * Initialize decoder + * Create a decoder instance and allocate all the needed resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxevd_init(AVCodecContext *avctx) +{ + XevdContext *xectx = avctx->priv_data; + int val = 0; + XEVD_CDSC *cdsc = &(xectx->cdsc); + + /* read configurations and set values for created descriptor (XEVD_CDSC) */ + val = get_conf(avctx, cdsc); + if (val != XEVD_OK) { + av_log(avctx, AV_LOG_ERROR, "Cannot get configuration\n"); + return -1; + } + + /* create decoder */ + xectx->id = xevd_create(&(xectx->cdsc), NULL); + if(xectx->id == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot create XEVD encoder\n"); + return -1; + } + + xectx->packet_count = 0; + xectx->decod_frames = 0; + + return 0; +} + +/** + * Decode picture + * + * @param avctx codec context + * @param[out] data decoded frame + * @param[out] got_frame decoder sets to 0 or 1 to indicate that a + * non-empty frame or subtitle was returned in + * outdata. + * @param[in] pkt AVPacket containing encoded data to be decoded + * + * @return amount of bytes read from the packet on success, negative error + * code on failure + */ +static int libxevd_decode(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *pkt) +{ + AVFrame *frame = data; + XevdContext *xectx = NULL; + XEVD_IMGB *imgb = NULL; + XEVD_STAT stat; + XEVD_BITB bitb; + int ret, nalu_size, bs_read_pos; + + if(avctx == NULL) { + av_log(avctx, AV_LOG_ERROR, "Invalid input parameter: AVCodecContext\n"); + return -1; + } + xectx = avctx->priv_data; + if(xectx == NULL) { + av_log(avctx, AV_LOG_ERROR, "Invalid XEVD context\n"); + return -1; + } + + if(pkt->size > 0) { + bs_read_pos = 0; + imgb = NULL; + while(pkt->size > (bs_read_pos + XEVD_NAL_UNIT_LENGTH_BYTE)) { + + memset(&stat, 0, sizeof(XEVD_STAT)); + memset(&bitb, 0, sizeof(XEVD_BITB)); + + nalu_size = read_nal_unit_length(pkt->data + bs_read_pos, XEVD_NAL_UNIT_LENGTH_BYTE, avctx); + if(nalu_size == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream\n"); + goto ERR; + } + bs_read_pos += XEVD_NAL_UNIT_LENGTH_BYTE; + + bitb.addr = pkt->data + bs_read_pos; + bitb.ssize = nalu_size; + + /* main decoding block */ + ret = xevd_decode(xectx->id, &bitb, &stat); + if(XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to decode bitstream\n"); + goto ERR; + } + + bs_read_pos += nalu_size; + + if(stat.nalu_type == XEVD_NUT_SPS) { // EVC stream parameters changed + if(export_stream_params(xectx, avctx) != 0) + goto ERR; + } + + if(stat.read != nalu_size) + av_log(avctx, AV_LOG_INFO, "Different reading of bitstream (in:%d, read:%d)\n,", nalu_size, stat.read); + if(stat.fnum >= 0) { + if (imgb) { /* already has a decoded image */ + imgb->release(imgb); + imgb = NULL; + } + ret = xevd_pull(xectx->id, &imgb); + if(XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image (xevd error code: %d, frame#=%d)\n", ret, stat.fnum); + goto ERR; + } else if (ret == XEVD_OK_FRM_DELAYED) { + if(imgb) { + imgb->release(imgb); + imgb = NULL; + } + } + } + } + } else { // bumping + ret = xevd_pull(xectx->id, &(imgb)); + if(ret == XEVD_ERR_UNEXPECTED) { // bumping process completed + *got_frame = 0; + return 0; + } else if(XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image (xevd error code: %d)\n", ret); + goto ERR; + } + } + + if(imgb) { + // @todo supports other color space and bit depth + if(imgb->cs != XEVD_CS_YCBCR420_10LE) { + av_log(avctx, AV_LOG_ERROR, "Not supported pixel format: %s\n", av_get_pix_fmt_name(avctx->pix_fmt)); + goto ERR; + } + + if (imgb->w[0] != avctx->width || imgb->h[0] != avctx->height) { // stream resolution changed + if(ff_set_dimensions(avctx, imgb->w[0], imgb->h[0]) < 0) { + av_log(avctx, AV_LOG_ERROR, "Cannot set new dimension\n"); + goto ERR; + } + } + + frame->coded_picture_number++; + frame->display_picture_number++; + frame->format = AV_PIX_FMT_YUV420P10LE; + + if (ff_get_buffer(avctx, frame, 0) < 0) { + av_log(avctx, AV_LOG_ERROR, "Cannot get AV buffer\n"); + goto ERR; + } + + frame->pts = pkt->pts; + + av_image_copy(frame->data, frame->linesize, (const uint8_t **)imgb->a, + imgb->s, avctx->pix_fmt, + imgb->w[0], imgb->h[0]); + + xectx->decod_frames++; + *got_frame = 1; + + imgb->release(imgb); + imgb = NULL; + } else + *got_frame = 0; + + xectx->packet_count++; + + return pkt->size; + +ERR: + if(imgb) { + imgb->release(imgb); + imgb = NULL; + } + *got_frame = 0; + + return -1; +} + +/** + * Destroy decoder + * + * @param avctx codec context + * @return 0 on success + */ +static av_cold int libxevd_close(AVCodecContext *avctx) +{ + XevdContext *xectx = avctx->priv_data; + if(xectx->id) { + xevd_delete(xectx->id); + xectx->id = NULL; + } + + return 0; +} + +#define OFFSET(x) offsetof(XevdContext, x) +#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM + +// @todo consider using following options (./ffmpeg --help decoder=libxevd) +// +static const AVOption options[] = { + { "xevd-params", "override the xevd configuration using a : separated list of key=value parameters", OFFSET(xevd_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VD }, + { NULL } +}; + +static const AVClass xevd_class = { + .class_name = "libxevd", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +static const AVCodecDefault xevd_defaults[] = { + { "b", "0" }, + { NULL }, +}; + +AVCodec ff_libxevd_decoder = { + .name = "evc", + .long_name = NULL_IF_CONFIG_SMALL("EVC / MPEG-5 Essential Video Coding (EVC)"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_EVC, + .init = libxevd_init, + .decode = libxevd_decode, + .close = libxevd_close, + .priv_data_size = sizeof(XevdContext), + .priv_class = &xevd_class, + .defaults = xevd_defaults, + .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS | AV_CODEC_CAP_AVOID_PROBING, + .wrapper_name = "libxevd", +}; diff --git a/libavcodec/libxeve.c b/libavcodec/libxeve.c new file mode 100644 index 0000000000..d04a12bc60 --- /dev/null +++ b/libavcodec/libxeve.c @@ -0,0 +1,1139 @@ +/* + * libxeve encoder + * EVC (MPEG-5 Essential Video Coding) encoding using XEVE MPEG-5 EVC encoder library + * + * Copyright (C) 2021 Dawid Kozinski + * + * 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 + */ + +#if defined(_MSC_VER) +#define XEVE_API_IMPORTS 1 +#endif + +#include +#include + +#include + +#include "libavutil/internal.h" +#include "libavutil/common.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "libavutil/pixfmt.h" +#include "libavutil/time.h" + +#include "avcodec.h" +#include "internal.h" +#include "packet_internal.h" + +#define MAX_BS_BUF (16*1024*1024) + +/** + * Error codes + */ +#define XEVE_PARAM_BAD_NAME -100 +#define XEVE_PARAM_BAD_VALUE -200 + +/** + * Encoder states + * + * STATE_ENCODING - the encoder receives and processes input frames + * STATE_BUMPING - there are no more input frames, however the encoder still processes previously received data + * STATE_SKIPPING - skipping input frames + */ +typedef enum State { + STATE_ENCODING, + STATE_BUMPING, + STATE_SKIPPING +} State; + +/** + * The structure stores all the states associated with the instance of Xeve MPEG-5 EVC encoder + * The first field is a pointer to an AVClass struct (@see https://ffmpeg.org/doxygen/trunk/structAVClass.html#details). + */ +typedef struct XeveContext { + const AVClass *class; + + XEVE id; // XEVE instance identifier + XEVE_CDSC cdsc; // coding parameters i.e profile, width & height of input frame, num of therads, frame rate ... + XEVE_BITB bitb; // bitstream buffer (output) + XEVE_STAT stat; // encoding status (output) + XEVE_IMGB imgb; // image buffer (input) + + State state; // encoder state (skipping, encoding, bumping) + + int encod_frames; // num of encoded frames + double bytes_total; // encoded bitstream byte size + double bitrate; // bits per second + int packet_count; // num of packets created by encoder + + // Chroma subsampling + int width_luma; + int height_luma; + int width_chroma; + int height_chroma; + + int profile_id; // encoder profile (main, baseline) + int preset_id; // preset of xeve ( fast, medium, slow, placebo) + int tune_id; // tune of xeve (psnr, zerolatency) + int input_depth; // input bit-depth: 8bit, 10bit + int hash; // embed picture signature (HASH) for conformance checking in decoding + + /* variables for input parameter */ + char *op_preset; + char *op_tune; + int op_qp; + int op_crf; + + // configuration parameters + // xeve configuration read from a : separated list of key=value parameters + AVDictionary *xeve_params; +} XeveContext; + +/** + * Gets Xeve encoder pre-defined profile + * + * @param profile string describing Xeve encoder profile (baseline, main) + * @return XEVE pre-defined profile on success, negative value on failure + */ +static int get_profile_id(const char *profile) +{ + if (!strcmp(profile, "baseline")) + return XEVE_PROFILE_BASELINE; + else if (!strcmp(profile, "main")) + return XEVE_PROFILE_MAIN; + else + return -1; +} + +/** + * Gets Xeve pre-defined preset + * + * @param preset string describing Xeve encoder preset (fast, medium, slow, placebo) + * @return XEVE pre-defined profile on success, negative value on failure + */ +static int get_preset_id(const char *preset) +{ + if((!strcmp(preset, "fast"))) + return XEVE_PRESET_FAST; + else if (!strcmp(preset, "medium")) + return XEVE_PRESET_MEDIUM; + else if (!strcmp(preset, "slow")) + return XEVE_PRESET_SLOW; + else if (!strcmp(preset, "placebo")) + return XEVE_PRESET_PLACEBO; + else + return -1; +} + +/** + * Gets Xeve pre-defined tune id + * + * @param[in] tune string describing Xeve encoder tune (psnr, zerolatency) + * @return XEVE pre-defined profile on success, negative value on failure + */ +static int get_tune_id(const char *tune) +{ + if((!strcmp(tune, "psnr"))) + return XEVE_TUNE_PSNR; + else if (!strcmp(tune, "zerolatency")) + return XEVE_TUNE_ZEROLATENCY; + else + return -1; +} + +/** + * Convert FFmpeg pixel format (AVPixelFormat) to XEVE pre-defined color format + * + * @param[in] px_fmt pixel format (@see https://ffmpeg.org/doxygen/trunk/pixfmt_8h.html#a9a8e335cf3be472042bc9f0cf80cd4c5) + * @param[out] color_format XEVE pre-defined color format (@see xeve.h) + * @param[out] bit_depth bit depth + * + * @return 0 on success, negative value on failure + */ +static int get_pix_fmt(enum AVPixelFormat pix_fmt, int *color_format, int *bit_depth) +{ + switch (pix_fmt) { + case AV_PIX_FMT_YUV420P: + *color_format = XEVE_CF_YCBCR420; + *bit_depth = 8; + break; + case AV_PIX_FMT_YUV422P: + *color_format = XEVE_CF_YCBCR422; + *bit_depth = 8; + break; + case AV_PIX_FMT_YUV444P: + *color_format = XEVE_CF_YCBCR444; + *bit_depth = 8; + break; + case AV_PIX_FMT_YUV420P10: + *color_format = XEVE_CF_YCBCR420; + *bit_depth = 10; + break; + case AV_PIX_FMT_YUV422P10: + *color_format = XEVE_CF_YCBCR422; + *bit_depth = 10; + break; + case AV_PIX_FMT_YUV444P10: + *color_format = XEVE_CF_YCBCR444; + *bit_depth = 10; + break; + default: + *color_format = XEVE_CF_UNKNOWN; + return -1; + } + + return 0; +} + +static int kbps_str_to_int(char *str) +{ + int kbps = 0; + if (strchr(str, 'K') || strchr(str, 'k')) { + char *tmp = strtok(str, "Kk "); + kbps = (int)(atof(tmp)); + } else if (strchr(str, 'M') || strchr(str, 'm')) { + char *tmp = strtok(str, "Mm "); + kbps = (int)(atof(tmp) * 1000); + } else + kbps = atoi(str); + + return kbps; +} + +/** + * Parse : separated list of key=value parameters + * + * @param[in] avctx context for logger + * @param[in] key + * @param[in] value + * @param[out] cdsc contains all Xeve MPEG-5 EVC encoder encoder parameters that + * should be initialized before the encoder is use + * + * @return 0 on success, negative value on failure + */ +static int parse_xeve_params(AVCodecContext *avctx, const char *key, const char *value, XEVE_CDSC* cdsc) +{ + XeveContext *xectx = NULL; + xectx = avctx->priv_data; + + if(!key) { + av_log(avctx, AV_LOG_ERROR, "Ivalid argument: key string is NULL\n"); + return XEVE_PARAM_BAD_VALUE; + } + if(!value) { + if (strcmp(key, "hash") == 0) { + xectx->hash = 1; + av_log(avctx, AV_LOG_INFO, "embedding signature is enabled\n"); + } else { + av_log(avctx, AV_LOG_ERROR, "Ivalid argument: value string is NULL\n"); + return XEVE_PARAM_BAD_VALUE; + } + } else if (strcmp(key, "vbv-bufsize") == 0 ) { + cdsc->param.vbv_bufsize = kbps_str_to_int((char *)value); + av_log(avctx, AV_LOG_INFO, "VBV buffer size: %dkbits\n", cdsc->param.vbv_bufsize); + } else if (strcmp(key, "rc-type") == 0 ) { + int rc_type = atoi(value); + if(rc_type < 0 || rc_type > 2) { + av_log(avctx, AV_LOG_ERROR, "Rate control type [ 0(rc_off) / 1(CBR) ] bad value: %d\n", rc_type); + return XEVE_PARAM_BAD_VALUE; + } + cdsc->param.rc_type = rc_type; + av_log(avctx, AV_LOG_INFO, "Rate control type [ 0(rc_off) / 1(CBR) ] : %d\n", rc_type); + } else if (strcmp(key, "bframes") == 0 ) { + int bframes = atoi(value); + if(bframes < 0) { + av_log(avctx, AV_LOG_ERROR, "bframes: bad value: %d\n", bframes); + return XEVE_PARAM_BAD_VALUE; + } + cdsc->param.bframes = bframes; + av_log(avctx, AV_LOG_INFO, "bframes : %d\n", bframes); + } else if (strcmp(key, "profile") == 0 ) { + const char *profile = value; + int profile_id; + av_log(avctx, AV_LOG_INFO, "profile (baseline, main): %s\n", profile); + profile_id = get_profile_id(profile); + if (profile_id < 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid xeve param: profile(%s)\n", profile); + return XEVE_PARAM_BAD_VALUE; + } + xectx->profile_id = profile_id; + } else if (strcmp(key, "preset") == 0 ) { + const char *preset = value; + int preset_id; + av_log(avctx, AV_LOG_INFO, "Preset of xeve (fast, medium, slow, placebo): %s\n", preset); + preset_id = get_preset_id(preset); + if( preset_id < 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid xeve param: preset(%s)\n", preset); + return XEVE_PARAM_BAD_VALUE; + } + xectx->preset_id = preset_id; + } else if (strcmp(key, "tune") == 0 ) { + const char *tune = value; + int tune_id; + av_log(avctx, AV_LOG_INFO, "Tune of xeve (psnr, zerolatency): %s\n", tune); + tune_id = get_tune_id(tune); + if( tune_id < 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid xeve param: tune(%s)\n", tune); + return XEVE_PARAM_BAD_VALUE; + } + xectx->tune_id = tune_id; + } else if (strcmp(key, "bitrate") == 0 ) { + cdsc->param.bitrate = kbps_str_to_int((char *)value); + av_log(avctx, AV_LOG_INFO, "Bitrate = %dkbps\n", cdsc->param.bitrate); + } else if (strcmp(key, "q") == 0 || strcmp(key, "qp") == 0) { + int qp = atoi(value); + if(qp < 0 || qp > 51) { + av_log(avctx, AV_LOG_ERROR, "Invalid QP value (0~51) :%d\n", qp); + return XEVE_PARAM_BAD_VALUE; + } + cdsc->param.qp = qp; + av_log(avctx, AV_LOG_INFO, "QP value (0~51): %d\n", cdsc->param.qp); + } else { + av_log(avctx, AV_LOG_ERROR, "Unknown xeve codec option: %s\n", key); + return XEVE_PARAM_BAD_NAME; + } + + return 0; +} + +/** + * The function returns a pointer to the object of the XEVE_CDSC type. + * XEVE_CDSC contains all encoder parameters that should be initialized before the encoder is used. + * + * The field values of the XEVE_CDSC structure are populated based on: + * - the corresponding field values of the AvCodecConetxt structure, + * - the xeve encoder specific option values, + * (the full list of options available for xeve encoder is displayed after executing the command ./ffmpeg --help encoder = libxeve) + * - and the xeve encoder options specified as a list of key-value pairs following the xeve-params option + * + * The order of processing input data and populating the XEVE_CDSC structure + * 1) first, the fields of the AVCodecContext structure corresponding to the provided input options are processed, + * (i.e -pix_fmt yuv420p -s:v 1920x1080 -r 30 -profile:v 0) + * 2) then xeve-specific options added as AVOption to the xeve AVCodec implementation + * (i.e -threads_cnt 3 -preset 0) + * 3) finally, the options specified after the xeve-params option as the parameter list of type key value are processed + * (i.e -xeve-params "m=2:q=17") + * + * Keep in mind that, there are options that can be set in different ways. + * In this case, please follow the above-mentioned order of processing. + * The most recent assignments overwrite the previous values. + * + * @param[in] avctx codec context (AVCodecContext) + * @param[out] cdsc contains all Xeve MPEG-5 EVC encoder encoder parameters that should be initialized before the encoder is use + * + * @return 0 on success, negative error code on failure + */ +static int get_conf(AVCodecContext *avctx, XEVE_CDSC *cdsc) +{ + XeveContext *xectx = NULL; + int color_format; + int cpu_count = av_cpu_count(); + int ret; + + xectx = avctx->priv_data; + xectx->hash = 0; + + /* initialize xeve_param struct with default values */ + ret = xeve_param_default(&cdsc->param); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot set_default parameter\n"); + goto ERR; + } + + /* read options from AVCodecContext */ + if(avctx->width > 0) + cdsc->param.w = xectx->width_luma = avctx->width; + + if(avctx->height > 0) + cdsc->param.h = xectx->height_luma = avctx->height; + + if(avctx->framerate.num > 0) { + // fps can be float number, but xeve API doesn't support it + cdsc->param.fps = (int)(((float)avctx->framerate.num / avctx->framerate.den) + 0.5); + } + + if(avctx->gop_size >= 0) { // GOP size (key-frame interval) + cdsc->param.keyint = avctx->gop_size; // 0: only one I-frame at the first time; 1: every frame is coded in I-frame + } + + if (avctx->max_b_frames == 0 || avctx->max_b_frames == 1 || avctx->max_b_frames == 3 || + avctx->max_b_frames == 7 || avctx->max_b_frames == 15) { // number of b-frames + cdsc->param.bframes = avctx->max_b_frames; + } else { + av_log(avctx, AV_LOG_ERROR, "Incorrect value for maximum number of B frames: (%d) \n" + "Acceptable values for bf option (maximum number of B frames) are 0,1,3,7 or 15\n", avctx->max_b_frames); + goto ERR; + } + + if (avctx->level >= 0) + cdsc->param.level_idc = avctx->level; + + ret = get_pix_fmt(avctx->pix_fmt, &color_format, &xectx->input_depth); + + if (ret != 0) { + av_log(avctx, AV_LOG_ERROR, "Unsupported pixel format.\n"); + goto ERR; + } + cdsc->param.cs = XEVE_CS_SET(color_format, xectx->input_depth, 0); + + if (avctx->rc_buffer_size > 0) { // VBV buf size + cdsc->param.vbv_bufsize = (int)(avctx->rc_buffer_size / 1000); + } + + // rc_type: Rate control type [ 0(CQP) / 1(ABR) / 2(CRF) ] + if (avctx->bit_rate > 0) { + if (avctx->bit_rate / 1000 > INT_MAX || avctx->rc_max_rate / 1000 > INT_MAX) { + av_log(avctx, AV_LOG_ERROR, "Not supported bitrate bit_rate and rc_max_rate > %d000\n", INT_MAX); + goto ERR; + } + cdsc->param.bitrate = (int)(avctx->bit_rate / 1000); + cdsc->param.rc_type = XEVE_RC_ABR; + } + + if (xectx->op_crf >= 0) { + cdsc->param.crf = xectx->op_crf; + cdsc->param.rc_type = XEVE_RC_CRF; + } + + if(avctx->thread_count <= 0) { + cdsc->param.threads = (cpu_count < XEVE_MAX_THREADS) ? cpu_count : XEVE_MAX_THREADS; + } else if(avctx->thread_count > XEVE_MAX_THREADS) + cdsc->param.threads = XEVE_MAX_THREADS; + else + cdsc->param.threads = avctx->thread_count; + + cdsc->param.cs = XEVE_CS_SET(color_format, cdsc->param.codec_bit_depth, 0); + cdsc->max_bs_buf_size = MAX_BS_BUF; + + if(avctx->profile == FF_PROFILE_EVC_BASELINE) + xectx->profile_id = XEVE_PROFILE_BASELINE; + else if(avctx->profile == FF_PROFILE_EVC_MAIN) + xectx->profile_id = XEVE_PROFILE_MAIN; + else { + av_log(avctx, AV_LOG_ERROR, "Unknown encoder profile (%d)\n" + "Acceptable values for profile option are 0 and 1 (0: baseline profile; 1: main profile)\n", avctx->profile); + goto ERR; + } + + if (xectx->op_preset) { // preset + xectx->preset_id = get_preset_id(xectx->op_preset); + } + + if (xectx->op_tune) { // tune + xectx->tune_id = get_tune_id(xectx->op_tune); + } + + ret = xeve_param_ppt(&cdsc->param, xectx->profile_id, xectx->preset_id, xectx->tune_id); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot set profile(%d), preset(%d), tune(%d)\n", xectx->profile_id, xectx->preset_id, xectx->tune_id); + goto ERR; + } + + /* parse : separated list of key=value parameters and set values for created descriptor (XEVE_CDSC) */ + { + AVDictionaryEntry *en = NULL; + + // Start to parse xeve_params + while ((en = av_dict_get(xectx->xeve_params, "", en, AV_DICT_IGNORE_SUFFIX))) { + int parse_ret = parse_xeve_params(avctx, en->key, en->value, cdsc); + + switch (parse_ret) { + case XEVE_PARAM_BAD_NAME: + av_log(avctx, AV_LOG_WARNING, "Unknown option: %s.\n", en->key); + break; + case XEVE_PARAM_BAD_VALUE: + av_log(avctx, AV_LOG_WARNING, "Invalid value for %s: %s.\n", en->key, en->value); + break; + default: + break; + } + } + } + + return 0; + +ERR: + return AVERROR(EINVAL); +} + +/** + * Check encoder configuration + * + * @param[in] avctx context for logger + * @param[in] cdsc contains all encoder parameters that should be initialized before its use + * + * @return 0 on success, negative error code on failure + */ +static int check_conf(AVCodecContext *avctx, XEVE_CDSC *cdsc) +{ + int ret = 0; + int min_block_size = 4; + int pic_m; + + if(cdsc->param.profile == XEVE_PROFILE_BASELINE) { + if (cdsc->param.tool_amvr == 1) { + av_log(avctx, AV_LOG_ERROR, "AMVR cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_mmvd == 1) { + av_log(avctx, AV_LOG_ERROR, "MMVD cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_affine == 1) { + av_log(avctx, AV_LOG_ERROR, "Affine cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_dmvr == 1) { + av_log(avctx, AV_LOG_ERROR, "DMVR cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_admvp == 1) { + av_log(avctx, AV_LOG_ERROR, "ADMVP cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_hmvp == 1) { + av_log(avctx, AV_LOG_ERROR, "HMVP cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_addb == 1) { + av_log(avctx, AV_LOG_ERROR, "ADDB cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_alf == 1) { + av_log(avctx, AV_LOG_ERROR, "ALF cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_htdf == 1) { + av_log(avctx, AV_LOG_ERROR, "HTDF cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.btt == 1) { + av_log(avctx, AV_LOG_ERROR, "BTT cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.suco == 1) { + av_log(avctx, AV_LOG_ERROR, "SUCO cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_eipd == 1) { + av_log(avctx, AV_LOG_ERROR, "EIPD cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_iqt == 1) { + av_log(avctx, AV_LOG_ERROR, "IQT cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_cm_init == 1) { + av_log(avctx, AV_LOG_ERROR, "CM_INIT cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_adcc == 1) { + av_log(avctx, AV_LOG_ERROR, "ADCC cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_ats == 1) { + av_log(avctx, AV_LOG_ERROR, "ATS_INTRA cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.ibc_flag == 1) { + av_log(avctx, AV_LOG_ERROR, "IBC cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_rpl == 1) { + av_log(avctx, AV_LOG_ERROR, "RPL cannot be on in base profile\n"); + ret = -1; + } + if (cdsc->param.tool_pocs == 1) { + av_log(avctx, AV_LOG_ERROR, "POCS cannot be on in base profile\n"); + ret = -1; + } + } else { + if (cdsc->param.tool_admvp == 0 && cdsc->param.tool_affine == 1) { + av_log(avctx, AV_LOG_ERROR, "AFFINE cannot be on when ADMVP is off\n"); + ret = -1; + } + if (cdsc->param.tool_admvp == 0 && cdsc->param.tool_amvr == 1) { + av_log(avctx, AV_LOG_ERROR, "AMVR cannot be on when ADMVP is off\n"); + ret = -1; + } + if (cdsc->param.tool_admvp == 0 && cdsc->param.tool_dmvr == 1) { + av_log(avctx, AV_LOG_ERROR, "DMVR cannot be on when ADMVP is off\n"); + ret = -1; + } + if (cdsc->param.tool_admvp == 0 && cdsc->param.tool_mmvd == 1) { + av_log(avctx, AV_LOG_ERROR, "MMVD cannot be on when ADMVP is off\n"); + ret = -1; + } + if (cdsc->param.tool_eipd == 0 && cdsc->param.ibc_flag == 1) { + av_log(avctx, AV_LOG_ERROR, "IBC cannot be on when EIPD is off\n"); + ret = -1; + } + if (cdsc->param.tool_iqt == 0 && cdsc->param.tool_ats == 1) { + av_log(avctx, AV_LOG_ERROR, "ATS cannot be on when IQT is off\n"); + ret = -1; + } + if (cdsc->param.tool_cm_init == 0 && cdsc->param.tool_adcc == 1) { + av_log(avctx, AV_LOG_ERROR, "ADCC cannot be on when CM_INIT is off\n"); + ret = -1; + } + } + + if (cdsc->param.btt == 1) { + if (cdsc->param.framework_cb_max && cdsc->param.framework_cb_max < 5) { + av_log(avctx, AV_LOG_ERROR, "Maximun Coding Block size cannot be smaller than 5\n"); + ret = -1; + } + if (cdsc->param.framework_cb_max > 7) { + av_log(avctx, AV_LOG_ERROR, "Maximun Coding Block size cannot be greater than 7\n"); + ret = -1; + } + if (cdsc->param.framework_cb_min && cdsc->param.framework_cb_min < 2) { + av_log(avctx, AV_LOG_ERROR, "Minimum Coding Block size cannot be smaller than 2\n"); + ret = -1; + } + if ((cdsc->param.framework_cb_max || cdsc->param.framework_cb_min) && + cdsc->param.framework_cb_min > cdsc->param.framework_cb_max) { + av_log(avctx, AV_LOG_ERROR, "Minimum Coding Block size cannot be greater than Maximum coding Block size\n"); + ret = -1; + } + if (cdsc->param.framework_cu14_max > 6) { + av_log(avctx, AV_LOG_ERROR, "Maximun 1:4 Coding Block size cannot be greater than 6\n"); + ret = -1; + } + if ((cdsc->param.framework_cb_max || cdsc->param.framework_cu14_max) && + cdsc->param.framework_cu14_max > cdsc->param.framework_cb_max) { + av_log(avctx, AV_LOG_ERROR, "Maximun 1:4 Coding Block size cannot be greater than Maximum coding Block size\n"); + ret = -1; + } + if (cdsc->param.framework_tris_max > 6) { + av_log(avctx, AV_LOG_ERROR, "Maximun Tri-split Block size be greater than 6\n"); + ret = -1; + } + if ((cdsc->param.framework_tris_max || cdsc->param.framework_cb_max) && + cdsc->param.framework_tris_max > cdsc->param.framework_cb_max) { + av_log(avctx, AV_LOG_ERROR, "Maximun Tri-split Block size cannot be greater than Maximum coding Block size\n"); + ret = -1; + } + if ((cdsc->param.framework_tris_min || cdsc->param.framework_cb_min) && + cdsc->param.framework_tris_min < cdsc->param.framework_cb_min + 2) { + av_log(avctx, AV_LOG_ERROR, "Maximun Tri-split Block size cannot be smaller than Minimum Coding Block size plus two\n"); + ret = -1; + } + if(cdsc->param.framework_cb_min) min_block_size = 1 << cdsc->param.framework_cb_min; + else min_block_size = 8; + } + + if (cdsc->param.suco == 1) { + if (cdsc->param.framework_suco_max > 6) { + av_log(avctx, AV_LOG_ERROR, "Maximun SUCO size cannot be greater than 6\n"); + ret = -1; + } + if (cdsc->param.framework_cb_max && cdsc->param.framework_suco_max > cdsc->param.framework_cb_max) { + av_log(avctx, AV_LOG_ERROR, "Maximun SUCO size cannot be greater than Maximum coding Block size\n"); + ret = -1; + } + if (cdsc->param.framework_suco_min < 4) { + av_log(avctx, AV_LOG_ERROR, "Minimun SUCO size cannot be smaller than 4\n"); + ret = -1; + } + if (cdsc->param.framework_cb_min && cdsc->param.framework_suco_min < cdsc->param.framework_cb_min) { + av_log(avctx, AV_LOG_ERROR, "Minimun SUCO size cannot be smaller than Minimum coding Block size\n"); + ret = -1; + } + if (cdsc->param.framework_suco_min > cdsc->param.framework_suco_max) { + av_log(avctx, AV_LOG_ERROR, "Minimum SUCO size cannot be greater than Maximum SUCO size\n"); + ret = -1; + } + } + + pic_m = (8 > min_block_size) ? min_block_size : 8; + if ((cdsc->param.w & (pic_m - 1)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Current encoder does not support picture width, not multiple of max(8, minimum CU size)\n"); + ret = -1; + } + if ((cdsc->param.h & (pic_m - 1)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Current encoder does not support picture height, not multiple of max(8, minimum CU size)\n"); + ret = -1; + } + + return ret; +} + +/** + * Set XEVE_CFG_SET_USE_PIC_SIGNATURE for encoder + * + * @param[in] logger context + * @param[in] id XEVE encodec instance identifier + * @param[in] ctx the structure stores all the states associated with the instance of Xeve MPEG-5 EVC encoder + * + * @return 0 on success, negative error code on failure + */ +static int set_extra_config(AVCodecContext* avctx, XEVE id, XeveContext *ctx) +{ + int ret, size, value; + + if(ctx->hash) { + value = 1; + size = 4; + ret = xeve_config(id, XEVE_CFG_SET_USE_PIC_SIGNATURE, &value, &size); + if(XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to set config for picture signature\n"); + return -1; + } + } + + return 0; +} + +/** + * Convert FFmpeg pixel format (AVPixelFormat) into XEVE pre-defined color space + * + * @param[in] px_fmt pixel format (@see https://ffmpeg.org/doxygen/trunk/pixfmt_8h.html#a9a8e335cf3be472042bc9f0cf80cd4c5) + * + * @return XEVE pre-defined color space (@see xeve.h) on success, XEVE_CF_UNKNOWN on failure + */ +static int xeve_color_space(enum AVPixelFormat pix_fmt) +{ + /* color space of input image */ + int cs = XEVE_CF_UNKNOWN; + + switch (pix_fmt) { + case AV_PIX_FMT_YUV420P: + cs = XEVE_CS_YCBCR420; + break; + case AV_PIX_FMT_YUV420P10: +#if AV_HAVE_BIGENDIAN + cs = XEVE_CS_SET(XEVE_CF_YCBCR420, 10, 1); +#else + cs = XEVE_CS_YCBCR420_10LE; +#endif + + break; + case AV_PIX_FMT_YUV420P12: +#if AV_HAVE_BIGENDIAN + cs = XEVE_CS_SET(XEVE_CF_YCBCR420, 12, 1); +#else + cs = XEVE_CS_YCBCR420_12LE; +#endif + + break; + case AV_PIX_FMT_YUV422P: + cs = XEVE_CS_YCBCR422; + break; + case AV_PIX_FMT_YUV422P10: +#if AV_HAVE_BIGENDIAN + cs = XEVE_CS_SET(XEVE_CF_YCBCR422, 10, 1); +#else + cs = XEVE_CS_YCBCR422_10LE; +#endif + + break; + case AV_PIX_FMT_YUV422P12: +#if AV_HAVE_BIGENDIAN + cs = XEVE_CS_SET(XEVE_CF_YCBCR422, 12, 1); +#else + cs = XEVE_CS_SET(XEVE_CF_YCBCR422, 12, 0); +#endif + + break; + case AV_PIX_FMT_GBRP: + case AV_PIX_FMT_GBRP10: + case AV_PIX_FMT_GBRP12: + cs = XEVE_CF_UNKNOWN; + break; + case AV_PIX_FMT_YUV444P: + cs = XEVE_CF_YCBCR444; + break; + case AV_PIX_FMT_YUV444P10: +#if AV_HAVE_BIGENDIAN + cs = XEVE_CS_SET(XEVE_CF_YCBCR444, 10, 1); +#else + cs = XEVE_CS_YCBCR444_10LE; +#endif + + break; + case AV_PIX_FMT_YUV444P12: +#if AV_HAVE_BIGENDIAN + cs = XEVE_CS_SET(XEVE_CF_YCBCR444, 12, 1); +#else + cs = XEVE_CS_SET(XEVE_CF_YCBCR444, 12, 0); +#endif + + break; + case AV_PIX_FMT_GRAY8: + cs = XEVE_CF_YCBCR400; + break; + case AV_PIX_FMT_GRAY10: +#if AV_HAVE_BIGENDIAN + cs = XEVE_CS_SET(XEVE_CF_YCBCR400, 10, 1); +#else + cs = XEVE_CS_YCBCR400_10LE; +#endif + + break; + case AV_PIX_FMT_GRAY12: +#if AV_HAVE_BIGENDIAN + cs = XEVE_CS_SET(XEVE_CF_YCBCR400, 12, 1); +#else + cs = XEVE_CS_YCBCR400_12LE; +#endif + + break; + default: + cs = XEVE_CF_UNKNOWN; + break; + } + + return cs; +} + +/** + * @brief Switch encoder to bumping mode + * + * @param id XEVE encodec instance identifier + * @return 0 on success, negative error code on failure + */ +static int setup_bumping(XEVE id) +{ + int val, size; + val = 1; + size = sizeof(int); + if(XEVE_FAILED(xeve_config(id, XEVE_CFG_SET_FORCE_OUT, (void *)(&val), &size))) + return -1; + + return 0; +} + +/** + * @brief Initialize eXtra-fast Essential Video Encoder codec + * Create an encoder instance and allocate all the needed resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxeve_init(AVCodecContext *avctx) +{ + XeveContext *xectx = avctx->priv_data; + unsigned char *bs_buf = NULL; + int i, val = 0; + int shift_h = 0; + int shift_v = 0; + XEVE_IMGB *imgb = NULL; + + XEVE_CDSC *cdsc = &(xectx->cdsc); + + if(avctx->pix_fmt != AV_PIX_FMT_YUV420P && avctx->pix_fmt != AV_PIX_FMT_YUV420P10) { + av_log(avctx, AV_LOG_ERROR, "Invalid pixel format: %s\n", av_get_pix_fmt_name(avctx->pix_fmt)); + goto ERR; + } + + /* allocate bitstream buffer */ + bs_buf = (unsigned char *)malloc(MAX_BS_BUF); + if(bs_buf == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot allocate bitstream buffer\n"); + goto ERR; + } + + /* read configurations and set values for created descriptor (XEVE_CDSC) */ + val = get_conf(avctx, cdsc); + if (val != XEVE_OK) { + av_log(avctx, AV_LOG_ERROR, "Cannot get configuration\n"); + goto ERR; + } + + if (check_conf(avctx, cdsc) != 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid configuration\n"); + goto ERR; + } + + /* create encoder */ + xectx->id = xeve_create(cdsc, NULL); + if(xectx->id == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot create XEVE encoder\n"); + goto ERR; + } + + if(set_extra_config(avctx, xectx->id, xectx)) { + av_log(avctx, AV_LOG_ERROR, "Cannot set extra configuration\n"); + goto ERR; + } + + xectx->bitb.addr = bs_buf; + xectx->bitb.bsize = MAX_BS_BUF; + + if(av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get chroma shift\n"); + goto ERR; + } + + // YUV format explanation + // shift_h == 1 && shift_v == 1 : YUV420 + // shift_h == 1 && shift_v == 0 : YUV422 + // shift_h == 0 && shift_v == 0 : YUV444 + // + xectx->width_chroma = AV_CEIL_RSHIFT(xectx->width_luma, shift_h); + xectx->height_chroma = AV_CEIL_RSHIFT(xectx->height_luma, shift_v); + + /* set default values for input image buffer */ + imgb = &xectx->imgb; + imgb->cs = xeve_color_space(avctx->pix_fmt); + imgb->np = 3; /* only for yuv420p, yuv420ple */ + + for (i = 0; i < imgb->np; i++) + imgb->x[i] = imgb->y[i] = 0; + + imgb->w[0] = imgb->aw[0] = xectx->width_luma; + imgb->w[1] = imgb->w[2] = imgb->aw[1] = imgb->aw[2] = xectx->width_chroma; + imgb->h[0] = imgb->ah[0] = xectx->height_luma; + imgb->h[1] = imgb->h[2] = imgb->ah[1] = imgb->ah[2] = xectx->height_chroma; + + xectx->encod_frames = 0; + xectx->bytes_total = 0; + xectx->state = STATE_ENCODING; + xectx->packet_count = 0; + xectx->bitrate = 0; + + return 0; + +ERR: + if(bs_buf) + free(bs_buf); + + return -1; +} + +/** + * Encode raw data frame into EVC packet + * + * @param[in] avctx codec context + * @param[out] pkt output AVPacket containing encoded data + * @param[in] frame AVFrame containing the raw data to be encoded + * @param[out] got_packet encoder sets to 0 or 1 to indicate that a + * non-empty packet was returned in pkt + * + * @return 0 on success, negative error code on failure + */ +static int libxeve_encode(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *frame, int *got_packet) +{ + XeveContext *xectx = NULL; + int ret = -1; + int xeve_cs; + if(avctx == NULL || pkt == NULL || got_packet == NULL) { + av_log(avctx, AV_LOG_ERROR, "Invalid arguments\n"); + return -1; + } + xectx = avctx->priv_data; + if(xectx == NULL) { + av_log(avctx, AV_LOG_ERROR, "Invalid XEVE context\n"); + return -1; + } + if(xectx->state == STATE_SKIPPING && frame ) { + xectx->state = STATE_ENCODING; // Entering encoding process + } else if(xectx->state == STATE_ENCODING && frame == NULL) { + if (setup_bumping(xectx->id) == 0) + xectx->state = STATE_BUMPING; // Entering bumping process + else { + av_log(avctx, AV_LOG_ERROR, "Failed to setup bumping\n"); + xectx->state = STATE_SKIPPING; + } + } + + if(xectx->state == STATE_ENCODING) { + const AVPixFmtDescriptor *pixel_fmt_desc = av_pix_fmt_desc_get (frame->format); + if(!pixel_fmt_desc) { + av_log(avctx, AV_LOG_ERROR, "Invalid pixel format descriptor for pixel format: %s\n", av_get_pix_fmt_name(avctx->pix_fmt)); + return -1; + } + + xeve_cs = xeve_color_space(avctx->pix_fmt); + if(xeve_cs != XEVE_CS_YCBCR420 && xeve_cs != XEVE_CS_YCBCR420_10LE) { + av_log(avctx, AV_LOG_ERROR, "Invalid pixel format: %s\n", av_get_pix_fmt_name(avctx->pix_fmt)); + return -1; + } + + { + int i; + XEVE_IMGB *imgb = NULL; + + imgb = &xectx->imgb; + + for (i = 0; i < imgb->np; i++) { + imgb->a[i] = frame->data[i]; + imgb->s[i] = frame->linesize[i]; + } + + if(xectx->id == NULL) { + av_log(avctx, AV_LOG_ERROR, "Invalid XEVE encoder\n"); + return -1; + } + + imgb->ts[0] = frame->pts; + imgb->ts[1] = 0; + imgb->ts[2] = 0; + imgb->ts[3] = 0; + + /* push image to encoder */ + ret = xeve_push(xectx->id, imgb); + if(XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "xeve_push() failed\n"); + return -1; + } + } + } + if(xectx->state == STATE_ENCODING || xectx->state == STATE_BUMPING) { + + /* encoding */ + ret = xeve_encode(xectx->id, &(xectx->bitb), &(xectx->stat)); + if(XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "xeve_encode() failed\n"); + return -1; + } + + xectx->encod_frames++; + + /* store bitstream */ + if (ret == XEVE_OK_OUT_NOT_AVAILABLE) { // Return OK but picture is not available yet + *got_packet = 0; + return 0; + } else if(ret == XEVE_OK) { + int av_pic_type; + + if(xectx->stat.write > 0) { + xectx->bytes_total += xectx->stat.write; + + ret = av_grow_packet(pkt, xectx->stat.write); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Can't allocate memory for AVPacket data\n"); + return ret; + } + + memcpy(pkt->data, xectx->bitb.addr, xectx->stat.write); + + pkt->pts = xectx->bitb.ts[0]; + pkt->dts = xectx->bitb.ts[1]; + + xectx->bitrate += (xectx->stat.write - xectx->stat.sei_size); + + switch(xectx->stat.stype) { + case XEVE_ST_I: + av_pic_type = AV_PICTURE_TYPE_I; + pkt->flags |= AV_PKT_FLAG_KEY; + break; + case XEVE_ST_P: + av_pic_type = AV_PICTURE_TYPE_P; + break; + case XEVE_ST_B: + av_pic_type = AV_PICTURE_TYPE_B; + break; + case XEVE_ST_UNKNOWN: + av_log(avctx, AV_LOG_ERROR, "Unknown slice type\n"); + return -1; + } + + ff_side_data_set_encoder_stats(pkt, xectx->stat.qp * FF_QP2LAMBDA, NULL, 0, av_pic_type); + + xectx->bitrate += (xectx->stat.write - xectx->stat.sei_size); + + *got_packet = 1; + xectx->packet_count++; + } + } else if (ret == XEVE_OK_NO_MORE_FRM) { + // Return OK but no more frames + return 0; + } else { + av_log(avctx, AV_LOG_ERROR, "Invalid return value: %d\n", ret); + return -1; + } + } else { + av_log(avctx, AV_LOG_ERROR, "Udefined encoder state\n", xectx->state); + return -1; + } + + return 0; +} + +/** + * Destroy the encoder and release all the allocated resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxeve_close(AVCodecContext *avctx) +{ + XeveContext *xectx = avctx->priv_data; + + xeve_delete(xectx->id); + + if(xectx->bitb.addr) + free(xectx->bitb.addr); /* release bitstream buffer */ + + return 0; +} + +#define OFFSET(x) offsetof(XeveContext, x) +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM + +// Example of using: ./ffmpeg -xeve-params "m=2:q=17" +// Consider using following options (./ffmpeg --help encoder=libxeve) +// +static const AVOption xeve_options[] = { + { "preset", "Encoding preset for setting encoding speed [fast, medium, slow, placebo]", OFFSET(op_preset), AV_OPT_TYPE_STRING, { .str = "medium" }, 0, 0, VE }, + { "tune", "Tuneing parameter for special purpose operation [psnr, zerolatency]", OFFSET(op_tune), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE}, + { "qp", "quantization parameter qp <0..51> [default: 32]", OFFSET(op_qp), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 51, VE }, + { "crf", "constant rate factor <-1..51> [default: 32]", OFFSET(op_crf), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE }, + { "xeve-params", "override the xeve configuration using a : separated list of key=value parameters", OFFSET(xeve_params), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, + { NULL } +}; + +static const AVClass xeve_class = { + .class_name = "libxeve", + .item_name = av_default_item_name, + .option = xeve_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +/** + * libavcodec generic global options, which can be set on all the encoders and decoders + * @see https://www.ffmpeg.org/ffmpeg-codecs.html#Codec-Options + */ +static const AVCodecDefault xeve_defaults[] = { + { "b", "0" }, // bitrate + { "g", "0" }, // gop_size (key-frame interval 0: only one I-frame at the first time; 1: every frame is coded in I-frame) + { "bf", "15"}, // bframes (0: no B-frames) + { "profile", "0"}, // encoder codec profile (0: baselie; 1: main) + { "threads", "0"}, // number of threads to be used (0: automatically select the number of threads to set) + { NULL }, +}; + +AVCodec ff_libxeve_encoder = { + .name = "libxeve", + .long_name = NULL_IF_CONFIG_SMALL("libxeve MPEG-5 EVC"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_EVC, + .init = libxeve_init, + .encode2 = libxeve_encode, + .close = libxeve_close, + .priv_data_size = sizeof(XeveContext), + .priv_class = &xeve_class, + .defaults = xeve_defaults, + .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS | + AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, + .wrapper_name = "libxeve", +}; diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index 6b40c18d80..295fa33f52 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -73,6 +73,7 @@ extern const AVCodecParser ff_vp9_parser; extern const AVCodecParser ff_webp_parser; extern const AVCodecParser ff_xbm_parser; extern const AVCodecParser ff_xma_parser; +extern const AVCodecParser ff_evc_parser; #include "libavcodec/parser_list.c" From patchwork Wed Apr 20 09:54:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 35357 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp780971pzh; Wed, 20 Apr 2022 02:54:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbyhz2F6BekDZXrzAlJvNSizEPRb/qlZO/7fXaFL3Ap8HXIfm4cBjc9hsleMvVgFo+ow77 X-Received: by 2002:aa7:c4da:0:b0:41d:5866:4dfb with SMTP id p26-20020aa7c4da000000b0041d58664dfbmr22518188edr.117.1650448491122; Wed, 20 Apr 2022 02:54:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650448491; cv=none; d=google.com; s=arc-20160816; b=BrQMQYuO/3LkJMSd5whGdu0LmyUWX8YggYNEL/lOHMp4s4Lo+V+1mg8M9DVvgTUCoU wcjiaAMuBo/k/c+/5e916y/8vYEVKN8AoD+mt3qGWSpHbM+BgZKjGJGa+YIxsLzT/ico GvLm7pmscEtZZFTHxZ6DP0ONtwosxAMfmJ1eoe53d8BVEa9Ssou7xAt7XQPgSJqRDHaT T8z0PvVtjsl9frFluBFBwVxVY1mUaf3gZzOyHRT3WbLJkzJ8NSVWE6dYFERyAKBcEhcM uJobCMuHHcRHa7OPNR1KP0BLRYomYTl6JPINFsGHUWiEc89YDGG+3T1t4+sAYLiw/9sW yDXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:references:cms-type:content-language :thread-index:mime-version:message-id:date:to:from:dkim-signature :dkim-filter:delivered-to; bh=OkPpISVeNPoh/MgkYnX2sLPqzjduNpyuAWkVVtE8e1M=; b=iWTQhETfWalFKu/Ibx1CDxZFdgF1uc98eXOFqovCJlfPCdAKUreYpqNXM/6hGa6l3Y zX2I6WsK/Sf941w3GZZdfuUshUB37pXAKtGiNALESRFpHV2y5e2mfcpg8VjDl4vMR1I2 cbrvyLQ/jaRHfHthRHoaAIKUR7Fcz8asYR3m9ZcDJGJZTdck84/DHQt2ocbqs9spAAZc STL7f2UOoWrunXMHrXacRwFmb7Xr9JKkif1W1GxaIg3n7MTBnnItE0EoeOhIdqcQn+pw nlCR6T2EjRfiEJYW7FERaxthLzLKb0Zy/7NpZHQWUkYikGqCclVTc8Hz0NmDgBf+k+B3 zWnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=jcZRSklq; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t19-20020aa7db13000000b00423d46f5981si1004446eds.293.2022.04.20.02.54.50; Wed, 20 Apr 2022 02:54:51 -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=@samsung.com header.s=mail20170921 header.b=jcZRSklq; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D03E68B3ED; Wed, 20 Apr 2022 12:54:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E45B68B3CA for ; Wed, 20 Apr 2022 12:54:29 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20220420095428euoutp02dd3853eac191986c39a6dcec74ac618d~nkiNVDgXe0426204262euoutp028 for ; Wed, 20 Apr 2022 09:54:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20220420095428euoutp02dd3853eac191986c39a6dcec74ac618d~nkiNVDgXe0426204262euoutp028 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1650448468; bh=qc+p4v3tzOL7v5UhVYeaokBs+inFAX1dktaesBqUHy0=; h=From:To:Subject:Date:References:From; b=jcZRSklq0dM6qgazLMmgeRm50/1ojGdlbo4PYHtp8swDcJ6OOTwrRTCMhkFN+s36k Eq+gTv6EdwGBuwAlquXND5rlsyXk5FEWA2qRWbwE/+DF6MGX6QC2ibwhg6FLTAnTLs DToTeG0SwhSoMFNfxPEjegYP7A3gkZU1W781eWJg= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20220420095428eucas1p2bcb3e6ac82240195c4ec9903e1d62b5f~nkiNLQm502365223652eucas1p2Q for ; Wed, 20 Apr 2022 09:54:28 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id BD.37.10009.458DF526; Wed, 20 Apr 2022 10:54:28 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20220420095428eucas1p10af334bf2cfab73dd91e5c29037b225c~nkiMwXcmj1105311053eucas1p17 for ; Wed, 20 Apr 2022 09:54:28 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20220420095428eusmtrp1474f9567fa3edc02ed3552d111241b51~nkiMsqYFb3040230402eusmtrp1K for ; Wed, 20 Apr 2022 09:54:28 +0000 (GMT) X-AuditID: cbfec7f2-e7fff70000002719-15-625fd8548a88 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 23.CF.09522.458DF526; Wed, 20 Apr 2022 10:54:28 +0100 (BST) Received: from AMDN3260 (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20220420095427eusmtip15efdde708cfd943577dad5473e351773~nkiMbYiMg0922209222eusmtip1w for ; Wed, 20 Apr 2022 09:54:27 +0000 (GMT) From: "Dawid Kozinski" To: Date: Wed, 20 Apr 2022 11:54:27 +0200 Message-ID: <004c01d8549c$9fcd68a0$df6839e0$@samsung.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AdhUmlLnifeQvw+JTFyha8ncXeBN9A== Content-Language: pl X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBIsWRmVeSWpSXmKPExsWy7djP87ohN+KTDF7c0LL49ukMswOjx59F m1kCGKO4bFJSczLLUov07RK4Mh6f38ZW8CSqYs21BpYGxn8uXYwcHBICJhLtN6q7GLk4hARW MEo8P32DGcKZxCTx7skHVghnIpNE+/pV7F2MnGAdX5r3MkIkljNKLGqeCtXSxiTxYWEvE0gV m4C+xMxFn9hAbBEBWYnV/6awgewTFgiV2LSNHyTMIqAqsXPLZUYQm1fAUmLGk/nMELagxMmZ T1hAbGYBI4klq+czQdjyEtvfzmGGOEJB4ufTZawQ4/UkVl08AVUvInHjUQsjRM1HdonbN2sh bBeJmz3dUA8IS7w6vgXKlpE4PbmHBRIUxRKH+h0gzBqJQz/SISqsJd42Hoea6Cix6/RtJogS PokbbwUhlvJJTNo2nRkizCvR0SYEYapI9HWKQTRKSTxdBnO6h8Tmy6vZJjAqzkLy7Swk385C 8u0sJF8tYGRZxSieWlqcm55abJiXWq5XnJhbXJqXrpecn7uJEZgYTv87/mkH49xXH/UOMTJx MB5ilOBgVhLhDZ0ZnyTEm5JYWZValB9fVJqTWnyIUZqDRUmcNzlzQ6KQQHpiSWp2ampBahFM lomDU6qBqZZLQNxGJvukWfXS3dPzTgk1tPHHTzXf6x3KvpDNoemD6orM1KXfeZObD8QwnGT+ X3dR++E6prLVNxS1zwgvMpNRllgW/SpgwXrTU/raMc9zNrkYLHV4/t06tdRjjskD8UnBe47t +itse2GThFJJ/q6qqSt3ny+dIn760pfktKc3LLeo+My4+XfupnLfIybtSwpvpKaxvj0RGFGx gzV7+9lJm4IOrLW/WlNscOjH9GOXBK075J97Wb/zEuVyqP4pfX0TU0f/vOp3SV15C2Imq0wR OHjbLOSb+mfu0CMhKw1s79vPLt/fnGsY8MDL7st+iwxHmdv2S2vtDuzJ+N54s6U7tujP9aQH JotKFQOjlViKMxINtZiLihMBRy7nMHsDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOLMWRmVeSWpSXmKPExsVy+t/xu7ohN+KTDI68ZrP49ukMswOjx59F m1kCGKP0bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0 Mh6f38ZW8CSqYs21BpYGxn8uXYycHBICJhJfmvcydjFycQgJLGWUmHhoGytEQkpi6dJFjBC2 sMSfa11sEEUtTBJvr01jBkmwCehLzFz0iQ3EFhGQlVj9bwqYLSwQLPFq2z4WEJtFQFVi55bL YIN4BSwlZjyZzwxhC0qcnPkErIYZ6IrGw91QtrzE9rdzmCEWK0j8fLqMFWK+nsSqiyegakQk bjxqYZzAKDALyahZSEbNQjJqFpKWBYwsqxhFUkuLc9Nziw31ihNzi0vz0vWS83M3MQJDfNux n5t3MM579VHvECMTB+MhRgkOZiUR3tCZ8UlCvCmJlVWpRfnxRaU5qcWHGE2BfpvILCWanA+M srySeEMzA1NDEzNLA1NLM2MlcV7Pgo5EIYH0xJLU7NTUgtQimD4mDk6pBqYDWvqB37ZF+v5z 39Z+a+od9Sl/nynuTUpzCrjYwHDqS5bo967kaZpLnW8+a19hHa136N/MLdek4u8dsk7dfKHl +x6rF+cFulg5Jzled3v5c9aXjzYZXbl/fytcn5Z9sfWKja3Iykl/2hlVmr1nTQztW+mdVar9 s7utcAdDtF9CVKW2Zp2SXPke25qPLY8eLK0U8MyrbFwV63Ds6vakjeE6ZRJ3pmY6hIknzwjK Fuk24pnYGNCzv074T1lWWpnygl9ff7Kf9X1ldND5eqvNnR03xALsZ2treykcWNihYrvMMUjJ siRVMH/Dyurs95x9nI9Xz3RZdclbxYGtX3hdy4fTsjw1WXKmzKcn/rKaqcRSnJFoqMVcVJwI AGq+O2z6AgAA X-CMS-MailID: 20220420095428eucas1p10af334bf2cfab73dd91e5c29037b225c X-Msg-Generator: CA X-RootMTR: 20220420095428eucas1p10af334bf2cfab73dd91e5c29037b225c X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220420095428eucas1p10af334bf2cfab73dd91e5c29037b225c References: Subject: [FFmpeg-devel] [PATCH 3/3] Provided support for MPEG-5 EVC (Essential Video Coding) codec X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: n5kPHJ6stJDP - Added muxer for EVC format (MP4, raw) - Added demuxer for EVC format (MP4) - Added evc extension to the list of extensions for ff_mov_demuxer Signed-off-by: Dawid Kozinski --- doc/muxers.texi | 6 ++ libavformat/Makefile | 2 + libavformat/allformats.c | 2 + libavformat/evcdec.c | 127 +++++++++++++++++++++++++++++++++++++++ libavformat/isom_tags.c | 2 + libavformat/mov.c | 2 +- libavformat/movenc.c | 28 +++++++++ libavformat/rawenc.c | 13 ++++ 8 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 libavformat/evcdec.c diff --git a/doc/muxers.texi b/doc/muxers.texi index 1ea98a69a3..198cb90fe9 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -2097,6 +2097,12 @@ DTS Coherent Acoustics (DCA) audio. Dolby Digital Plus, also known as Enhanced AC-3, audio. +@subsection evc + +MPEG-5 Essential Video Coding (EVC) / EVC / MPEG-5 Part 1 EVC video. + +Extensions: evc + @subsection g722 ITU-T G.722 audio. diff --git a/libavformat/Makefile b/libavformat/Makefile index 84e73e3c63..db461e79b7 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -241,6 +241,8 @@ OBJS-$(CONFIG_HCOM_DEMUXER) += hcom.o pcm.o OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o OBJS-$(CONFIG_HEVC_MUXER) += rawenc.o +OBJS-$(CONFIG_EVC_DEMUXER) += evcdec.o rawdec.o +OBJS-$(CONFIG_EVC_MUXER) += rawenc.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o hls_sample_encryption.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o hlsplaylist.o avc.o OBJS-$(CONFIG_HNM_DEMUXER) += hnm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index d066a7745b..1148024e71 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -145,6 +145,8 @@ extern const AVInputFormat ff_ea_cdata_demuxer; extern const AVInputFormat ff_eac3_demuxer; extern const AVOutputFormat ff_eac3_muxer; extern const AVInputFormat ff_epaf_demuxer; +extern const AVInputFormat ff_evc_demuxer; +extern const AVOutputFormat ff_evc_muxer; extern const AVOutputFormat ff_f4v_muxer; extern const AVInputFormat ff_ffmetadata_demuxer; extern const AVOutputFormat ff_ffmetadata_muxer; diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c new file mode 100644 index 0000000000..21f3f0f0e4 --- /dev/null +++ b/libavformat/evcdec.c @@ -0,0 +1,127 @@ +/* + * RAW EVC video demuxer + * + * Copyright (c) 2021 Dawid Kozinski + * + * 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 "libavcodec/get_bits.h" +#include "libavcodec/golomb.h" +#include "libavcodec/internal.h" + +#include "rawdec.h" +#include "avformat.h" + +#define EVC_NAL_HEADER_SIZE 2 /* byte */ + +typedef struct EVCParserContext { + int got_sps; + int got_pps; + int got_idr; + int got_nonidr; +} EVCParserContext; + +static int get_nalu_type(const uint8_t *bs, int bs_size) +{ + int nal_unit_type_plus1 = 0; + XEVD_INFO info; + int ret; + + if(bs_size >= EVC_NAL_HEADER_SIZE) { + ret = xevd_info((void*)bs, EVC_NAL_HEADER_SIZE, 1, &info); + if (XEVD_FAILED(ret)) { + av_log(NULL, AV_LOG_ERROR, "Cannot get bitstream information\n"); + return -1; + } + nal_unit_type_plus1 = info.nalu_type; + } + + return nal_unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bs, int bs_size) +{ + uint32_t len = 0; + XEVD_INFO info; + int ret; + + if(bs_size >= XEVD_NAL_UNIT_LENGTH_BYTE) { + ret = xevd_info((void *)bs, XEVD_NAL_UNIT_LENGTH_BYTE, 1, &info); + if (XEVD_FAILED(ret)) { + av_log(NULL, AV_LOG_ERROR, "Cannot get bitstream information\n"); + return 0; + } + len = info.nalu_len; + if(len == 0) { + av_log(NULL, AV_LOG_ERROR, "Invalid bitstream size! [%d]\n", bs_size); + return 0; + } + } + + return len; +} + +static int parse_nal_units(const AVProbeData *p, EVCParserContext *ev) +{ + int nalu_type; + size_t nalu_size; + unsigned char *bits = (unsigned char *)p->buf; + int bytes_to_read = p->buf_size; + + while(bytes_to_read > XEVD_NAL_UNIT_LENGTH_BYTE) { + + nalu_size = read_nal_unit_length(bits, XEVD_NAL_UNIT_LENGTH_BYTE); + if(nalu_size == 0) break; + + bits += XEVD_NAL_UNIT_LENGTH_BYTE; + bytes_to_read -= XEVD_NAL_UNIT_LENGTH_BYTE; + + if(bytes_to_read < nalu_size) break; + + nalu_type = get_nalu_type(bits, bytes_to_read); + + bits += nalu_size; + bytes_to_read -= nalu_size; + + if (nalu_type == XEVD_NUT_SPS) + ev->got_sps++; + else if (nalu_type == XEVD_NUT_PPS) + ev->got_pps++; + else if (nalu_type == XEVD_NUT_IDR ) + ev->got_idr++; + else if (nalu_type == XEVD_NUT_NONIDR) + ev->got_nonidr++; + } + + return 0; +} + +static int evc_probe(const AVProbeData *p) +{ + EVCParserContext ev = {}; + int ret = parse_nal_units(p, &ev); + + if (ret == 0 && ev.got_sps && ev.got_pps && (ev.got_idr || ev.got_nonidr > 3)) + return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg + + return 0; +} + +FF_DEF_RAWVIDEO_DEMUXER(evc, "raw EVC video", evc_probe, "evc", AV_CODEC_ID_EVC) diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index 62e60470a8..0245cfb999 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -145,6 +145,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_H264, MKTAG('d', 'v', 'a', '1') }, /* AVC-based Dolby Vision derived from avc1 */ { AV_CODEC_ID_H264, MKTAG('d', 'v', 'a', 'v') }, /* AVC-based Dolby Vision derived from avc3 */ + { AV_CODEC_ID_EVC, MKTAG('e', 'v', 'c', '1') }, /* EVC/MPEG-5 */ + { AV_CODEC_ID_VP8, MKTAG('v', 'p', '0', '8') }, /* VP8 */ { AV_CODEC_ID_VP9, MKTAG('v', 'p', '0', '9') }, /* VP9 */ { AV_CODEC_ID_AV1, MKTAG('a', 'v', '0', '1') }, /* AV1 */ diff --git a/libavformat/mov.c b/libavformat/mov.c index 6fb09df7e1..e83872fbe2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8568,7 +8568,7 @@ const AVInputFormat ff_mov_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), .priv_class = &mov_class, .priv_data_size = sizeof(MOVContext), - .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4b,ism,ismv,isma,f4v", + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4b,ism,ismv,isma,f4v,evc", .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = mov_probe, .read_header = mov_read_header, diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 4c868919ae..110b7e1864 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1342,6 +1342,17 @@ static int mov_write_hvcc_tag(AVIOContext *pb, MOVTrack *track) return update_size(pb, pos); } +static int mov_write_evcc_tag(AVIOContext *pb, MOVTrack *track) +{ + int64_t pos = avio_tell(pb); + + avio_wb32(pb, 0); + ffio_wfourcc(pb, "evcC"); + ff_isom_write_avcc(pb, track->vos_data, track->vos_len); + + return update_size(pb, pos); +} + /* also used by all avid codecs (dv, imx, meridien) and their variants */ static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track) { @@ -1591,6 +1602,16 @@ static int mov_get_h264_codec_tag(AVFormatContext *s, MOVTrack *track) return tag; } +static int mov_get_evc_codec_tag(AVFormatContext *s, MOVTrack *track) +{ + int tag = track->par->codec_tag; + + if (!tag) + tag = MKTAG('e', 'v', 'c', 'i'); + + return tag; +} + static const struct { enum AVPixelFormat pix_fmt; uint32_t tag; @@ -1672,6 +1693,8 @@ static unsigned int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) tag = mov_get_mpeg2_xdcam_codec_tag(s, track); else if (track->par->codec_id == AV_CODEC_ID_H264) tag = mov_get_h264_codec_tag(s, track); + else if (track->par->codec_id == AV_CODEC_ID_EVC) + tag = mov_get_evc_codec_tag(s, track); else if (track->par->codec_id == AV_CODEC_ID_DNXHD) tag = mov_get_dnxhd_codec_tag(s, track); else if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) { @@ -2208,6 +2231,9 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex mov_write_avcc_tag(pb, track); if (track->mode == MODE_IPOD) mov_write_uuid_tag_ipod(pb); + } + else if (track->par->codec_id ==AV_CODEC_ID_EVC) { + mov_write_evcc_tag(pb, track); } else if (track->par->codec_id == AV_CODEC_ID_VP9) { mov_write_vpcc_tag(mov->fc, pb, track); } else if (track->par->codec_id == AV_CODEC_ID_AV1) { @@ -5737,6 +5763,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) if ((par->codec_id == AV_CODEC_ID_DNXHD || par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_HEVC || + par->codec_id == AV_CODEC_ID_EVC || par->codec_id == AV_CODEC_ID_TRUEHD || par->codec_id == AV_CODEC_ID_AC3) && !trk->vos_len && !TAG_IS_AVCI(trk->tag)) { @@ -7311,6 +7338,7 @@ static const AVCodecTag codec_mp4_tags[] = { { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '3') }, { AV_CODEC_ID_HEVC, MKTAG('h', 'e', 'v', '1') }, { AV_CODEC_ID_HEVC, MKTAG('h', 'v', 'c', '1') }, + { AV_CODEC_ID_EVC, MKTAG('e', 'v', 'c', '1') }, { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MJPEG, MKTAG('m', 'p', '4', 'v') }, diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 4bbae7717b..de7fecce6c 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -386,6 +386,19 @@ const AVOutputFormat ff_hevc_muxer = { }; #endif +#if CONFIG_EVC_MUXER +AVOutputFormat ff_evc_muxer = { + .name = "evc", + .long_name = NULL_IF_CONFIG_SMALL("raw EVC video"), + .extensions = "evc", + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_EVC, + .write_header = force_one_stream, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_M4V_MUXER const AVOutputFormat ff_m4v_muxer = { .name = "m4v",