From patchwork Mon Aug 6 14:42:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 9914 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp3348420jad; Mon, 6 Aug 2018 07:42:24 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfogmrJOUpozcb+cJ+jcUclE7YIvicBdGltGM7sDEEoCuTpqKEXyqArJFmBiu4EwK+YRUI9 X-Received: by 2002:adf:8481:: with SMTP id 1-v6mr10292737wrg.34.1533566543925; Mon, 06 Aug 2018 07:42:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533566543; cv=none; d=google.com; s=arc-20160816; b=XzeV2FDyHfXkpicZce5ET9PId0FUsWNU1piR3ZojkX4ld+nOq4tnmkInwcxXeR/kyi nSizDCN4XGuNzA4BBrA0oO+C0r0cLILzNpjHeQl3yQJK1Nn7a1rff3xODTp3VJQOoZEY vqpWlGoLsIguOnHFUYf5PSErIz09XGUBNH6EZESyoLaXcnpb37l5kUy9UtIcV1568zKS SJxbuIqXPiJbl5vzrt1wiGSWXeh08N62fcubNA5TYYk1nDehPv7p+A961u7vz/wC0Dx1 SqawY4OxcXLReWAoPJ2eT9CBvMMDnGguv2LVU6zqwVUCEYJi3AHIwCmNuVxuWmWlmHEr CY1A== 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=mcvtsZq7dQXZcTFoWNSODlHzCT5yah/SQr40ab3+JMA=; b=lEnnLHVFI+EOg7D/ADyS/mzOwJ7NpprjpEB0JZ8SgVlyv0GQmlpSUfwINqMwzBmhs0 zTkwp8hWQH5jp0XHq92cajR62zhIUkOXFIZQtbzn6I8BKI33r7PYbnD8xMxVvzjhwmjh 5tS/1190usXl+O85TWHtjdjv3hGEczJmPqlB5UyPbCBE8VpgktfpksXMvim0+JCIXjzV 0/NDhJUCbCtyjVn0kP4dyJakDN7r6yek2OeTPsCYhs95tFYFgN8EFXnfc0UR2p2A+1PE m2a92gYNkM+KYYxspf14CGDXcsgJJO3zB9htUGegFJuP3t8SNSgP7Opt2cwybnXdPgN5 JQJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=df2EYVjv; 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 v11-v6si9421937wro.458.2018.08.06.07.42.23; Mon, 06 Aug 2018 07:42:23 -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=df2EYVjv; 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 9484268A45A; Mon, 6 Aug 2018 17:42:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-113.126.com (m15-113.126.com [220.181.15.113]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1048D68A412 for ; Mon, 6 Aug 2018 17:41:54 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=y6kpBo3cQZWrq9ip9Q oCmh0I5MTtHFZtF4dDMaXgHZw=; b=df2EYVjv5q7ZXhBUSMBhBA+0ELKsBdvZ0/ e3w55qc6QG+5c8KccKCvVzoacbWlHSy9pb7n9x8B6OFfOd2g7QMhl0Ce8HjyV2uh j+jPLyb9Q4Nyfps0mo8UdCblUqABbPlEgKLo6u2oUfNlzn4575Z+uxnszyWfUh7N Xl46AFi6c= Received: from localhost.localdomain (unknown [223.96.65.102]) by smtp3 (Coremail) with SMTP id DcmowADnEuVEXmhbWcMDEw--.51897S3; Mon, 06 Aug 2018 22:42:13 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Aug 2018 22:42:05 +0800 Message-Id: <1533566525-8967-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: DcmowADnEuVEXmhbWcMDEw--.51897S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxJw1ktw4kCw4kZF43Wr4fAFb_yoW5CrWkpF 17Aw4xtFW7tFZ5Aw4kJF42vayUCr98WFWxJ392vw18KrWSgr1UXF1FqFy7u3Z7ZFWqvF9x XrsIv34UXr17KaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bjfHbUUUUU= X-Originating-IP: [223.96.65.102] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbi2wWa6VpD6HyTZwAAsU Subject: [FFmpeg-devel] [PATCH v2] avs2: Correct expression error and simplify log 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/decoders.texi | 2 +- doc/general.texi | 2 +- libavcodec/avs2_parser.c | 2 +- libavcodec/codec_desc.c | 2 +- libavcodec/libdavs2.c | 5 ++--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/decoders.texi b/doc/decoders.texi index 9439b7b..31e96fb 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -49,7 +49,7 @@ top-field-first is assumed @section libdavs2 -AVS2/IEEE 1857.4 video decoder wrapper. +AVS2-P2/IEEE1857.4 video decoder wrapper. This decoder allows libavcodec to decode AVS2 streams with davs2 library. diff --git a/doc/general.texi b/doc/general.texi index cd725bb..3d15840 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -19,7 +19,7 @@ explicitly requested by passing the appropriate flags to @section libdavs2 -FFmpeg can make use of the davs2 library for AVS2/IEEE 1857.4 video decoding. +FFmpeg can make use of the davs2 library for AVS2-P2/IEEE1857.4 video decoding. Go to @url{https://github.com/pkuvcl/davs2} and follow the instructions for installing the library. Then pass @code{--enable-libdavs2} to configure to diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c index 520e98a..1c9b342 100644 --- a/libavcodec/avs2_parser.c +++ b/libavcodec/avs2_parser.c @@ -1,5 +1,5 @@ /* - * AVS2/IEEE 1857.4 video parser. + * AVS2-P2/IEEE1857.4 video parser. * Copyright (c) 2018 Huiwen Ren * * This file is part of FFmpeg. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 2fe4aaa..1cbb241 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1398,7 +1398,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .id = AV_CODEC_ID_AVS2, .type = AVMEDIA_TYPE_VIDEO, .name = "avs2", - .long_name = NULL_IF_CONFIG_SMALL("AVS2/IEEE 1857.4"), + .long_name = NULL_IF_CONFIG_SMALL("AVS2-P2/IEEE1857.4"), .props = AV_CODEC_PROP_LOSSY, }, { diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index 12db1f9..76e345a 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -51,7 +51,7 @@ static av_cold int davs2_init(AVCodecContext *avctx) /* init the decoder */ cad->param.threads = avctx->thread_count; - cad->param.info_level = 0; + cad->param.info_level = DAVS2_LOG_WARNING; cad->decoder = davs2_decoder_open(&cad->param); if (!cad->decoder) { @@ -59,7 +59,6 @@ static av_cold int davs2_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - av_log(avctx, AV_LOG_VERBOSE, "decoder created. %p\n", cad->decoder); return 0; } @@ -163,7 +162,7 @@ static int davs2_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_libdavs2_decoder = { .name = "libdavs2", - .long_name = NULL_IF_CONFIG_SMALL("Decoder for AVS2/IEEE 1857.4"), + .long_name = NULL_IF_CONFIG_SMALL("AVS2-P2/IEEE1857.4"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AVS2, .priv_data_size = sizeof(DAVS2Context),