From patchwork Wed Dec 6 18:52:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 6567 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp7317163jah; Wed, 6 Dec 2017 10:53:04 -0800 (PST) X-Google-Smtp-Source: AGs4zMbismp3iHdhQuMsllNfML0nQjlfGkpC0QSw/LmLwrhGc5NeI/iMnjrqd672QShUpWvt2DhB X-Received: by 10.28.92.4 with SMTP id q4mr10069266wmb.42.1512586383967; Wed, 06 Dec 2017 10:53:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512586383; cv=none; d=google.com; s=arc-20160816; b=xTp0Y2bZdJBdehZATFeFveXaJpPf+f0Xs/K/NqnDo4cfDyGnQuozOVFS+rAs0Roeme +w4vxxuFa8CckFqG7vXIR7HvQc2WSqPRxB0bvlXVLjXsfL028EaCXUy1wzPlVWK/7pFu gr6oYTKAeg732ZvqrsTW6llaioUgQoAoQ/8VxmwPVnnWk/T4sTjbHjPTVTl3AvWk0ciF BpZhQiGEvpv6wtjv1cnB6GKj0IrUlXJY+r3z7pE75+eQ4xTXkXkHqGdFRA0VN6ep8aD9 OnlTX/3BD0gAycIzLCDFJX17N1sDAfQp//eBKuUHNG4CW1F0bf6ykipVNyzSSU/99sW5 +ToA== 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=zFD30Aiyz6K1paV+GuGrVeb5Wwwcff+jOmZGFi3synw=; b=1B2xHTFGX8b+P1WpSYZKSqNeiDGY2iOpIAQCa75fCqMoGViEjqzo7l/3teDs1pck1x 1iPN32BcZVYblSCFJaFqROictEKrRzoo+gGG4vcALpK0HHcJpKqEWoMUI4pXOmQhcwQM cjcpFtFUr6d4/OGHcka0pj4zXe1v4YCnr10z7nQ2JZL9IVH10a83/5qek+eoNTCRImYG dY6aIxvV7rDzriwO7jfHNKfQJdG+8Rj97QZeBLWbNFQkUrpdwDR/3OFLUjps6IXECBro kalXxc5lY4ulqnZKlPoQ1XwpoupJAuXqOBgAYU4IwjJbDyqRESOScqhOUu1BjdjxI7wa eDfw== 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 u68si2122445wmf.151.2017.12.06.10.53.02; Wed, 06 Dec 2017 10:53:03 -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 9867C689E70; Wed, 6 Dec 2017 20:52:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072075.outbound.protection.outlook.com [40.92.72.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF692680960 for ; Wed, 6 Dec 2017 20:52:48 +0200 (EET) Received: from AM5EUR03FT019.eop-EUR03.prod.protection.outlook.com (10.152.16.57) by AM5EUR03HT176.eop-EUR03.prod.protection.outlook.com (10.152.17.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.239.4; Wed, 6 Dec 2017 18:52:53 +0000 Received: from DB3PR0202MB3452.eurprd02.prod.outlook.com (10.152.16.59) by AM5EUR03FT019.mail.protection.outlook.com (10.152.16.104) 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; Wed, 6 Dec 2017 18:52:53 +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; Wed, 6 Dec 2017 18:52:53 +0000 From: Stefan _ To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v2] libavcodec/hevc_filter: implement skip_frame Thread-Index: AQHTbsNrnv0HzD8EiUyvRn4S6QrXnQ== Date: Wed, 6 Dec 2017 18:52:53 +0000 Message-ID: References: <20171206173207.GP4636@nb4> In-Reply-To: <20171206173207.GP4636@nb4> Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:81C2C2F83E1FBC081EAF4F057267C62FEBC1BD9D79F02522639131B8F60B55AD; UpperCasedChecksum:14D99F48C0881BF3AD8647AB3A14200C52C4A402A24F1CAAF85F5116310CA9E4; SizeAsReceived:7292; Count:46 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [uooPIKW7Zafqpn3rZJrj8HmqoN8OugpT] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM5EUR03HT176; 6:8IMT5LNPEhey5jtH18GxZYOcZkb3X8lD6ujfY3k32GYzUIes+OMb7MrqTzR47LgB7bwYeZcU6OczWVGdCS+Ooh46/3rKDvpU8GZjOyCF4tpsT2HmAdpefjzvn4u2nlLja9t1IWrsoeTnDKaeigCKWcCsgbdXhrOC6SfBdKQ3AzJGiAPn3JqfgCKGzNcSewl2Z8U+5K1L+dCp7ROULYQlwq9ydLdN3fEk88PQc0UPsNZoep1ZA3fmECn77/7bcJGzW39ptKb9Ja0DnXsBeXlu1PuPnvfG7lhDjYIu2qsCucIggQw6BeAwT48BuSyLZ9cSmquW8yBJSLKUTLE5Fmi/SWk6rcYvTDfg+/o9NSoG+8w=; 5:CLmbo5Dp2aq+LEC8a+0JoH66Iw5xdcECfkUW/2u026+JbgSaQ3xXanhQKmK4/RbUuqtJB846MDVxthJojW86IWIDjKQx552M31pYRCeJfPCvAtR9TjvHlf1mCaYQ+eahFLSZfwCTx20aN2Bdvp4ZB9Tb+2xG9YSmW9lwjL8uI04=; 24:51B6TlD22TMf0PhiB1muud76IGZUUDuW23SsBAsW5WBt9By7T50bRGHjHSU8rcfSgTT3fSYO8ElvaEHGeyly5uLa4xAORRfeP+EO/kABPYU=; 7:Yqq2N/NErBNjl+4PBhdW+JMnHdr+DizFrf+5SKpkU9QJzbIV5F/M/ED1dd0pmmWUD4ToVNBmdnVAZnY5EEZIDQsckMFl4WmTl20617kg2IF4jL0mMZYRf1CQNtpD7xrLQMEvGOoZjLWzZKUsdzt5a+YlkjJoFXwe2bbcmvpI8QpJm7Zu501ngXJK/jamp5HemaR3bS/XU1EU1+yTtZJd/WuP2fLXL+MoZEXtHAS/zO6BT7/fouG1tZ33OFbRtpG8 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:AM5EUR03HT176; x-ms-traffictypediagnostic: AM5EUR03HT176: x-ms-office365-filtering-correlation-id: 0ad9ab7c-6399-4508-e203-08d53cda8de2 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:AM5EUR03HT176; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM5EUR03HT176; x-forefront-prvs: 05134F8B4F x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:AM5EUR03HT176; 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: 0ad9ab7c-6399-4508-e203-08d53cda8de2 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Dec 2017 18:52:53.2536 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5EUR03HT176 Subject: Re: [FFmpeg-devel] [PATCH v2] 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 06.12.2017 at 18:32 Michael Niedermayer wrote: > This is duplicated, it should be moved into a seperate function > > [...] > Done. From 7a9651040c1c4815d82712cb98dbd7bcf8c085bb 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 Also move AVDISCARD_NONREF check into inline function. --- libavcodec/hevc_filter.c | 20 +++----------------- libavcodec/hevcdec.c | 16 +++++++++++++++- libavcodec/hevcdec.h | 20 ++++++++++++++++++++ 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index 94fb7cd3d1..6b9824088c 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -842,29 +842,15 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) { int x_end = x >= s->ps.sps->width - ctb_size; - int skip = 0, is_n = 0; - switch (s->nal_unit_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; - } + int skip = 0; if (s->avctx->skip_loop_filter >= AVDISCARD_ALL || (s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && !IS_IDR(s)) || (s->avctx->skip_loop_filter >= AVDISCARD_NONINTRA && s->sh.slice_type != HEVC_SLICE_I) || (s->avctx->skip_loop_filter >= AVDISCARD_BIDIR && s->sh.slice_type == HEVC_SLICE_B) || - (s->avctx->skip_loop_filter >= AVDISCARD_NONREF && is_n)) + (s->avctx->skip_loop_filter >= AVDISCARD_NONREF && + ff_hevc_nal_is_nonref(s->nal_unit_type))) skip = 1; if (!skip) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 433a7056ea..4bfae8c12b 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,14 @@ 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]; + + if (s->avctx->skip_frame >= AVDISCARD_ALL || + (s->avctx->skip_frame >= AVDISCARD_NONREF + && ff_hevc_nal_is_nonref(nal->type))) + continue; + + ret = decode_nal_unit(s, nal); if (ret < 0) { av_log(s->avctx, AV_LOG_WARNING, "Error parsing NAL unit #%d.\n", i); diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index ef918f4fb2..b311edc8ae 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -548,6 +548,26 @@ int ff_hevc_frame_nb_refs(HEVCContext *s); int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame, int poc); +static av_always_inline int ff_hevc_nal_is_nonref(enum HEVCNALUnitType type) +{ + switch (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: + return 1; + break; + default: break; + } + return 0; +} + /** * Find next frame in output order and put a reference to it in frame. * @return 1 if a frame was output, 0 otherwise -- 2.15.0