From patchwork Thu Dec 7 19:56:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 6590 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp8713952jah; Thu, 7 Dec 2017 11:56:28 -0800 (PST) X-Google-Smtp-Source: AGs4zMYFTcoyQUc01ErpMC1wOU3WlkAmJYmMtfN8Jz5+eF2vxJoAvJlBa1hv5/XaMADuOrVb+him X-Received: by 10.223.195.22 with SMTP id n22mr26927342wrf.212.1512676588789; Thu, 07 Dec 2017 11:56:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512676588; cv=none; d=google.com; s=arc-20160816; b=yNpZJGz4o8wWcW4RMukHE/Fj5XyuYiqM5Pvgh8/nKgzTFM41x6Fz1thHBbcdzQAoVA bVuBMuomTCewgvbZ/FH8ltlk4v9M+toaMqJ8o3cAUQ9kMdAtGcEWZP0DMif3LZHz/JWc amnBgz4XWoiGnGGPIuIG/IrNlcsqxyxznLGvjrs1TG5pgK9geIsb2RMLA7h5YOYQw7m3 42VmEvgFFpJ4ZfBpMiEkmf+ZH9Ycc48YM8XVeSNbQFYwcSgGvDtuDZabdZ4uGqXe9y1o G7vYf5HxbPjkOjK0DTMAjeks9uS75cqhxsOjeMmqgqmWf32bYp+iAVLyVsyNTYVNCign 3L/w== 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=eX4AF9mtnDxn3PKhVjwJNCgwXkcjq6ObBjTZ+DE2qEs=; b=iIzh/23nNLmgCq2GkExQaMfooQ7KlMNRQWGoJGkKtD7fzPGA45S2o7vWoYO76gAJFV pz1DX9GRYjjbYDloTjoPFeozA3gw3Zvn67uOdOuZWgQdLVsiUmm2idKmHOQkNmEZLj7w 1mXI2jIcXkPiBHfxITEq888/usADQeJbQ3dJ8vLTDjXOeIQvU9QbvdSnpNFUQHlEDxW7 1bGvfJZHQVKwlZfzFwtARR7KZqCc80TbL3kP5B7d6/JQnPexyL5MSJHgSEFDIXYU7zRi Ocwixwv9fI1HiFgYdhsNUPOfi801GV89WtjznRV2neIFAUOoZI181Lv76AOpbBGQIHyd kuTQ== 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 v205si4071128wmb.181.2017.12.07.11.56.28; Thu, 07 Dec 2017 11:56:28 -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 BDD3268A356; Thu, 7 Dec 2017 21:56:15 +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-oln040092072102.outbound.protection.outlook.com [40.92.72.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CD8168A34C for ; Thu, 7 Dec 2017 21:56:07 +0200 (EET) Received: from AM5EUR03FT013.eop-EUR03.prod.protection.outlook.com (10.152.16.56) by AM5EUR03HT075.eop-EUR03.prod.protection.outlook.com (10.152.17.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.282.5; Thu, 7 Dec 2017 19:56:13 +0000 Received: from DB3PR0202MB3452.eurprd02.prod.outlook.com (10.152.16.55) by AM5EUR03FT013.mail.protection.outlook.com (10.152.16.140) 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; Thu, 7 Dec 2017 19:56:13 +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; Thu, 7 Dec 2017 19:56:13 +0000 From: Stefan _ To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v3 2/2] libavcodec/hevcdec: implement skip_frame Thread-Index: AQHTb5VvF+n08pIXgUeQqkYV0QAluw== Date: Thu, 7 Dec 2017 19:56:13 +0000 Message-ID: References: <20171206173207.GP4636@nb4> <20171207164149.GR4636@nb4> In-Reply-To: <20171207164149.GR4636@nb4> Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:65C5ED973E06462CFA15ABD8B761ADF82270980D79D48826648C1BFAA4209AAF; UpperCasedChecksum:45C99324CB2EF98AACC68D3D99F754FA34867C0A61895D12F0DA3B2C78D8D757; SizeAsReceived:7367; Count:46 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [qS19IpcP8M7xNoc9oTOVgk+S7CmolEP7] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM5EUR03HT075; 6:/xw8LIoCeD/B6rO2PGW15mlfQJ2sAq+/+rdMfHLoQpbfzK0l2gxijIyh1V1nxEZAgSBoJu99FB9GF+Mhz46UFCcI0U2RbGMOTtpsHAeNJRGp8XSY+Ypq9y677zrmsb6D+HkpXNkeXSmCF+MhmWtA2aZQl3ChHqwYEDkX1EzgnbFKpFi1A1ift33d9Htaj0HOEjB1T4tFRxk3mRdd1H3KJGCWFa8Tixe3r5nrFUdHNYHZsEacTDWMSlNidhqPl7cHeKpwQfJS02MzEC+rruORR59Ws09vGRfzqNnKXOL6hLNjvqYkkUGpykH3lvt6+Wz+OQwO/6iYZtgLzk0qfxBsHqoBXUI3wUc907D5V/hUFSc=; 5:YV+NZTal3qr5c/OWJSqWB5q05j9Xu8/trJFNlvagZG7Ad3ERwZM8EpfTqw+02INo1wuV9U5fL7bvYi+SwtLOfA8REpnA0JjjsjHu0WV4mCsIpVoleB5z2IPp3d6VfUJF7WJFM2HnQSIOmIk7v8v33bmF7baKRtdBnacBfj8hLHE=; 24:Ux2paxhyzkpuQnqZuEmMkQR0qPHonUTwwh1nnt5tSoc2NqdGV2brAd9D0jduF/y2upxbuaNNbAv3yVx8uRcsC98FbbNrtH7FaCwcOfOZ9eU=; 7:lf2y8KPMkT9eMaIbraamuDdYGT1IvFu5q3EL9PIEkg94a8SW6NNOfT5+odfDJ+QzlvUl/Krt5Edzfp6SP/oNObvNUF+j5HHVxVjLnYxJf0Cd4zDrichyzY42GOAtGpE55wUyg+L+z64gDvq2hWwpZDbouHksYaXKQZDKD/lOC76/ZjdzZZXog6pPy4qT5o5Zt4pjY2RYBC6t4mWM0DNS3buZpCNJWhGEkFgXyNCLG/H+BNkWlGSAmspEdI+IITyb 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:AM5EUR03HT075; x-ms-traffictypediagnostic: AM5EUR03HT075: x-ms-office365-filtering-correlation-id: 46229a41-9ff1-4bd3-2c00-08d53dac917b x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:AM5EUR03HT075; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM5EUR03HT075; x-forefront-prvs: 05143A8241 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:AM5EUR03HT075; 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: 46229a41-9ff1-4bd3-2c00-08d53dac917b X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Dec 2017 19:56:13.0668 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5EUR03HT075 Subject: [FFmpeg-devel] [PATCH v3 2/2] libavcodec/hevcdec: 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 07.12.2017 at 17:41 Michael Niedermayer wrote: > The move and the functional change should be in seperate patches > that keeps changes easy to read and understand > > [...] >From abeb2b106a64d96b216912d4272a734b123b62e2 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Thu, 7 Dec 2017 20:40:35 +0100 Subject: [PATCH 2/2] libavcodec/hevcdec: implement skip_frame --- libavcodec/hevcdec.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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); -- 2.15.0