From patchwork Mon Oct 24 07:39:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 38953 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2080338pzb; Mon, 24 Oct 2022 00:40:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7zbPqWgaDpWTBRp6lr9ceaXiiCIzBuELzPbbDVnhk9HzBkQ9+DSU/GUUWnPh4A6W+7p8YS X-Received: by 2002:a17:906:ef8c:b0:7a4:a4b4:9fcf with SMTP id ze12-20020a170906ef8c00b007a4a4b49fcfmr6007872ejb.727.1666597205923; Mon, 24 Oct 2022 00:40:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666597205; cv=none; d=google.com; s=arc-20160816; b=hMIFr8W6QZfUrHM+9GwAESkmQtofcdYLviwil4QhbfC3sPGQHQsbGYrnh6+xoWr2/J Bw9ZndlhlXO/1aW8K2L1bzdMsdJaJIfh1kaWhk9/jJvEWllRcd1qU4FxzQFcu0bC1huv 42whn+vba/3dyy2sBRt1zNEr+bsHlAi5oguR4cIGcdEy+DGhWodnHidSP6xq7mUKwWZV HbFaD+gDfzYw5ZyWDdrYhZF+0Br0Db26DuUNFBOeg9TrlGODo7PynNsDTP2irE03URaq FeKvsafiL6vCRF3Sr0lbK41tpMext+qbUO6QCz14ChwoP3fGqYxYVEghye/xxEbTdW1a o8hw== 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:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=I8qOndhlUb/X/aGreetL7TQlY/khVpkdwfGKbetJn2Y=; b=qlSOtNs5y4xPIlqFPaawpaw572yxALUScw465hu5mA+zcoIIaN06oFnGyQd9fDK70X avzbj6DUiSRPsyoBfUnGAlVTciAC6IiEw8JD4YsDtru8lEaANr1beeM9bvpRXJ5PXUq3 WHj6KdB3JcG0nCUHhg2FuOWPaTfMCltVwEpgAv+egB4DPkmAJFNA1Btus/FOGJTESyY+ TnXxn/Yb3hXWS/cw2uYVi+FNcKFeYie4t49/VOXK3R/l+FZ7DY6Zmz2JXvP/zLW1Rqfz 7gYs6dJ4b9UBH9k1257zN6IHH/wOfmIpuXJl03BPKOLvAmYe21/zhfkttyfvFf8lRqla oxtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=rHGWSu5l; 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 he19-20020a1709073d9300b007a858ead526si1948668ejc.730.2022.10.24.00.40.04; Mon, 24 Oct 2022 00:40:05 -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=rHGWSu5l; 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 A6EFD68BDA7; Mon, 24 Oct 2022 10:40:02 +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 76CC868BD63 for ; Mon, 24 Oct 2022 10:40:01 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20221024074000euoutp0288cdcebdfbcffe01f576e74721c277f2~g8VMAgxzE1454414544euoutp02g for ; Mon, 24 Oct 2022 07:40:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20221024074000euoutp0288cdcebdfbcffe01f576e74721c277f2~g8VMAgxzE1454414544euoutp02g DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1666597200; bh=NnlhAE8EQ9TqQjdG3v3TjYkbxpX0gkMebq4PXivsg1Y=; h=From:To:Cc:Subject:Date:References:From; b=rHGWSu5lacaN3YswTkmBrTEDaq/8/5yFTtwmorkOAgs1a2eGQ0m3xOxeExZ6PXtBL geq7Or76FJjhqHbrlhAnggICXna3fLlTGagRYvHe4JPIgxv/4O56n6DsFf7KPtXS+m xv+nKx5m4dOfY4WAJRdp+LUFhFDQ+xttCa9QvcZQ= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20221024074000eucas1p2fc25e98e422f862fe6fb2e143d7f6367~g8VLwMiL_3148431484eucas1p2_; Mon, 24 Oct 2022 07:40:00 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id FB.01.29727.05146536; Mon, 24 Oct 2022 08:40:00 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20221024074000eucas1p29bb1697efdf44ff3b2292098683e0ddf~g8VLdI5a_0119401194eucas1p2v; Mon, 24 Oct 2022 07:40:00 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20221024074000eusmtrp1d6ccefad2e807e1df4f34a0fde566848~g8VLcWo7S1676416764eusmtrp1p; Mon, 24 Oct 2022 07:40:00 +0000 (GMT) X-AuditID: cbfec7f2-21dff7000001741f-be-63564150f154 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 53.15.10862.05146536; Mon, 24 Oct 2022 08:40:00 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20221024074000eusmtip1b9ff2f67e2a8f39d1836b0448d5ea89d~g8VLKPoDv0164801648eusmtip1g; Mon, 24 Oct 2022 07:39:59 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 09:39:50 +0200 Message-Id: <20221024073950.1309-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDIsWRmVeSWpSXmKPExsWy7djPc7oBjmHJBhP7lS2+XPvCbLHy228W i2+fzjA7MHv8WbSZxaNvyyrGAKYoLpuU1JzMstQifbsErozd3VvZCuZoVexf/ZmtgfGjfBcj J4eEgInExmXNjF2MXBxCAisYJfYvmMoE4XxhlHjzdh6U85lRYsq1bcwwLddW72WGSCxnlPh6 axobhNPOJPHp7XUmkCo2AV2Jlx8egdkiAqYSJ5v3soHYzALaEuvufgezhQUSJC5f/cUOYrMI qEo8ersXzOYVsJJYt+IaG8Q2TYkJW+YwQcQFJU7OfMICEeeWWDfrEivETHmJ5q2zwS6SEPjL LvHvyCWoZheJaV/boBqEJV4d38IOYctInJ7cAxTnALKLJQ71O0CYNRKHfqRDVFhLvG08zggS ZgY6Yf0ufYiwo8TNr6uYIar5JG68FYQ4gE9i0rbpUGFeiY42IQhTRaKvUwyiUUri6bI50AD0 kFh18wHTBEbFWUi+moXkk1kIaxcwMq9iFE8tLc5NTy02zEst1ytOzC0uzUvXS87P3cQITBCn /x3/tINx7quPeocYmTgYDzFKcDArifCyPAlOFuJNSaysSi3Kjy8qzUktPsQozcGiJM7LNkMr WUggPbEkNTs1tSC1CCbLxMEp1cCk8nwx+27bO+93njPR5TmsejasNr5H8Jtx5FZr59+rr7RV TrcK4TjP1xN3xny+a35Oi2usYXCduCLTI7lJO07Hq/Bd1pO/3dg5SefFZxaHnUvYHYp25ZwV KL/4iPPCBYkPWQ3tPybGmDQZPV0397LD4/j5R3W6Lu+z81xpxneJe9kDoQ5dGTk130myJgGv r1f4KLFO5TuUarZYo8u5oVz+b7STwcp9Lvsv80gHvi4TqWv/qid7IMxFL5jBgiH1Jbu4stda OwbOrWun5KWeU9X8la8n8sJYO7P7xpkob1HWg+1q6z+2lu9PmZ6b8ObeBWf5iv7mOwaOLOYh lwTXZz9Yas81Ie9w76JZbbZCSizFGYmGWsxFxYkAnQzGGX8DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xu7oBjmHJBrf2CFh8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehm7u7eyFczRqti/+jNbA+NH+S5GTg4JAROJa6v3MncxcnEICSxl lDg3axoTREJKYunSRYwQtrDEn2tdbCC2kEArk8TB2cwgNpuArsTLD4/A6kUEzCUurrsFVs8s oC2x7u53sHphgTiJ7e/aWUBsFgFViUdv97KD2LwCVhLrVlxjg5ivKTFhyxwmiLigxMmZT1gg 4twS62ZdYoWYKS/RvHU28wRG/llIymYhSS1gZFrFKJJaWpybnltspFecmFtcmpeul5yfu4kR GLbbjv3csoNx5auPeocYmTgYDzFKcDArifCyPAlOFuJNSaysSi3Kjy8qzUktPsRoCnTrRGYp 0eR8YOTklcQbmhmYGpqYWRqYWpoZK4nzehZ0JAoJpCeWpGanphakFsH0MXFwSjUwCUVfO/Sw fM3kVI/L17q9rMP3BCtZ+Ggscb+kcziD8eoOToV0rVVPPm60XLBF1W7/lcbnh1vSm9bFHeV5 5JW3+W7iVsU0sZgnZ0OPvC+5p+lzk2fjnqv/P1x9Mv3EyUafj68u/9/sJ7ygYNKdSUYm+h0u AQEz4h3c65YruPHZrujltvf83dP2sPbjlAlzP/Iyiqsmuc2Ie3y/9AvL1cO87JaG9WYz5r7a dSl08Y+KPLn7bZ0vUw97J9VOk1OZ3KBa82Lag5rZB5I/RZrHPn/aM+/dLXbXCUszFTXmyLzN 7D1s07rJztzPbtK53afeSXHV/E+7eW9R567TZ/SOZ2av+n+o580uq06zi0ohtw6salBiKc5I NNRiLipOBACCJqyb5AIAAA== X-CMS-MailID: 20221024074000eucas1p29bb1697efdf44ff3b2292098683e0ddf X-Msg-Generator: CA X-RootMTR: 20221024074000eucas1p29bb1697efdf44ff3b2292098683e0ddf X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221024074000eucas1p29bb1697efdf44ff3b2292098683e0ddf References: Subject: [FFmpeg-devel] [PATCH v14 4/9] avformat/evc_demuxer: Added demuxer to handle reading EVC video files 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: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gepSKKOCZA/6 - Provided AVInputFormat structure describing EVC input format (ff_evc_demuxer) Signed-off-by: Dawid Kozinski --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/evcdec.c | 124 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 libavformat/evcdec.c diff --git a/libavformat/Makefile b/libavformat/Makefile index a14a759c1f..af175d2097 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -251,6 +251,7 @@ 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 diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 615d2bc3b1..e4cc112b90 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -150,6 +150,7 @@ 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; diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c new file mode 100644 index 0000000000..ffb7449c4d --- /dev/null +++ b/libavformat/evcdec.c @@ -0,0 +1,124 @@ +/* + * 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 "libavcodec/get_bits.h" +#include "libavcodec/golomb.h" +#include "libavcodec/internal.h" +#include "libavcodec/evc.h" + +#include "rawdec.h" +#include "avformat.h" + +typedef struct EVCParserContext { + int got_sps; + int got_pps; + int got_idr; + int got_nonidr; +} EVCParserContext; + +static int get_nalu_type(const uint8_t *bits, int bits_size) +{ + int unit_type_plus1 = 0; + + if(bits_size >= EVC_NAL_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) { // Cannot get bitstream information. Malformed bitstream. + return -1; + } + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size) +{ + uint32_t nalu_len = 0; + + if(bits_size >= EVC_NAL_UNIT_LENGTH_BYTE) { + + int t = 0; + unsigned char *p = (unsigned char *)bits; + + for(int i=0; ibuf; + int bytes_to_read = p->buf_size; + + while(bytes_to_read > EVC_NAL_UNIT_LENGTH_BYTE) { + + nalu_size = read_nal_unit_length(bits, EVC_NAL_UNIT_LENGTH_BYTE); + if(nalu_size == 0) break; + + bits += EVC_NAL_UNIT_LENGTH_BYTE; + bytes_to_read -= EVC_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 == EVC_SPS_NUT) + ev->got_sps++; + else if (nalu_type == EVC_PPS_NUT) + ev->got_pps++; + else if (nalu_type == EVC_IDR_NUT ) + ev->got_idr++; + else if (nalu_type == EVC_NOIDR_NUT) + ev->got_nonidr++; + } + + return 0; +} + +static int evc_probe(const AVProbeData *p) +{ + EVCParserContext ev = {0}; + 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)