From patchwork Wed May 30 01:19:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 9158 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp3757076jad; Tue, 29 May 2018 18:52:04 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKNngx5nYHADNLkN/amdISkijmKzI/69HX3oiVUpsyk4G/HjYDpUzYyAgxr10xOwgHPE0Uf X-Received: by 2002:a1c:9cc3:: with SMTP id f186-v6mr739539wme.94.1527645124178; Tue, 29 May 2018 18:52:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527645124; cv=none; d=google.com; s=arc-20160816; b=1Ku/Qf7OgHuIRXAgCCBOeSVJ3rGx224vfKpln0rrEouYtK23SuLpPN5lUp9ucDaECf rvtmwybhzd3zLu0AwtUX2FCAEMnTOS6J2cHPTnq2jR2EAeNnQw/BdmYre1jUoY0B4vdD 0zR8MDiuRQzVRNbWAZ59YPHzHaBgB2cqILKHv6fg6BRqvx0QyJYNfkpgjVF/zKbnOUot aTOgOjw4wIH6H9zuNJGtkmuZdXo49fQrizL5LhWrcNe2gELkaNmASpx/OCEE2E0C1g+x TwUc+PRGnPB3pRC/HQdvTW9JoRspnnlzhV+Rf9gEP+rJ3wA1P8g4msWP2tGoUK65AqWD mteg== 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: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:arc-authentication-results; bh=MLzTRyFeoC3usDFyVbq0HeHUW/CIM2dqFZNP/WtSf+4=; b=YQKS+FrYjTv66+m46XyI3ul4N7HZs2swRuN/5eU3pg0H0TZw9WeD4U1GYyhDw3cEiD 1A9p+kzJqJ53G8LmUahYU55kC9Mtze//XCbKDWFlhg0eMSBWN1W5Ykl13wLBiKv5S+zy H//nUK2pzMntG9CSYhcrizPHlXcHL5Z/9HkOnIcL/rACKuUiA8Arw68H9TRL0/jhE/bc 1+BMHlmtJOOS7ECSB2WjPLccs2hSYe3KrQtCHCpvBdGGIZaP90fpNfXEqAibNeR4m4Ir Qo4VW0a0BMricXh1cfiKGWmQnd9vnINbt2du9zGjiT3bIGXd2BuUW1p7SlHwaAi2ic5U iP3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=VyIvUmYS; 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=126.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v38-v6si14762673wrb.114.2018.05.29.18.52.03; Tue, 29 May 2018 18:52: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=@126.com header.s=s110527 header.b=VyIvUmYS; 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=126.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D16B68A3A5; Wed, 30 May 2018 04:51:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m50-112.126.com (m50-112.126.com [123.125.50.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C04968A316 for ; Wed, 30 May 2018 04:50:59 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=IdYurc7qKTbQjcvlLC oBeOo6+SPpkS8NC/YT2r37+lM=; b=VyIvUmYSlosfNOYp4WDV4rr7QQFOwFm9JL 87oOWJBX9W11cwMDObllGP50Z7A1WoY0Pm8P/vc/4nqhzBOeuASRuFVFu2L5sSoC 9KFAbjdxeXmN/cEqW4XC09XybfFfPllU6KQ8EXtIVlDMDVW/khXMACZlCvTsCv3N Ol6O+/w2M= Received: from localhost.localdomain (unknown [111.203.130.77]) by smtp6 (Coremail) with SMTP id j9KowACXpQ03_A1b4C9RAA--.748S3; Wed, 30 May 2018 09:19:52 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 May 2018 09:19:47 +0800 Message-Id: <1527643189-2860-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: j9KowACXpQ03_A1b4C9RAA--.748S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ar4ruF1xurW7GFW5Xw1UWrg_yoW8ZFyxpr 13Xw1UGrW3XrZ3Ca4vyrW5Aa1rCFyagFn7W3y2qw1jkFWS9rWkJryDArWxGa92q39FqFya 9Fn0ya1UZw4UJrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jqg4fUUUUU= X-Originating-IP: [111.203.130.77] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiLRlW6VpD43Uu5wAAsN Subject: [FFmpeg-devel] [PATCH v3 1/3] lavc,doc: add avs2 codec 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: hwren --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 +++++++ libavcodec/version.h | 4 ++-- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index efe15ba..3d08bb9 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2018-05-xx - xxxxxxxxxx - lavc 58.20.100 - avcodec.h + Add AV_CODEC_ID_AVS2. + 2018-05-xx - xxxxxxxxxx - lavf 58.15.100 - avformat.h Add pmt_version field to AVProgram diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fb0c6fa..ce5f307 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -409,6 +409,7 @@ enum AVCodecID { AV_CODEC_ID_DXV, AV_CODEC_ID_SCREENPRESSO, AV_CODEC_ID_RSCC, + AV_CODEC_ID_AVS2, AV_CODEC_ID_Y41P = 0x8000, AV_CODEC_ID_AVRP, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 79552a9..e85492e 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1395,6 +1395,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSLESS, }, { + .id = AV_CODEC_ID_AVS2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "avs2", + .long_name = NULL_IF_CONFIG_SMALL("AVS2/IEEE 1857.4"), + .props = AV_CODEC_PROP_LOSSY, + }, + { .id = AV_CODEC_ID_Y41P, .type = AVMEDIA_TYPE_VIDEO, .name = "y41p", diff --git a/libavcodec/version.h b/libavcodec/version.h index f65346a..b9752ce 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 19 -#define LIBAVCODEC_VERSION_MICRO 104 +#define LIBAVCODEC_VERSION_MINOR 20 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \