From patchwork Thu Nov 3 12:21:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Siedel X-Patchwork-Id: 34853 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp499771pzb; Thu, 3 Nov 2022 05:22:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6wHxLFAP/8LyQO3WotS3o3erK7lS5yL6+QoM/OXNtOHazw6rMy3WC5V+fs4ZaQTMNHJx9J X-Received: by 2002:a17:906:edc2:b0:7ad:9f04:1c15 with SMTP id sb2-20020a170906edc200b007ad9f041c15mr28001525ejb.559.1667478163622; Thu, 03 Nov 2022 05:22:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667478163; cv=none; d=google.com; s=arc-20160816; b=l6DkkYvjY1EE3cGXAj4Y+JKWs7Pf0Vd0HiBX47kiiHGjgEdE+g1N04MrMicxBpSQBe dhGVYLks50cbLwe3mZuSuT+S4yhqolPpVNSMi1kzOTsWxnr4UeSh/V9yE+02up7v83IJ tffQmR50bFoqWy4FUiuuGMpmAEyuRJ1FHD5tXmmJ5vfJBO0Ndacgn0OIdbZcwmDckW9b 4mkXbRomxhgFu+teo6BsLiUEFdbCPd2aa6PLbD8g7/o2/I7vSF0ezprTLkXtc90LLG2i XFtAnHtEY3Vfv7lQENL+tYGTifEaSO95oCs3bL9RUXX86KWg98H4mZJtM01fF3SR71gs goMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=AuhNDIJR3zWTikiwb8SNMLgvDl1B2xCFe32sWl/U4v8=; b=sdEO/thI6m7HyCazKgtRMpqJuvKaZ9+4x9GLZpELihSpJI8+AM9Z2wULQG8JlG0/tM 3Er58UdtzzsWya7O9KDpmqkuUOHTK8OS4SDEqBsT/WOmsEox2rTGLuYt+NHQy2gYt7SL bi4yqBMY1j4bPKEd3q8n0ZCk7YcH8/shQBI0qm6tbR/vE/bFviW8Xj1Eg/fKLtzzri3B I+U2VHhe3VDQhw+0lNpmFfpCBYqJkpu9LMCWtWeEcPE10i9K2v1cnWFaRwnHzzJNCScQ RXTSWaxovNI22YjOjrW5+29TQrM0gmUYpAvbR8QNqYoPN4P+KE3OT3HvchEMjmP0ZWhE ZW6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@spin-digital-com.20210112.gappssmtp.com header.s=20210112 header.b=7RKnVkwZ; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o20-20020aa7c7d4000000b0045fb7a04ce0si902788eds.148.2022.11.03.05.22.42; Thu, 03 Nov 2022 05:22:43 -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=@spin-digital-com.20210112.gappssmtp.com header.s=20210112 header.b=7RKnVkwZ; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 17A5668BF3C; Thu, 3 Nov 2022 14:22:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E2F468BF1B for ; Thu, 3 Nov 2022 14:22:32 +0200 (EET) Received: by mail-ej1-f46.google.com with SMTP id n12so4648970eja.11 for ; Thu, 03 Nov 2022 05:22:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spin-digital-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TT064OPQtLEst3pzn8rtvJsKfKRlSt9bF9q5KAO0wmk=; b=7RKnVkwZsL7uL6myqharX3UAq9uFMivD+RbK6J/RQz3UtLQ9s9agZhWD7ZyIGlNpFr S+077CAhmiIhqh81K59HuMeDhL+9sochz69wO4c3/LLgFlBxxe0E7W+OLgncXBHcK4Z2 bD0R34aaWXyytZ7bZWTV4U2wNeezFszkJYjnoKsXth8ujIgUtDw3ltzmbJSyAc9fJGpp OV2grI+pAhTVc9bKaV8WfCOnbYb3QOMgBrWdbtIf3Hz5bh4QjcHUfTnMRKTtd9/NKaOj 0W4qFVIdstVcZNER0dPsu8zZK0MelGwbi5WoLojRnV9YEYkUDndxKPaDTxcRARoCt3OX 4ynQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TT064OPQtLEst3pzn8rtvJsKfKRlSt9bF9q5KAO0wmk=; b=fNytb4uUtUENJDrwhNmdhiaI/NIQhLzl6SH7cFxqahdmbNnFbL+C+Xbg4RaKF1HZO5 wPStrzCbGtj1BxbP3pWyhu0eRIWt3ZcZstqbQX/SZ6mVcNrc+3kCz4ODaeuVAlqe4G4i K+IfSH7GBa5vSYSSN6E9h7jIYFdq7U9BCzpPrgtMj5IT4hflz8sCt1H9Y5HYi31Gorge in+fGpAecN9UuIq2WmYQuMFQ6AqTDU0ZOZjfjt/X54oZVx7/OySnJFXg7PXCJ4U+UekT mtj1glbV/OLPLeRtPUpRI3jWLU+WyvrufsW8PXmu0vB6nICD3HfJ/gbjgcyTTtJf8fgF q/Ew== X-Gm-Message-State: ACrzQf3k5rlGbm9Hn5zVoNbyv2pfxRC8KIdXKsdwTSBgk7ZiNGM6U1Cr Oe4NAN/27dcrwN9wg8seq7Bp8o9guZr5Ag== X-Received: by 2002:a17:907:7f07:b0:779:7f94:d259 with SMTP id qf7-20020a1709077f0700b007797f94d259mr29413792ejc.525.1667478150976; Thu, 03 Nov 2022 05:22:30 -0700 (PDT) Received: from thomas-win.localdomain ([213.138.44.237]) by smtp.gmail.com with ESMTPSA id c7-20020a0564021f8700b0045c010d0584sm457117edc.47.2022.11.03.05.22.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 05:22:30 -0700 (PDT) From: Thomas Siedel To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Nov 2022 13:21:48 +0100 Message-Id: <20221103122158.27169-1-thomas.ff@spin-digital.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 00/10] Add support for H266/VVC 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 Cc: Thomas Siedel Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /XOnI20HB7dc This patch set adds H266/VVC support. This includes parsing, muxing, demuxing, decoding and encoding. Decoding is done using the external library VVdeC (https://github.com/fraunhoferhhi/vvdec.git) and can be enabled with --enable-libvvdec. Encoding is done using the external library VVenC (https://github.com/fraunhoferhhi/vvenc.git) and can be enabled with --enable-libvvenc Changes since v2: PATCH 03/10 libavcodec/vvc_parser.c - fixing behavior of vvc_parser_parse ( always call parse_nal_units for valid buffer ) - using ff_cbs_read_extradata_from_codec instead of ff_cbs_read and move code to correct position - cleanup: use AVCodecParserContext *s instead of AVCodecParserContext *ctx, to align to other parser implementations PATCH 04/10 libavcodec/vvc_mp4toannexb_bsf.c - fix parsing of OPI and DCI NUTs in vvcC box PATCH 07/10 libavcodec/vvc_parse_extradata.c - fix parsing of OPI and DCI NUTs in ff_vvc_decode_extradata PATCH 08/10 libavcodec/libvvenc.c - use AVColor enum for hdr initialization - fix hlg mode init, depending on color primaries - set correct sdr bt709 mode General: - adapt commit messages ( add line breaks for long bodies in commit message ) Thomas Siedel (10): avcodec: add enum types for H266/VVC avcodec: add cbs for H266/VVC avcodec: add bitstream parser for H266/VVC avcodec: add MP4 to annexb support for H266/VVC avformat: add demuxer and probe support for H266/VVC avformat: add muxer support for H266/VVC avcodec: add external decoder libvvdec for H266/VVC avcodec: add external encoder libvvenc for H266/VVC avformat: add ts stream types for H266/VVC avcodec: increase minor version for H266/VVC configure | 16 +- libavcodec/Makefile | 6 + libavcodec/allcodecs.c | 2 + libavcodec/bitstream_filters.c | 2 + libavcodec/cbs.c | 6 + libavcodec/cbs_h2645.c | 373 ++- libavcodec/cbs_h266.h | 791 +++++++ libavcodec/cbs_h266_syntax_template.c | 3010 +++++++++++++++++++++++++ libavcodec/cbs_internal.h | 1 + libavcodec/cbs_sei.c | 29 + libavcodec/h2645_parse.c | 71 +- libavcodec/h266_metadata_bsf.c | 145 ++ libavcodec/libvvdec.c | 511 +++++ libavcodec/libvvenc.c | 449 ++++ libavcodec/parsers.c | 1 + libavcodec/version.h | 2 +- libavcodec/vvc.h | 142 ++ libavcodec/vvc_mp4toannexb_bsf.c | 319 +++ libavcodec/vvc_paramset.c | 972 ++++++++ libavcodec/vvc_paramset.h | 429 ++++ libavcodec/vvc_parse_extradata.c | 242 ++ libavcodec/vvc_parse_extradata.h | 36 + libavcodec/vvc_parser.c | 591 +++++ libavformat/Makefile | 8 +- libavformat/allformats.c | 2 + libavformat/demux.c | 7 +- libavformat/isom.c | 1 + libavformat/isom_tags.c | 3 + libavformat/mov.c | 6 + libavformat/movenc.c | 41 +- libavformat/mpeg.c | 3 + libavformat/mpeg.h | 1 + libavformat/mpegts.c | 2 + libavformat/mpegts.h | 1 + libavformat/mpegtsenc.c | 65 + libavformat/rawenc.c | 23 + libavformat/vvc.c | 919 ++++++++ libavformat/vvc.h | 99 + libavformat/vvcdec.c | 61 + 39 files changed, 9377 insertions(+), 11 deletions(-) create mode 100644 libavcodec/cbs_h266.h create mode 100644 libavcodec/cbs_h266_syntax_template.c create mode 100644 libavcodec/h266_metadata_bsf.c create mode 100644 libavcodec/libvvdec.c create mode 100644 libavcodec/libvvenc.c create mode 100644 libavcodec/vvc.h create mode 100644 libavcodec/vvc_mp4toannexb_bsf.c create mode 100644 libavcodec/vvc_paramset.c create mode 100644 libavcodec/vvc_paramset.h create mode 100644 libavcodec/vvc_parse_extradata.c create mode 100644 libavcodec/vvc_parse_extradata.h create mode 100644 libavcodec/vvc_parser.c create mode 100644 libavformat/vvc.c create mode 100644 libavformat/vvc.h create mode 100644 libavformat/vvcdec.c