From patchwork Mon Jan 25 14:15:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 25160 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E5F5344BB70 for ; Mon, 25 Jan 2021 16:16:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C1A82689EBF; Mon, 25 Jan 2021 16:16:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABEB7687F3C for ; Mon, 25 Jan 2021 16:16:49 +0200 (EET) Received: by mail-pf1-f171.google.com with SMTP id w14so8461113pfi.2 for ; Mon, 25 Jan 2021 06:16:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nDR8RKG8pL6ZS22VReDNZJUxtP7vX5kThw/BAa1rDTc=; b=byf/YvfjIHvlLKY8S605qU+3pWzbzjsJLt3fZygOqN3029GLcBnmEfJ+igsb7vPgh3 bOfzfNerHlknMGCu+sREPom/h5WoNhDUl6DHrUhndVzTtkdvvSGqyUcTKem6ar28keAj S9lZ3KxyITt1YuNdhzZMEwn5rW+ZHq0zu1y2XopSwJQws31l/HbzK79jECX6B876uYh5 ROPWwApkOhMQAqNoihNbhLerzPzgiu2nu7kXo917IAHy+2MCDwmoCFT2PmfCQKgbFfq2 r5dZvE4Mu9IytPOrerPZVVKWedT1QwhGXZjYzNXEz1CtLoqjj21S4N1I1em80g0lNgZe b0Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nDR8RKG8pL6ZS22VReDNZJUxtP7vX5kThw/BAa1rDTc=; b=gr6B0+6RtuqIbHZRNxfnOj5dtSZvLaTJoO2JcOq0OFgv8nXJOvkz8NmSeCfO8OhTBc Q+CWXcgD7g5k5Dj2PeQnHJVQrvy7Eu1JfhbThJy7f1134Z7in8ANT76v7YM+Sk4hb4Kl smrEhIHHzqDewtPNs3jXfDuhcPh/pjc+539od73eHk/YrclbdgYIwThIg8go7PGSEZaQ iJqdgCXz38yZYsZNpSPUUk1aXOIEF+atlwwkZN0RkI6KTHnMXR+pKgSsY1R6mvQcReef bQKsaT5IiS3TCioTURKPRwdZkl9LiZoOuwKqnGGyTz88vTfSZxQBbz3pVQ/XX0JBM7uY biCw== X-Gm-Message-State: AOAM532mkVYsDf+IOoGiuuRvmt3dufrKHHIwjKLeVpLbX23jgXtpukhL mjx9sk9yYL3DcLPSz4uu0Rb1NpXB+M8= X-Google-Smtp-Source: ABdhPJxILpVBafjbNKRyiNCdWkXYlwvToN11zhC5Icha4nm59Gw5j41sCnd6IJZ3Y7wTOw3myWzVGw== X-Received: by 2002:a05:6a00:2bb:b029:1be:aeea:abf4 with SMTP id q27-20020a056a0002bbb02901beaeeaabf4mr597169pfs.63.1611584207833; Mon, 25 Jan 2021 06:16:47 -0800 (PST) Received: from smith.tendawifi.com (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id z6sm5523328pfr.133.2021.01.25.06.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 06:16:47 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Jan 2021 22:15:00 +0800 Message-Id: <20210125141507.11012-3-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210125141507.11012-1-nuomi2021@gmail.com> References: <20210111152357.3965-1-nuomi2021@gmail.com> <20210125141507.11012-1-nuomi2021@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/9] avformat: add vvc raw demux X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/vvcdec.c | 61 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 libavformat/vvcdec.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 3a8fbcbe5f..4a5406da38 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -563,6 +563,7 @@ OBJS-$(CONFIG_VOC_MUXER) += vocenc.o voc.o OBJS-$(CONFIG_VPK_DEMUXER) += vpk.o OBJS-$(CONFIG_VPLAYER_DEMUXER) += vplayerdec.o subtitles.o OBJS-$(CONFIG_VQF_DEMUXER) += vqf.o +OBJS-$(CONFIG_VVC_DEMUXER) += vvcdec.o rawdec.o OBJS-$(CONFIG_W64_DEMUXER) += wavdec.o w64.o pcm.o OBJS-$(CONFIG_W64_MUXER) += wavenc.o w64.o OBJS-$(CONFIG_WAV_DEMUXER) += wavdec.o pcm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 6990af55f4..a2182e0603 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -462,6 +462,7 @@ extern AVOutputFormat ff_voc_muxer; extern AVInputFormat ff_vpk_demuxer; extern AVInputFormat ff_vplayer_demuxer; extern AVInputFormat ff_vqf_demuxer; +extern AVInputFormat ff_vvc_demuxer; extern AVInputFormat ff_w64_demuxer; extern AVOutputFormat ff_w64_muxer; extern AVInputFormat ff_wav_demuxer; diff --git a/libavformat/vvcdec.c b/libavformat/vvcdec.c new file mode 100644 index 0000000000..149f39f28e --- /dev/null +++ b/libavformat/vvcdec.c @@ -0,0 +1,61 @@ +/* + * RAW VVC video demuxer + * Copyright (c) 2020 Nuo Mi + * + * 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/vvc.h" + +#include "avformat.h" +#include "rawdec.h" + +static int vvc_probe(const AVProbeData *p) +{ + uint32_t code = -1; + int sps = 0, pps = 0, irap = 0; + int i; + + for (i = 0; i < p->buf_size - 1; i++) { + code = (code << 8) + p->buf[i]; + if ((code & 0xffffff00) == 0x100) { + uint8_t nal2 = p->buf[i + 1]; + int type = (nal2 & 0xF8) >> 3; + + if (code & 0xc0) // forbidden_zero_bit and nuh_reserved_zero_bit + return 0; + + if ((nal2 & 0x7) == 0) // nuh_temporal_id_plus1 + return 0; + + switch (type) { + case VVC_SPS_NUT: sps++; break; + case VVC_PPS_NUT: pps++; break; + case VVC_IDR_N_LP: + case VVC_IDR_W_RADL: + case VVC_CRA_NUT: + case VVC_GDR_NUT: irap++; break; + } + } + } + + if (sps && pps && irap) + return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg + return 0; +} + +FF_DEF_RAWVIDEO_DEMUXER(vvc, "raw VVC video", vvc_probe, "h266,266,vvc", AV_CODEC_ID_VVC)