From patchwork Tue Dec 5 22:35:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 6558 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp6234685jah; Tue, 5 Dec 2017 14:36:01 -0800 (PST) X-Google-Smtp-Source: AGs4zMYUTx643MnYE8wrYO4k4KAAezpjyzj2gyQLAiB0SSLCV1XWkiNzhx79b2UDbL1bDHLyz520 X-Received: by 10.28.14.195 with SMTP id 186mr7404199wmo.56.1512513361406; Tue, 05 Dec 2017 14:36:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512513361; cv=none; d=google.com; s=arc-20160816; b=kishPJ08ljhgMS0KfEGDvxiE3eFBjUSH19vJT1KhjDmAlqSagMoVUEBldopMT8S853 MyLhJ9A/uf5rRnahSTbNB630C1L28q8BZIcJFuqncDPMXjMWlU5iOxyboN9GMccHXUc7 Gh78kr77psJt7qz47CVoQX3DTd7xQP0ogofj5+f6CT3Qo8vn7Gy73hhEE7jRz6VKLwqJ W8dIpS6e7fev9xMkpSWQsvPLEkHbPkA91AlMMGrXkCQaV/vx7KWyX3bIT8sZQlghexfT i/oJ6DNoS554D5phdaJqYYENw9eyxQskh0Ytv9GWodiGa1MOgYiP2oKbPoAanctPIfy0 ojSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:spamdiagnosticmetadata:spamdiagnosticoutput :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:to:from:delivered-to :arc-authentication-results; bh=kOe1EjyJzPXteje06Bk7vMRa1UXNlYciOy9eZVS1+nM=; b=NzoRi/FdNcBJ4TJw/jL0BxF61Zm2EkkG3hlf/bdlMriQtrSazlIqYJBYlixhTwjsCX L8HAnwlZ0TP6hWXUt7ZgEFmybRJcBxMIrrPu86iIFygQ5xIepb2tm0whlCAjX4G2n6y2 W6wgDrgc7qCRYuL12VgdA/NAh6RgM4FLxJSJEtHjQ1WkEWJAWldwuJyGToCmMyQWhp7T rkgWYTsLvn9XWTt939opjbTCy2u3UpXHJXAZpaVECxcGTW6WboYCk7ctVWkILX40V3Px +fWXHQvDu2TMb6Ng/yQ41PZWXYjscO5UoVcvbntLCtyZl0dHhFj9KqxYgPRw/9jIcv8D uW6g== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g29si842676wrb.457.2017.12.05.14.36.00; Tue, 05 Dec 2017 14:36:01 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B805068A190; Wed, 6 Dec 2017 00:35:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069091.outbound.protection.outlook.com [40.92.69.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B7CA689809 for ; Wed, 6 Dec 2017 00:35:46 +0200 (EET) Received: from AM5EUR02FT013.eop-EUR02.prod.protection.outlook.com (10.152.8.56) by AM5EUR02HT192.eop-EUR02.prod.protection.outlook.com (10.152.9.192) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.239.4; Tue, 5 Dec 2017 22:35:50 +0000 Received: from DB3PR0202MB3452.eurprd02.prod.outlook.com (10.152.8.60) by AM5EUR02FT013.mail.protection.outlook.com (10.152.8.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.282.5 via Frontend Transport; Tue, 5 Dec 2017 22:35:50 +0000 Received: from DB3PR0202MB3452.eurprd02.prod.outlook.com ([fe80::f8c4:4dc5:8552:d274]) by DB3PR0202MB3452.eurprd02.prod.outlook.com ([fe80::f8c4:4dc5:8552:d274%13]) with mapi id 15.20.0260.007; Tue, 5 Dec 2017 22:35:50 +0000 From: Stefan _ To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavcodec/hevc_filter: implement skip_frame Thread-Index: AQHTbhlnCCHAgfacn0+x/VFx4Pd8XA== Date: Tue, 5 Dec 2017 22:35:50 +0000 Message-ID: References: In-Reply-To: Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:482A3C7CF0F2ED0B6BD397A86272A1BD314B2AF8F8DDF6B80E0EBD6E87DC07F5; UpperCasedChecksum:1C469855B163CAB554A4A26A4350EF1085ECE29F9C469F5C2878449687EDCE07; SizeAsReceived:7244; Count:46 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [6mNfxgGGVcqQhKsFhyTq67H6bhC92QKBKtOO3r2QFaBY5s71qzge14F3AIbkDCqc] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM5EUR02HT192; 6:2GS3E4Z+urEPpuvSajiblqRb8du9eKK9Fji0IbhpGG2nBMuQYOOqaDAQfqYxJ6N4luzTeSVjr/qc3maK8yjoHSGjt23Qj5+5bXoomtwLivSKvF6o0Wl2aCodM6PFqj5LUBo8r6Iewe+Rl8V6dmmf4RNtAuXwOR8WbJGoyJaFSJ8PyVx+GBvkIzUBHOYM9q206WmOg8csqhdPE/xgSJOWQmTClQgftd3QXsKHUJCCqYQbwXmDbJ1QP1hI7MWj0Fx0pDWMjrm6psWKzDVW1LPY6FN2+CdhLeDxF/R3+pqvhnGavkScOimPE5dOWzd45oOecJVIgvpeylcV6jdPayJahYrrdtE7qmDugQhlb8Z1VB8=; 5:EaDEGf80SRH4ZhyGDMQUE5oZM9w1sHJqoOZixCEDaz12uwmW9GtCC6RoxU3AST9bFqJ5mRg5MnUM9TbWQmxVxTsaDm8TuaWJflb8tcOTia28toc9Wwdce8xD2yDyuSK9KktXLNH0xKwP5opuozYsYoV4VCoQO13dk0qTEYF4Adk=; 24:x77/vWLVH1a0F3G+5Kj+jZvAHi6x03SZrQ00hyN6B4r8zVcVL2de5eQlqe48+nhiq4dxgXiXF9zhGZ1FBWfWyll41207r/q+JvoyV6SqNDM=; 7:UXaSr7bazO9XTBeJJuvXckSp6eEm1d4Dd/VJ6+4GNzGcI77FPQX5JSmtTDrbLBVLlIh7RM0qEVkNKAXV5W7IJ3ZaIw5Gn79GW9CLIBld79Hrur0DjD/4kiXRWQZ2lmoxNZ3ryJhte51yBahzut77J+zA2WMCF3QraF3xrkOjcFa906UaIcDCuxeCeYYiP60mRNclA6PTZSUbQk211zUMPoHetpvfs4CVGXLom9sdiZHHiGJVKvgLVYLBczUJMqXR x-incomingheadercount: 46 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1601125374)(1603101448)(1701031045); SRVR:AM5EUR02HT192; x-ms-traffictypediagnostic: AM5EUR02HT192: x-ms-office365-filtering-correlation-id: 3f54b6e9-ad47-482b-b397-08d53c308920 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:AM5EUR02HT192; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM5EUR02HT192; x-forefront-prvs: 0512CC5201 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:AM5EUR02HT192; H:DB3PR0202MB3452.eurprd02.prod.outlook.com; FPR:; SPF:None; LANG:; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f54b6e9-ad47-482b-b397-08d53c308920 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2017 22:35:50.6766 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5EUR02HT192 Subject: [FFmpeg-devel] [PATCH] libavcodec/hevc_filter: implement skip_frame 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On 04.12.2017 at 21:06 Carl Eugen Hoyos wrote: > 2017-12-01 0:22 GMT+01:00 Stefan _ : > >> Attached patch adds full support for skip_loop_filter >> (all levels) to the hevc decoder. > Will you also work on -skip_frame for hevc? > > Carl Eugen I gave it a try. The different levels should all work correctly, since I compared the "effects" to a H.264 sample. 'make fate-hevc' passes. From 8ee08adebd9994c3517c692cc99f0839d3d8f7ca Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 5 Dec 2017 23:26:14 +0100 Subject: [PATCH] libavcodec/hevc_filter: implement skip_frame --- libavcodec/hevcdec.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 433a7056ea..37f2ad76eb 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2905,6 +2905,13 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) if (ret < 0) return ret; + if ( + (s->avctx->skip_frame >= AVDISCARD_BIDIR && s->sh.slice_type == HEVC_SLICE_B) || + (s->avctx->skip_frame >= AVDISCARD_NONINTRA && s->sh.slice_type != HEVC_SLICE_I) || + (s->avctx->skip_frame >= AVDISCARD_NONKEY && !IS_IDR(s))) { + break; + } + if (s->sh.first_slice_in_pic_flag) { if (s->max_ra == INT_MAX) { if (s->nal_unit_type == HEVC_NAL_CRA_NUT || IS_BLA(s)) { @@ -3028,7 +3035,29 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) /* decode the NAL units */ for (i = 0; i < s->pkt.nb_nals; i++) { - ret = decode_nal_unit(s, &s->pkt.nals[i]); + H2645NAL *nal = &s->pkt.nals[i]; + int is_n = 0; + + switch (nal->type) { + case HEVC_NAL_TRAIL_N: + case HEVC_NAL_TSA_N: + case HEVC_NAL_STSA_N: + case HEVC_NAL_RADL_N: + case HEVC_NAL_RASL_N: + case HEVC_NAL_VCL_N10: + case HEVC_NAL_VCL_N12: + case HEVC_NAL_VCL_N14: + case HEVC_NAL_BLA_N_LP: + case HEVC_NAL_IDR_N_LP: + is_n = 1; + break; + default: break; + } + if ((s->avctx->skip_frame >= AVDISCARD_NONREF && is_n) || + s->avctx->skip_frame >= AVDISCARD_ALL) + continue; + + ret = decode_nal_unit(s, nal); if (ret < 0) { av_log(s->avctx, AV_LOG_WARNING, "Error parsing NAL unit #%d.\n", i); -- 2.15.0