From patchwork Mon Oct 11 14:51:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31051 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3774983ioa; Mon, 11 Oct 2021 07:52:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3YRTGljYJQgPLzg0zvn4flOJHSZ6F9iJXlw7Ou+0p+SheQPRY0d/pHitrsbf3bbseVzGQ X-Received: by 2002:a05:6402:3186:: with SMTP id di6mr42399215edb.225.1633963953192; Mon, 11 Oct 2021 07:52:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633963953; cv=none; d=google.com; s=arc-20160816; b=xUYC713jkHcbRYXxk/h8ahiqv3fGyJ/qgbiLPxh2plBjArLQpmvCc6AMomnL7WZN8b Fg6BKWoDya1yxa0yDzxfoF8nBQkzwvrg+uANXHXQHb2OrDDHddmlW4dORRGZtLeiXEOE Wkqy3N/GwW4ARs5zi31wsRdxsO4J4fw/8ifxsaLgVOBtd3yzJnMOezGKK+712trEwznu WRjMPCB+E0dak0rrWeIrJnWLdK4GJYR75xD5kiRdWnqV6lQgl1hbc7gKXI4dmaXjbJj/ VE/k2IwJqv5c1gZrWpmMMxyryZ5HVbsRjlkN6XbcVZMmJDMzgbCy+/EmUcVRiJTcwa2N 6BOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=+825DvShIF0u49Uoezoou1RcTsH32jk6oIfqHJR47mU=; b=mMhi7kkZCzFomwZHoo3MT4LubHLQUG7+qdUuAiZmLLZ7/cr77lU10+89ZQzOst8Ve5 yTksZhlxEudjAzVoTOH/JSiOD6/F2Eb0oRSiJs6sMWty7TYpZ4dtj7vihV/FWddm94ea MWvIAGRFAHFtm5x/J6d1YeSROihIzSFjoUvhy7lAwQP4lqDtm1gz2DIWAXZXLrgDoSP1 G3He7QkrY2dOmEyWVRJfRihRduhzQt6uNtJLdVM2z5AXx9C4VT0gCTIesUXv09QUdJZ6 oaMU578RhkfCaMF4vQpjKF90l1GAUoE2xVz5DEX/Nt35ely1aKrpW34rAOx+16FfjEts VRiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JjSp6Ihz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h19si12005300ejt.292.2021.10.11.07.52.31; Mon, 11 Oct 2021 07:52:33 -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=@gmail.com header.s=20210112 header.b=JjSp6Ihz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 068DE68A888; Mon, 11 Oct 2021 17:52:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97CA168008A for ; Mon, 11 Oct 2021 17:52:20 +0300 (EEST) Received: by mail-pg1-f179.google.com with SMTP id g184so11035385pgc.6 for ; Mon, 11 Oct 2021 07:52:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=v5p3Ry32FeX7nJkc8G/knfp8azWdZomhULyYd+7vfxg=; b=JjSp6IhzTO3gJYNnzRr/AEgOtv31kfZtpE53Sd1jmPtN7HqG2Bj+xfv+CXl3Tghk9e g5qGA6INqmOPbsdC2NtkwedQnZZD7VBF73ghU1Sn6dlNGEHMqxpF+tvTjbtlDXTEG7wW s2kLKrqD9AeiDngv45jpw6oDBCrK1CXODKQ58F2gF6cH7GETsjWDtmGeVMUC8RySAOOg xNjTVY8ngPX8+kDsXrFXQbeqr68QY4TYK9MJMIdknQNDhx963rKzt+5IREvFtG9Nt5Mg DS5fG1YDwYec2aYR1XmO4AGQatWnp55ZA3752n3TvKa0gf2TeSXYZZSphfA0B3LpPfyJ ZQMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=v5p3Ry32FeX7nJkc8G/knfp8azWdZomhULyYd+7vfxg=; b=S/0kPOZGPMYD8p8zwq9L9rvAVO+IIHfUVnK4OQrcdHIY1tsJIArxbt7CkMG9qt859T QtH1VzsavWa2lM8ShG4rT5GqgrEQlDPsTNkG6ZTDybarUTGFel0rAf95mvdPlUVQLxp2 hUYUjxU1gJSCCRzq06VjkenLgvM7f3GDvJsQSXsnGNrzgvFWAGkQYoC/hXEDeVXPTDMw BmQPkVlaIJpKbDd4tBWib8Fl9HXvL9NHbTXePYbUrpij+zICPgRhC09paTwShBpb6ifp Z6SFO7V6cJvDyOwd8pGr32g7gWEPCiU+fYtotwMLcdREZsywUpRcQeL1r1MdAT8fR1Xe oIYQ== X-Gm-Message-State: AOAM532f7QiE6qbx74uYpLTOvvL2X5quz0EcMINDzoya6oZRGqomLt3k 9UQb0mRBpjX63yfHG/eRJqZOyormcLg= X-Received: by 2002:a05:6a00:1242:b0:44c:2025:29e3 with SMTP id u2-20020a056a00124200b0044c202529e3mr26169291pfi.59.1633963937959; Mon, 11 Oct 2021 07:52:17 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q11sm8082287pjf.14.2021.10.11.07.52.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Oct 2021 07:52:15 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Oct 2021 22:51:58 +0800 Message-Id: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/8] avformat: add raw avs3 muxer 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: b/ktAjQJ16zx From: Limin Wang Signed-off-by: Limin Wang --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/rawenc.c | 14 ++++++++++++++ 3 files changed, 16 insertions(+) diff --git a/libavformat/Makefile b/libavformat/Makefile index c45caa3..66ebea5 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -130,6 +130,7 @@ OBJS-$(CONFIG_AVS_DEMUXER) += avs.o voc_packet.o voc.o OBJS-$(CONFIG_AVS2_DEMUXER) += avs2dec.o rawdec.o OBJS-$(CONFIG_AVS2_MUXER) += rawenc.o OBJS-$(CONFIG_AVS3_DEMUXER) += avs3dec.o rawdec.o +OBJS-$(CONFIG_AVS3_MUXER) += rawenc.o OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o OBJS-$(CONFIG_BINK_DEMUXER) += bink.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 889cfcc..cbfadcb 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -88,6 +88,7 @@ extern const AVInputFormat ff_avs_demuxer; extern const AVInputFormat ff_avs2_demuxer; extern const AVOutputFormat ff_avs2_muxer; extern const AVInputFormat ff_avs3_demuxer; +extern const AVOutputFormat ff_avs3_muxer; extern const AVInputFormat ff_bethsoftvid_demuxer; extern const AVInputFormat ff_bfi_demuxer; extern const AVInputFormat ff_bintext_demuxer; diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index ad29e71..15e7051 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -142,6 +142,20 @@ const AVOutputFormat ff_avs2_muxer = { }; #endif +#if CONFIG_AVS3_MUXER +const AVOutputFormat ff_avs3_muxer = { + .name = "avs3", + .long_name = NULL_IF_CONFIG_SMALL("AVS3-P2/IEEE1857.10"), + .extensions = "avs3", + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_AVS3, + .init = force_one_stream, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + + #if CONFIG_CAVSVIDEO_MUXER const AVOutputFormat ff_cavsvideo_muxer = { .name = "cavsvideo", From patchwork Mon Oct 11 14:51:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31050 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3775477ioa; Mon, 11 Oct 2021 07:53:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/BRJ7dGLR0h416BSOYIDLWhbLjvc7bND4KktRUexeOEuGJVCp0rOujD0EXWkjP9bbjuhk X-Received: by 2002:a17:907:1199:: with SMTP id uz25mr25896349ejb.470.1633963986580; Mon, 11 Oct 2021 07:53:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633963986; cv=none; d=google.com; s=arc-20160816; b=visl0rVbqm/9asp+wQeuQJ74tKCVn/YsDIwIEmWLJY+3efHO8tX0Eu6DieI1foAAU5 WSAz8wHzmGiXi5NTM80NC7Z/zb/0TV2JbYSqE1vDzlaYCrnIAeOxOTbkgS2PpOPFgP2F xLsfpTyYs8Pti4Ems5AVQlqjavuXlMk6MRJKyMkT/F2ukgyU/acZVEq5vG1951Bvt5f0 iMUz+UnWopRgQTAEokFM71Dv6g+PGq5lg0IP77uslQxHxxjB5yfOMOiw4cq7VotFufar p0myFUhX1T+3IBbQ9cymL/muVmSAd9CdSLQEqKS+9UcY1+nJGxsLZDYlppsXr9+xvkCM An4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=mlS8DcWyCWLTJmSfhVRXQuHrOmaxZaCamQ7ToPYpa5g=; b=klVSap6Apd6lP6f+V5Wt4x+YMVhfWqp4SJKuN2jcVnfdqvFLArrmBi7UzI0eJ8dRL9 2vEuJJTV4tL58XXKzSs8/gvqDL20DF8mflvgKCD07MkusPECbxDX8W5HICK1WAMkX0/z irDT/9wS3iL4f7wPxZPyJy9UtWFP0LhbQ+YkMdus/0op5SstgjXEvBq87b2ud7AHj5Fr n9jDflbIcz0wlcLmLxjU1XzGJ41o9rP/3yVN/hiTUjWbCpD8+dgiZ7Sp06bSlN9HCHkR 4CUwgS0l+iCgUCZBf0r4EEGC1woLTkrfNORwiytH02D7Yeq4n+ZwcguswGzu07SynmdG nTSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XNU1dURR; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id yk7si10322226ejb.454.2021.10.11.07.52.43; Mon, 11 Oct 2021 07:53:06 -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=@gmail.com header.s=20210112 header.b=XNU1dURR; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 37CB068A89C; Mon, 11 Oct 2021 17:52:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CA5768A878 for ; Mon, 11 Oct 2021 17:52:21 +0300 (EEST) Received: by mail-pj1-f42.google.com with SMTP id na16-20020a17090b4c1000b0019f5bb661f9so187070pjb.0 for ; Mon, 11 Oct 2021 07:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AwhTvRzjpCH5VYwYO2J223cVSR/7xcx4kBNHu+3pQjc=; b=XNU1dURRFbzfe6Rv/Lqr1n35CdCIjyZZIIPw+0/9gnUrVM0HPVQAp3tx6Q5KdNWDOO qMA0z7MFdTYmMYi58SHbXjV89TJjk1oxxD10uKeIiFvYMtxBZngO+MIHd4ZS3ixHlVvM sJ77Rt0pE8LIh64ssUT9wOOax9M1qv2j9FCOzHgZdW0c0LmqKljnKwjraTNxgQQfm1yP 37v9D8so1nFW3490xw1N/GAXbZKCeaMl5CQXARYzhrGka/hgmsWnNguXUsKGip8NG95g +xy5ubiMeZF7hTs5WAq0YIswwcIaWNZUCKkVOXR/hR2W8MjLSf5Cv/4XiBX6LppbnisS CF6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AwhTvRzjpCH5VYwYO2J223cVSR/7xcx4kBNHu+3pQjc=; b=FJPW0M+AF7KIMOFGlk/pNGHz8WX6kgMOxt+ijQJbQo5wAChVzp+R7/u9rjqtJ2dBz8 tPyT0DP9Csv3QFYATPTRmkcb6GOqGm8ul07MDO3sKQ7TzGKoFvgikgVFO8Z97HzjR2hD cDwO3qczROQFVosvtYeGV1XBHl/eOgdrw9H22pspwhA4u1OCG2Xxw4WAswy8eWROjtEW //L53f8WouWCJG0pKT8QuDlNs4Awq+eVFbWAagVfIpXE3m3tT+MJLmvAQtuJupFuHDqO vru3DjBab40LdVgwP4ESv5Y+p/7XdRm1YXcrOL8BDOcGScQO50ATJeao+JHlsoar7qEd LDyw== X-Gm-Message-State: AOAM531U7HcfPKPqhUerPhfvGG2SH1NIu/pELMFN+ZOZ78XKr8AJv287 9G+BSPqUjMT9bi8VOgKcxOK0CoW9fjk= X-Received: by 2002:a17:90a:a60c:: with SMTP id c12mr31804108pjq.28.1633963939440; Mon, 11 Oct 2021 07:52:19 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q11sm8082287pjf.14.2021.10.11.07.52.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Oct 2021 07:52:18 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Oct 2021 22:51:59 +0800 Message-Id: <1633963925-13579-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> References: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/8] avcodec/extract_extradata_bsf: add support for AVS3 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9MfXRLPyICCo From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/extract_extradata_bsf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index 32c732f..dbcb850 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -328,6 +328,7 @@ static const struct { } extract_tab[] = { { AV_CODEC_ID_AV1, extract_extradata_av1 }, { AV_CODEC_ID_AVS2, extract_extradata_mpeg4 }, + { AV_CODEC_ID_AVS3, extract_extradata_mpeg4 }, { AV_CODEC_ID_CAVS, extract_extradata_mpeg4 }, { AV_CODEC_ID_H264, extract_extradata_h2645 }, { AV_CODEC_ID_HEVC, extract_extradata_h2645 }, @@ -396,6 +397,7 @@ static void extract_extradata_close(AVBSFContext *ctx) static const enum AVCodecID codec_ids[] = { AV_CODEC_ID_AV1, AV_CODEC_ID_AVS2, + AV_CODEC_ID_AVS3, AV_CODEC_ID_CAVS, AV_CODEC_ID_H264, AV_CODEC_ID_HEVC, From patchwork Mon Oct 11 14:52:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3775539ioa; Mon, 11 Oct 2021 07:53:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+Z1hb+uQatqv89JMENSqMKJfq3p4spr3EpLcQIth9hV/oMbLI/NQE78z1PRHUeLbds1UH X-Received: by 2002:a17:907:2658:: with SMTP id ar24mr26305672ejc.405.1633963991265; Mon, 11 Oct 2021 07:53:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633963991; cv=none; d=google.com; s=arc-20160816; b=GOTv1RMfvJy10Lu7eYNXShXuWUX9xMmDclTOtn+PAHR6I3sBPy6Y6jALqB3T5/G/nh NrOht8sStQxVwvvtZeKsxeyu3pjfzqcV15Vl4gbdUDiNAiYdo9Coi7KEtsQk4e4sH+7X 94ftO7Xy+ZmPDbx6kNNXd0F6SejlbhXQ4kiC3JBRr1WjpCVhx1wPfA7bTrw1sk9KbAkQ Tan1M4wvU8jrRqYtOcRlTVsaE03RHvvZpPFy6PdoyT5hHQgixLELnYf6PEt3a0aPeKQ+ XB8fhj/txsHiE5M/OQLDA7RnjwAxmOE0WD5mhsy93Mt8ZicENVRLQpoWo2VO4qJXG0cf /QLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=zvnklc48ZYssT1mKrC/IdyOppzcY7oqsjeyhQNT1dvk=; b=O2Zz6X3OFTNbytQrD0F2iwPV8km+hJRqtgtvpKuiNhK85lTXe4Ag2z2SPrbxKQwJ1X gavk/Jdk16Iq+BNp+QHY0cmcmuoeaK0ESFcykvxSKyPp+YfKM1+LuHd6M56+WsIz03ns Dpo5E+kB4/P/kyvS4PNhhHzith1FCUrfAywbMEqo2gr78oZM0xU+MlMznjvUzG27WqhI k+wLQBUtlU8ILFl3rdpSKl0OeNN2KxrCxH8iCvIZzUOgpLDjgfTQQyRw5Xr/GiiA5DW9 QIsIA0WpXcbALE39Ythd5sX72RxESp/mWrorCCuQjGX2BRJXDlnMOlMQGYF7KqSsLZAO kkNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=bUZ4ot2m; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d21si11908411ejj.20.2021.10.11.07.52.53; Mon, 11 Oct 2021 07:53:11 -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=@gmail.com header.s=20210112 header.b=bUZ4ot2m; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5288368A8B4; Mon, 11 Oct 2021 17:52:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3153468A899 for ; Mon, 11 Oct 2021 17:52:23 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id h125so5068127pfe.0 for ; Mon, 11 Oct 2021 07:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KZmPy6cRipPswPTC+GIifRgUcsTYakOi2oOYdzZQr6E=; b=bUZ4ot2mGB/b5rZxKJ0VZaePZSixeyqa5yWOsyQSlYmK1HwskHWHpZD5pNQk8WVzod wUAxi0xFm+vrgm03Xg/nh8z9HwqjsbYzZpFmBd9MDUmO6de5sKKvPpqG4zsJHLSPfsoL a03LX0k3o2IhaJriqkYY6mtzz5MBAhrUgDMfdhDc6ZI0rGYXdLjbjAN/IM260fvfniQU 6Jj3JqlAyKTm9v35Esm6eGzy4UNnoNoujsOWVGXO5celnmbzH40N+z044PzSEVVsB3ji xHZUUKYc2QyuaN96EnJRgGJf9e9Ujzz/sUYfUMptvQdKKlKLiVFZ9M+zPLDDa+MY+grF /GwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KZmPy6cRipPswPTC+GIifRgUcsTYakOi2oOYdzZQr6E=; b=zQvqFMkrgVRI9/D/J/SWoshDfUiZC1UZELAqn6kxWOwG/q79NPecqUjqACsAbrv71I syhF2thpiq05fLcL/5TjqCJ2LJsSWc/KKKHOtw7jFmOpYh76f3LGJMt0/nfCsZffrZwh M2+PuZXyTRZirTIoESplsbxJdvMNITOhV0fltQDsJnxc08y+M9dVNJXR/M8axMr/YdOp W7wVi+ZaN3HFLcfgNl4fGw7Z/GWkbInEo8MO9vxr1Fcar6tR/DqywsUczKC/RcmMdqym I2kQip9HxUy2gxJTS3v8iDDJagEUs2VqX5G/WV1oiMyzZGNd5gW6qk1dGvWfq6XE97od +BUQ== X-Gm-Message-State: AOAM532b7H8GQDIw+jy93qfoAD3h8FKSrW83nuXP9gs03geI65nik0Im jCPzVPa6D2n7vYgKEORujGgbHessluc= X-Received: by 2002:a05:6a00:248a:b0:44c:ecc5:a165 with SMTP id c10-20020a056a00248a00b0044cecc5a165mr15236773pfv.43.1633963940959; Mon, 11 Oct 2021 07:52:20 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q11sm8082287pjf.14.2021.10.11.07.52.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Oct 2021 07:52:20 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Oct 2021 22:52:00 +0800 Message-Id: <1633963925-13579-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> References: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/8] avformat/mpegts: add support for stream_type 0xd2, which is AVS2 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oPKWJaaO1Hkh From: Limin Wang GB/T 17975.1 Information technology-Generic coding of moving pictures and associated audio information-Part 1:Systems Signed-off-by: Limin Wang --- libavformat/mpegts.h | 1 + libavformat/mpegtsenc.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index c75ba08..910d65a 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -129,6 +129,7 @@ #define STREAM_TYPE_VIDEO_H264 0x1b #define STREAM_TYPE_VIDEO_HEVC 0x24 #define STREAM_TYPE_VIDEO_CAVS 0x42 +#define STREAM_TYPE_VIDEO_AVS2 0xd2 #define STREAM_TYPE_VIDEO_VC1 0xea #define STREAM_TYPE_VIDEO_DIRAC 0xd1 diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 98dac17..f3b7914 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -366,6 +366,9 @@ static int get_dvb_stream_type(AVFormatContext *s, AVStream *st) case AV_CODEC_ID_CAVS: stream_type = STREAM_TYPE_VIDEO_CAVS; break; + case AV_CODEC_ID_AVS2: + stream_type = STREAM_TYPE_VIDEO_AVS2; + break; case AV_CODEC_ID_DIRAC: stream_type = STREAM_TYPE_VIDEO_DIRAC; break; From patchwork Mon Oct 11 14:52:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31047 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3775451ioa; Mon, 11 Oct 2021 07:53:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwudFNYP/bbLUvJ58Yf8xk8Vps80b8T1IK0JDWyV/OP1FOiBT6U4bJfXT9uU/T6+Kefd12K X-Received: by 2002:a50:d88a:: with SMTP id p10mr41819518edj.274.1633963984595; Mon, 11 Oct 2021 07:53:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633963984; cv=none; d=google.com; s=arc-20160816; b=CJvDho2UaHL2Ny4McaZESfuf3gpQa5/pRsiiXirNBi/RDROKOop3OzhGLnRT/roLbn 96UL7yIUs8Tw4lJ9Q+3aMzgVY6YFgysNQdS2pxDo127iVncDfrO843BNz71zZPDU1TFJ NJSrp/WXFQshb76MiUYADmVzhj4AKGuCc9WNsddzPbSv12+2ubo9z2Zjq0jCYHfGgtZF 1AJVdg3aMGLAVgf91FdsseUNbTTo0o6Wj7MG6OaewNp+Tvd6iUTXOMheNwY5MOwUBI3E /vRfHZh2ubRgvGCJxgCJNLfYtOAtGdQyv3/TsfsWdFihVQdTmJZ50sYRJ49+lJduaz42 8TFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=8NhJKes7Cdm4YIxZIFqFSz410fkTrQDv87HN9ybm14s=; b=UTixlCiiHq7oO2QFro5fCYuJXy7OfLRrNUvVinDyJrzj/4IibvJD90VXwNBqTb319G kRNXUmTCbBWnHiZ4o9ns3WDJ2B7CM6fe4A69SLmWHcm1/m0KvdXoz74T1E2JzpHu+/K4 lWPrRDZdpFe6+pBS69OyWMDAlWsPG5BwpsR8XGOIek5u5rSelljkIAh0njQebFF5aSws /uAoUdZtkx8CLBwkPnZOGHHLu497RuroUvnVdzw61D+fGPL+/AKZNvyvR7oRlIcVyTGu qH8hYTD6ntBrxgGRMwjhmKi3jOt5HAuzl9owr0OhVjLgxLj/jqWnmSFd+/skt+FOq3jn /vqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pmi+jr3s; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e20si10295559edy.408.2021.10.11.07.53.03; Mon, 11 Oct 2021 07:53:04 -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=@gmail.com header.s=20210112 header.b=pmi+jr3s; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B2EE68A87D; Mon, 11 Oct 2021 17:52:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15BD468A8B4 for ; Mon, 11 Oct 2021 17:52:24 +0300 (EEST) Received: by mail-pj1-f45.google.com with SMTP id ns7-20020a17090b250700b001a0937b87b7so107997pjb.1 for ; Mon, 11 Oct 2021 07:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2VjOBmBPjZGgAQYvMvNhE7/BLYBMeXuB4w23Loj4JlY=; b=pmi+jr3s6ETwSyGD7mxhaF0iOl1Eyz74HgqIz4CoK+nkUfDB8UUHAaZ5FKSpeMcZWZ rlBLxGN6nmtZrUT7gxd1wcYKHry+UWFi7zjUR83Kx0/3BAEPWRRcXK8yDzLAwgznGHwP M2cMRcpy7O5YMHyHRycuyHt9hMp1NZN2dm1qNy0E4/+TstxgQsSSq6ZfHM6n6/xUddW9 TKe5KSc0oIrV0cxmFXJ/GT2BD+cwTB0kVu64Q7i7CMECLvtZV95Ismhba0h9nn2Ks6+E cUZTyNa18lJvPJoceXxXU7IE7RWyiB39rd/E3Wa6M+kKbZqEWk+pK9D6i0K4zszMMzke EvHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2VjOBmBPjZGgAQYvMvNhE7/BLYBMeXuB4w23Loj4JlY=; b=jgDNRBQg9zmwZ78O5PtXdfyMX4jTopt5ECsepuv922CxIINTQzwgHo1TMdc/Pjja4W ss+mPaPiaXbOxXTPYX/jI5ph351fFV1JILntN7IwQB2nspMTgPG2P/V7bCgKDqRVXk/2 dHticeoC/F3hOqgBMpN4OPWvh1mHO89RblY1gTw2tJWF38Hwdjx5YstJZTHwETt96Z1L cTHEOu8opXG6HHEGyZ6wX4KAidsH2gqF3ixCtCpesUZYFWpAeQayWIhrTTPwZp0qOQdS hH7NafjQL5ort7+sHAaWc5VCxdq9bm//ICjnptsE6+s+qervQI4ea2A8sEMC7GWReDXa MR/w== X-Gm-Message-State: AOAM533rYfBwpXNdqAwculvmal4yAYHhCc50Thl5anwwz3Hm6OV/WsWN rVCj0iphsV9LEsZfD2mYmFwSX/UwoIo= X-Received: by 2002:a17:90a:6a8f:: with SMTP id u15mr30554973pjj.212.1633963942256; Mon, 11 Oct 2021 07:52:22 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q11sm8082287pjf.14.2021.10.11.07.52.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Oct 2021 07:52:21 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Oct 2021 22:52:01 +0800 Message-Id: <1633963925-13579-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> References: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/8] avformat/mpegts: add support for stream_type 0xd4, which is AVS3 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZM5TwSdMFaEx From: Limin Wang GB/T 17975.1 Information technology-Generic coding of moving pictures and associated audio information-Part 1:Systems Signed-off-by: Limin Wang --- libavformat/mpegts.c | 1 + libavformat/mpegts.h | 1 + libavformat/mpegtsenc.c | 3 +++ 3 files changed, 5 insertions(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 9a6bbb1..d3a4e4e 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -807,6 +807,7 @@ static const StreamType ISO_types[] = { { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS }, { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC }, { 0xd2, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_AVS2 }, + { 0xd4, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_AVS3 }, { 0xea, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 }, { 0 }, }; diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index 910d65a..a48f14e 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -130,6 +130,7 @@ #define STREAM_TYPE_VIDEO_HEVC 0x24 #define STREAM_TYPE_VIDEO_CAVS 0x42 #define STREAM_TYPE_VIDEO_AVS2 0xd2 +#define STREAM_TYPE_VIDEO_AVS3 0xd4 #define STREAM_TYPE_VIDEO_VC1 0xea #define STREAM_TYPE_VIDEO_DIRAC 0xd1 diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index f3b7914..26fb1f1 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -369,6 +369,9 @@ static int get_dvb_stream_type(AVFormatContext *s, AVStream *st) case AV_CODEC_ID_AVS2: stream_type = STREAM_TYPE_VIDEO_AVS2; break; + case AV_CODEC_ID_AVS3: + stream_type = STREAM_TYPE_VIDEO_AVS3; + break; case AV_CODEC_ID_DIRAC: stream_type = STREAM_TYPE_VIDEO_DIRAC; break; From patchwork Mon Oct 11 14:52:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31053 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3775607ioa; Mon, 11 Oct 2021 07:53:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziXlMeq4E7/WMFUt+YG7B0Id7g0o1ensvQUwd4YoZClmGBfMOtBhhUtkg6xOQAwB8DMyxQ X-Received: by 2002:a50:d989:: with SMTP id w9mr43295393edj.99.1633963994832; Mon, 11 Oct 2021 07:53:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633963994; cv=none; d=google.com; s=arc-20160816; b=nlEsEDu+VlSn8LXx9lUo5+mn+PKw1a7YGz52PBsP8v+jsJF8FBcb2yIp9GWaHECrXv Ly7qFoDQs/lp3mQsUa+35Y8k/LcV92BDt/MhE4WuZuMT+k4F9GrRL3xmn7olsKf/CA1A p7wl2KsytWj+U6XpG51MMZpwsTe++4uIFs9EVzUa9q4RGb9cZod6XW1I5ENBtA2syq7E YctuYpFTKNgCmXGYAOaNQaqwSIVha5lWwZf++Sdnn04XMG4A8ZoYKl0JDiT9HhyZfSgg UHhs64bqFJg86BzI76uuszkCTZyYtIvgfRvd8hQFfVFZ3UPjaGhc62K3D0vS5IWJFeFb R6gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=JxGjGS6Sq7IwM7n6qfNZcKYgGPdRj3crtyucI124o/g=; b=XrhrJf52sAur9pK6GGw/1dfSC6w3Pe1Axf0a4oJaKL+lv4jM8kudIGGsjhlEAXkZaG Xw8+f6CA4QSmwcnQlVJ5qwxCgp+cQkUTD2SssVEMTmsCdIkWwR24K30vNob2CUb5UXI0 C5iaDSbP3bNamE1JZQTwBnhBpyw5bho4hUDRlbt5w+GAbqvP+7sgm+RlcTcGRJyq1JTV glTsmGQUmvqOBbFGgmVb+LhfYtAZs3bFAbBHFJzoArZ5VM1blpjAgEg6HLALYqUoBb0Y wLa1lY2Y7M3Sc028xtkFnX4Jvn2HZ1uBUg6jCKWosk0QtoV5KhVlhV51jZWhUyJT9wYb fflw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=WvW1u8fq; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id br21si11575328ejb.612.2021.10.11.07.53.14; Mon, 11 Oct 2021 07:53:14 -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=@gmail.com header.s=20210112 header.b=WvW1u8fq; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9CE7468A88C; Mon, 11 Oct 2021 17:52:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A87B68A87D for ; Mon, 11 Oct 2021 17:52:25 +0300 (EEST) Received: by mail-pg1-f171.google.com with SMTP id 66so11033332pgc.9 for ; Mon, 11 Oct 2021 07:52:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6ua2snFfYaN5pAY8zSFLJBI7CwNkd8KuFWJp/0zGhlc=; b=WvW1u8fqkriJu8JKzOUij62ORUSccxxlWEyc9NXxZxvysmO/SfjvmdZtzyO94vGOuz xupvZiU3wEzfcxvFsHJaNGIZ0t8bY8P9frgBv+XKKgAXPRf0n0PrvyLCUaoW4ceTtdXQ J0KgU/Es+9U87O9zKEfXTaaWI2P2LCsF7ys+DWsOAaipOjBQQohNMkceAhcgP7669su6 dSlQa6T+e2VnApRlQZ/b7ref6ZWD1Y1meqdTaLScgD3ASPOKIV+VwiSqh00vmcKxZXAk d1mSmJ8UtHJ8fl95UZoor2yvG3lfrZKnCYNCZcf6TbCHx6u25wl4/DRQFLApUI1l7J3/ R+Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6ua2snFfYaN5pAY8zSFLJBI7CwNkd8KuFWJp/0zGhlc=; b=YlUUedpcBlYtMOgeHjiyeekVjB8rh0/qWmyrYBfVAcMxUDCGJYsPf+9zycm74UaZrj kK/mKpD1wjQOClg22fNjcgJDfNFc2s3TxjRyrypRIXBv7pWSiMWX+ed7pPIj86u1u+FJ 3cr6rpMZP3STNDN8UyrzLX05Y0ElIBRiCflgAX8OSw+cC4dlrmQ/wZDakQ+8NdLlTZJL OedsjM2+jitSBR+REJXVHgjjD0nGC78cN2O0yl/BG590bGCOOAtYvnO2FxxNa+C5yW3+ dSHBLyzcWO90zVgfnIIrmrwFVwmFxAu04rnHQgEMvWJgIvG9cyjPFhCY649hiD02QSiB 77RA== X-Gm-Message-State: AOAM531xWv0Vemu1iNMBBUpCJTwrRMzvVebb/ebTdVIh91z23YA9XAVB j9MdGnSP+gbG939WNks0qZok/EJC7aY= X-Received: by 2002:a63:101c:: with SMTP id f28mr18404572pgl.330.1633963943518; Mon, 11 Oct 2021 07:52:23 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q11sm8082287pjf.14.2021.10.11.07.52.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Oct 2021 07:52:23 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Oct 2021 22:52:02 +0800 Message-Id: <1633963925-13579-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> References: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/8] avformat/mpegtsenc: add AVSV format_identifier for AVS standard 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2MUU7S1B/5TZ From: Limin Wang Listing of Registered Identifiers: https://smpte-ra.org/registered-mpeg-ts-ids Signed-off-by: Limin Wang --- libavformat/mpegtsenc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 26fb1f1..184bb52 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -789,6 +789,9 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) put_registration_descriptor(&q, MKTAG('V', 'C', '-', '1')); } else if (stream_type == STREAM_TYPE_VIDEO_HEVC && s->strict_std_compliance <= FF_COMPLIANCE_NORMAL) { put_registration_descriptor(&q, MKTAG('H', 'E', 'V', 'C')); + } else if (stream_type == STREAM_TYPE_VIDEO_CAVS || stream_type == STREAM_TYPE_VIDEO_AVS2 || + stream_type == STREAM_TYPE_VIDEO_AVS3) { + put_registration_descriptor(&q, MKTAG('A', 'V', 'S', 'V')); } break; case AVMEDIA_TYPE_DATA: From patchwork Mon Oct 11 14:52:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31048 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3775766ioa; Mon, 11 Oct 2021 07:53:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxuLBH5GDMAwCuI4sjomRlVlBuy4hUdIpq64rxZcuG5RlYDu5XlmcW/ndKUJvYv4l4TnIqi X-Received: by 2002:a17:906:31ca:: with SMTP id f10mr25728390ejf.73.1633964005510; Mon, 11 Oct 2021 07:53:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633964005; cv=none; d=google.com; s=arc-20160816; b=rH1r7kxtq1fx7oeq8m6OsItrdN+yRhABMfB5CFSUy73W3Al23PbavMlZV4FTb4IzX8 80j0c6nBWIkqIk/qnT1oZWMbXA3ctr+7Ud3vEsduocNcWlWI9S/YsxI18tnnbEtn4z/D 02TSA1NNwjUhvhO79JaaHfyzfVwPwzb96EBkPpLPmwPN7jzAF0dlIk1A+VLoTvuGsIvW hACdKsX0Gq5QkF+r+3APpm1AAgdujAgIx/rcVWRxAiNvHGulEPClzoXOYTgNVXwUAXgJ kLnlRb1eu1H7K8FN/1ItWaBiyF8idLKlsDHEmEo1Fn58GJLzAKM5w0+DEjOudFIw7AGF PL1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=mSV7q3SJERxgWMnNXh4/b4rmLVWjb4sEccyFVT1jxOE=; b=FzVI4bb4G9pYtG70wZh4OOzaRiSrrkYrwl2Ez46AI/ki148rpkrzgXx9Nqc9gN0scx iq2VnWKKbMu3KivdahWH0uWmZT2Lt4gZNLTYbV7QBKwJn3WvdXpVMVVRDAc/ZMbq8KA9 NsqSMrAwpuxgw6cAX1eP+Ltnsp7weaQnR1ZlI5kNUYvRuSkPdyKnsaxtDMzppZZ6X0Hz 5Q7UTmPbfns8o0RGuSuHuU6fqXHwri/rA11oUZ/cZBByrYF3SJCbgmLvKOI05myqfyTK 3cjtnTF/Ahwy+KqZEX8BaTnLHW6rV4ww+glX2xQ0/t6bGW/AGwCdavc/JBkNT9ee61hj hdgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=T3JJ6kCy; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n14si15092879edx.371.2021.10.11.07.53.25; Mon, 11 Oct 2021 07:53:25 -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=@gmail.com header.s=20210112 header.b=T3JJ6kCy; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C30C568A8EE; Mon, 11 Oct 2021 17:52:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 860DA68A878 for ; Mon, 11 Oct 2021 17:52:26 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id h125so5068274pfe.0 for ; Mon, 11 Oct 2021 07:52:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QDqF+rf/JGs592/uqwv9ryzkSORnR+YocJSi9chWLQQ=; b=T3JJ6kCyEEbVv37WKYyWucbXFO7mo/yfXrI9QDE07QIR+HtW5YRxOpkExZx7DEh5rj 7/BQiSXtkgXtuwIOabJmxNxEKO1k/WrH6zIMtr5wkNKIkML4/ulMhdSa/Kj9/UqKBqos Kkr4UmVhBZhxPMHYWdtDAeTKi8eHOe3p8aZkD5qcHM1IRGBxBuyJf+w/y/fugWFRrxrq eWkHjBUlVDFdafqNdPnBT0TScM4YwWGp7CaBPnLNolYIRKE11LLWLlTauZZ0TemmHpKC JuGqqYkGt45Ow5dQQvjaLcSyJWbo200P8P7WLk+46rD8qYx3tc295gmkm2Cjtbb7555Y yJUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QDqF+rf/JGs592/uqwv9ryzkSORnR+YocJSi9chWLQQ=; b=XdPphFvMKOmckDUSEdadvae7vX7Vqxn+teTOyRtGEnCD3c8ZzLIpHqdgdI8Qa0b3Yc laWCratJxFyYzP5Ci6F317pmPwZ60kHmII4CIcgxgy1f83JsVvHELN4aVqxNhFrKz3qm HiQbtcMp6O+ZPp2OVaTPZ27simfpYH/5WRIVPZYjdYXajtFnEGJ3KVjh+hF+3+q/8EvF zNeRPOQQKsVjQQ3o8sMYcpoun8ceefB0GXWvi1v2xbZcqMQgN+aW1FPAV41qAAahify9 36KRZ7wvbrpqXO6IgJyuoBEV8GqTfdTBzu/kILA+uKix3tkPVsgzNlZu/EqTNTjPnj44 gFyw== X-Gm-Message-State: AOAM533RUldjhNIu7KsmxFopMg33nRjFvoD7DWA3rJ8pfCDzCtRm5VP4 nRSUo++DSLuAJdZqXY6bH6JyWCX40P0= X-Received: by 2002:a63:e002:: with SMTP id e2mr18066057pgh.386.1633963944754; Mon, 11 Oct 2021 07:52:24 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q11sm8082287pjf.14.2021.10.11.07.52.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Oct 2021 07:52:24 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Oct 2021 22:52:03 +0800 Message-Id: <1633963925-13579-6-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> References: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 6/8] avcodec/hevcdec: remove unused code 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CYp3ISc0B2kR From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/hevcdec.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 482638a..2855342 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -45,9 +45,6 @@ #define SHIFT_CTB_WPP 2 -//TODO: check if this is really the maximum -#define MAX_TRANSFORM_DEPTH 5 - #define MAX_TB_SIZE 32 #define MAX_QP 51 #define DEFAULT_INTRA_TC_OFFSET 2 From patchwork Mon Oct 11 14:52:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31054 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3775930ioa; Mon, 11 Oct 2021 07:53:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPxdWWBsgilzm95kHmKIqtkcn8BAsbR0Ij30YXDeAGd/m+4YRMiQCi4lS+2UYuh42lb3v+ X-Received: by 2002:a17:906:b19:: with SMTP id u25mr24680275ejg.36.1633964016523; Mon, 11 Oct 2021 07:53:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633964016; cv=none; d=google.com; s=arc-20160816; b=kmpCLCiQOshTlXY0oUndVCJ2TX7uthRU/FsrqnTCsWax5G+PFtgqmXh4mTBXf/IKf0 MV0zUsipZA+nzhfFXEZTG12I/Q8kG/2N2iZIPhHMnAkpDFqfj4NnOEEcVvZfZCcgpDga QyYV9LydZiRHt58WYIwt6N4zCd8fD9Xgq6Mh4KnjtUAH1tWDOqvV7uuNDtyTPbiLJ3H6 3j05/xd8PamiGWu76jdnKiXQ+C9P4ZX3Mrp8o7QUEUJfydoNrBBV+7FQPhpV5gdeqwXk n8F/ohhShT4FAaJBWDBNvS3frmdgAH7zFfj8iX5RWOSOvCoES+pj+yKAUaCr27Y4OwP7 VVZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Badnf7+4fZWkgLVeaegSM7o1/0EkAQD6Dn61AoiHMbs=; b=NMdPNMfMs9oaHuYX8nrhrBoRjwmHXjUtiisu/PXOkvCPb2Lg5NUl7/69saGHyUbQkp 4iK/FUKsPLQITxhdBkD1KWA2XN99nmJcB3Yh8Q0e0xvEG4BqF/WGASfdF2II9NbAgbTz eKWQz0Jny3I6oiqHBsW4b+fxwscuPsFsg8gfhCYfbIKCTtXHnmprMOEeqXqQbe5LSE3v O7qWPlc32DsQZU4vLs0Pr9fM4w8lXu5by8PFAZ3RVSXgPvvtekKRo21YjbY1yyA9AGHQ X0JXLSZZU+a5hY1BertU6Mt0kixI4IwIkGxLwsDn7xUmkxxJ46AESPe4itWOxS3k+klg L4aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="kvPmn+A/"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kl25si11432983ejc.370.2021.10.11.07.53.36; Mon, 11 Oct 2021 07:53:36 -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=@gmail.com header.s=20210112 header.b="kvPmn+A/"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB49568A919; Mon, 11 Oct 2021 17:52:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E625C68A8D3 for ; Mon, 11 Oct 2021 17:52:27 +0300 (EEST) Received: by mail-pf1-f181.google.com with SMTP id w6so3490210pfd.11 for ; Mon, 11 Oct 2021 07:52:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gpRLCNw0QFyf6PI0TWkyFr0wX/l9b9yn/pxNOj4Sl64=; b=kvPmn+A/gTssuwjIbcmsKHpRlWhd+Pl4JmjVULiT/13tsISee104bkWAnMEevDrguT 6rHDvlYv3+F3CGaffEjRBmeLTzoCYdZI9DkqXVTipsWgU/yeQtSrp3AyoDkJWKQQpWnO zF7gyvAqM9HuiGloS/CwBSZfLrOy5vFgYJvHtAPW0aTqftTkEXAGtMWdVn7ofQyUNrg9 VgdQ5Vsh2njhdZRSQk7EkHQnWwWac+rlNz6qWly1zndcIKl4bElDXfHncH1rIwlduDa3 F2nCy03+amG9CExh8vj4DGnu6DrMgsQcmyUpiQWvD2qCEUMK+olRVxRhlzERmRCxacUd r+Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gpRLCNw0QFyf6PI0TWkyFr0wX/l9b9yn/pxNOj4Sl64=; b=ahpe423qdS/v0YSuzIirCz6VBrTDV6tZftMGwJioZL06gJA13FG8AuSxLE6QfeX+Ny b5pbLy1BfNBY2BGyh50zjh0Y1mNU3sUXroXwBLfMtSK//gkff2XcA8qbHyhWvTVxIFjO DiIbX438ZgHOwLvTZzGQwWL/RqjOfa3+no21WoxteA8yfHWggkQ1v6jrhr2y7dVzilLZ S6C+h3ZdN1TWgWMyVvkGFIVTo2c9V465SA1xw2bbO/XaM0+51hsm42fmpm18pjHOb6Ib 6u/VMlagT6lDcKIFDDyFuKF3x7C9b4kP0XMGoG8BYOAOww41XYVLSYdJLd70YMF1Hcry H6WQ== X-Gm-Message-State: AOAM531O0nAjXzcUQc7TFQPxTuQv6eGU3PzhIZhLxYv9lcKU3JkPwiV/ gWJItu5Pe7dUxNmtNeXA6XY+PtHjwB8= X-Received: by 2002:a05:6a00:13a1:b0:44c:f60d:5fe6 with SMTP id t33-20020a056a0013a100b0044cf60d5fe6mr13135150pfg.48.1633963946138; Mon, 11 Oct 2021 07:52:26 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q11sm8082287pjf.14.2021.10.11.07.52.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Oct 2021 07:52:25 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Oct 2021 22:52:04 +0800 Message-Id: <1633963925-13579-7-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> References: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 7/8] avcodec/hevc_filter: remove unneeded headers 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Fp4tMIauDBlQ From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/hevc_filter.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index 6b98240..7e9478c 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -25,11 +25,8 @@ #include "libavutil/common.h" #include "libavutil/internal.h" -#include "cabac_functions.h" #include "hevcdec.h" -#include "bit_depth_template.c" - #define LUMA 0 #define CB 1 #define CR 2 From patchwork Mon Oct 11 14:52:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31049 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3776100ioa; Mon, 11 Oct 2021 07:53:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvQSDrPu7aJCEF7q9aR7urPexTwxs84Zf4erSdmnd13JQxPjCchH0J03dy+vxBzFd+Y0VS X-Received: by 2002:a50:c006:: with SMTP id r6mr43098278edb.289.1633964027216; Mon, 11 Oct 2021 07:53:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633964027; cv=none; d=google.com; s=arc-20160816; b=ly/1AFi1hfxeloEbyMiEyFry3KqJu68I1OeI/v0D9t0q1fHrDMn8W4tyROxq/LS+N+ /PwJ0cE+J/KnfuhrIvqpaGJJSxCq0oUwjo/ELdKlIdfFpjdVC9r1KWp+zqgaoR24/fnJ MtGL3CIBTvJSLFSVCO5mp15nb0M0C5hkJIwxbACWi+mbid0jTTHHjXKtRB9NQRbJfpUe ULhCd3cPDAbxjjYYj6pLGF0VSHdik5o7rZLDCE0MkJqEdJF4BHClhdCQ2XpKFnN5AMNP eUkr+k309s3HrWsDU4WQuoBfZemX6NUTSdr7FCNKaOOS6Qe1oSZgqvnj1pVyzxGTHMhy 0UnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=jgSa9gldgTZc1rQQQ7W3F5nzoo6zSTlOcgqR2k+ar/c=; b=oacMhwQ2kYR+Z+GWmFUOSrK2B595soyabWoF/U8y9rzcEUoOCwfwC2xAWfz+Y+2/AY 215wZuBnbzEFscfAMzCanhAs1YqWvXbnithmTGyb1JECmWVG0I+DMkpnWW3O/1jyUHP3 6GCAMd/rzvMRc7cYBZQdthQmiZ2HjLIhb+h5G86E3hZze4M9KGJR10kR+3JI/WbuiOxh 7hxy/mU70hK91OBNwWXalC/pXWJJjJ57iersKbh23NjCUBiIEP/UkSQ7g3QMemdmX35v Ko7FKQi5wmho3QzRQ88RJBe82HXPDP0xK8GyUPNfAootAfI5JcQwN05ZwwfPPcb4We+J hp9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=O30eO75b; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d4si15717826edm.247.2021.10.11.07.53.46; Mon, 11 Oct 2021 07:53:47 -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=@gmail.com header.s=20210112 header.b=O30eO75b; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5113A68A927; Mon, 11 Oct 2021 17:52:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21C4468A8F0 for ; Mon, 11 Oct 2021 17:52:29 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id r201so11054716pgr.4 for ; Mon, 11 Oct 2021 07:52:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=il7oaVnf/UweGLM7yZG0nTKxI7nbRdsQOllzdbFhTKY=; b=O30eO75bQ5GC0YElXgYoahi8menvmmA5PA/NUM/11n+MY1Pzw6qQ/e7LuzylCT0Pg4 Cjvrs/Xr2MtNS1kFbnq8K8SiyICAkQ3uEj3QY/74lDl4aiok5uSEJbROuL37iQG+KhTb 7Aft1+DwXe1mZP1SwDJP4NYwKd5yP0NbgoyKagN+5mgbJxBmE3pSgOq01pjfsdJVuTIo FyZP/k414gARammOZH7RivNXzAUqFShwgtuhbOFH2Z7fKGLa85yKBzkTjUzebdQCXhSL Df0H4cA1XtmsD+FrqA0Z2pnDNfJIkAXsCJfevdj256S6d52QnIQWlinjK4Vu2mgDNAbT TuHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=il7oaVnf/UweGLM7yZG0nTKxI7nbRdsQOllzdbFhTKY=; b=ro2D58F2RPyBhbbfIIylJH3GdWbeY7YZBJog/3Dtfb1BsKoZV3ec7XMCKt8IoOFJjp PFYqhoCM2LLBZRF8EWhBotZ2Xw3RZUEMCsfKC+N40PZfmaEQyUxICF23wZ6sV0MxZZf1 Cd39W4pRVGi6M64nXqRMSYLmVnPtbamSRSoNxT8x7sKD/3N0yLCXdoxdXIw+RemfYcJj CpPyr8HfG3FyWqHOzbXxIJf5QmPaFOnolhxnVwhn+s/r+P0rMrEprpbl9GppdEEqSR7c TBkJ91WMGsKMg8jS5L5uzry99uxyrPOLD+up9//DJpvZDT05/bcBq6MOC+Ev6a0DHlJK 3EUA== X-Gm-Message-State: AOAM532jl4Md0Lcee+pQugc/rzLQcDvp9ymIeSdojwaxJ/5DSQ8YQ/i0 rgsIKJ9vzAWAHpJRfPE84LN1PbuRs3g= X-Received: by 2002:a65:6389:: with SMTP id h9mr18625350pgv.83.1633963947430; Mon, 11 Oct 2021 07:52:27 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q11sm8082287pjf.14.2021.10.11.07.52.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Oct 2021 07:52:27 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Oct 2021 22:52:05 +0800 Message-Id: <1633963925-13579-8-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> References: <1633963925-13579-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 8/8] avcodec/hevc_filter: Correct indention 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jHjZTt3NSCDd From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/hevc_filter.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index 7e9478c..3c45b5a 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -138,7 +138,7 @@ static int get_qPy(HEVCContext *s, int xC, int yC) static void copy_CTB(uint8_t *dst, const uint8_t *src, int width, int height, ptrdiff_t stride_dst, ptrdiff_t stride_src) { -int i, j; + int i, j; if (((intptr_t)dst | (intptr_t)src | stride_dst | stride_src) & 15) { for (i = 0; i < height; i++) { @@ -319,18 +319,18 @@ static void sao_filter_CTB(HEVCContext *s, int x, int y) x_ctb, y_ctb); if (s->ps.pps->transquant_bypass_enable_flag || (s->ps.sps->pcm.loop_filter_disable_flag && s->ps.sps->pcm_enabled_flag)) { - dst = lc->edge_emu_buffer; - stride_dst = 2*MAX_PB_SIZE; - copy_CTB(dst, src, width << s->ps.sps->pixel_shift, height, stride_dst, stride_src); - s->hevcdsp.sao_band_filter[tab](src, dst, stride_src, stride_dst, - sao->offset_val[c_idx], sao->band_position[c_idx], - width, height); - restore_tqb_pixels(s, src, dst, stride_src, stride_dst, - x, y, width, height, c_idx); + dst = lc->edge_emu_buffer; + stride_dst = 2*MAX_PB_SIZE; + copy_CTB(dst, src, width << s->ps.sps->pixel_shift, height, stride_dst, stride_src); + s->hevcdsp.sao_band_filter[tab](src, dst, stride_src, stride_dst, + sao->offset_val[c_idx], sao->band_position[c_idx], + width, height); + restore_tqb_pixels(s, src, dst, stride_src, stride_dst, + x, y, width, height, c_idx); } else { - s->hevcdsp.sao_band_filter[tab](src, src, stride_src, stride_src, - sao->offset_val[c_idx], sao->band_position[c_idx], - width, height); + s->hevcdsp.sao_band_filter[tab](src, src, stride_src, stride_src, + sao->offset_val[c_idx], sao->band_position[c_idx], + width, height); } sao->type_idx[c_idx] = SAO_APPLIED; break;