From patchwork Tue Aug 7 09:37:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 9925 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp4285424jad; Tue, 7 Aug 2018 02:37:48 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcgdRykvrnco7/TZkbHNVnoNjY38K0x/kwD3xmsQHqqN2JZMtrFfc6LUc2lI+QV3luL1+Aa X-Received: by 2002:adf:ee4e:: with SMTP id w14-v6mr12590316wro.63.1533634668625; Tue, 07 Aug 2018 02:37:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533634668; cv=none; d=google.com; s=arc-20160816; b=UzcOmUzq9rSiURvLb0YWDo/liGaWpO0v4Lv2KTMf3EMA2YUxQ9h/VI0ccCv89p/Ceh 56+VJhEAW5gQwKOw2h/xWAmGZ6sEdR0fEeiYkjHkN+GkU8cisFmlgJXhK4UCc7Y3q7Ll vWfQIbNL2LJrKu5Zc0INYAhJ4sOeesOakCDQWMMZzgfBTdplS8w9+GcLpfN373bRWhP5 paovlQGlempgF9FnffpnNAO5EGCRDBL6d0Weop0UcCCQxWU2JouCRFpB3gH6fN8gGqC9 KE4Fy8XDBccyxGCzdbOT7XYbi/lKm/2LWRmHfzyXg8DDj5nfPFonyTWSVY6r1T3evLHk VSaw== 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=dM3U/fXrYCYmZLVNuUiLIH6Dg48vY2YTEA3eR+MDFYc=; b=mBM03QBlgfKbIfh2YbO7h9xR/AQclnJAcJbGAA0wFR80Tlu1406oFOw6j3ghno/SXc wdQERIFTfPEYY6YRBbR6Y9O2ekG24LStKanWGzzw3owR/GMXpu8DMTpj0hOX+mfupBIE stkdrniIsnhmAHjTIEjUNzmyRGkUSccolj+DVWD0zh8h21ng1y0pHjJqSO0XB3XB1yM0 0PlZ3rUE8EvDdzSJBKMP5gO3ZDMcYOsqV6oz6ayCqtKe5E590mbeePHIQNAO+E/VPxJP 7tJOKlYifBv8phi+i2oapjZc39HHUZxEVLkpehu7ZYw0LBiWL6MHRD9gVTl54HQmsG/B zGBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=caM7RiJ4; 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 t128-v6si860596wma.154.2018.08.07.02.37.47; Tue, 07 Aug 2018 02:37:48 -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=caM7RiJ4; 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 A45C2688351; Tue, 7 Aug 2018 12:37:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-114.126.com (m15-114.126.com [220.181.15.114]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D09F680643 for ; Tue, 7 Aug 2018 12:37:17 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=TNVBnV+jNXykKQNUFf m/YjmmV5U/47zyQgIX98FPne4=; b=caM7RiJ4ZMLpxF4JsmHVk7U2JN0rrHez89 4lSr8EGHzUP6DiyhS4u4Rn77T58KwpN0P7pQPt99kbb5kAlovi08wK9iwRRuzuE1 ykBTtzO/wNaKofSAuvvxskgkpfwzVDKoWyxZ8KZvHHBKkt0Y4nTHAbH+60pU7k+M IFBknYyFI= Received: from localhost.localdomain (unknown [223.96.67.129]) by smtp7 (Coremail) with SMTP id DsmowAC3wshcaGlbRDN2HA--.34960S3; Tue, 07 Aug 2018 17:37:35 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Aug 2018 17:37:30 +0800 Message-Id: <1533634650-2998-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: DsmowAC3wshcaGlbRDN2HA--.34960S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxJw1ktw4kCw4kZF43Wr4fAFb_yoW5CF1fpF 17Aw4xtFW7tFZ5Aw4kJa12vayUCr98WFWxJws29w18KrWSgryUXF1FvFy7u3Z7ZFWqvF9x XrsIv34UXr17KaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bjTmDUUUUU= X-Originating-IP: [223.96.67.129] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbi4g2b6VpD5+npSgABso Subject: [FFmpeg-devel] [PATCH v3] 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..9cc86a2 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("libdavs2 AVS2-P2/IEEE1857.4"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AVS2, .priv_data_size = sizeof(DAVS2Context),