From patchwork Tue May 16 08:27:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wiki Wang X-Patchwork-Id: 3675 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp353570vsk; Tue, 16 May 2017 01:27:49 -0700 (PDT) X-Received: by 10.28.154.86 with SMTP id c83mr6681286wme.94.1494923269162; Tue, 16 May 2017 01:27:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494923269; cv=none; d=google.com; s=arc-20160816; b=y9s6VLSEFKoKB6hhG3lGiZgIaMR2APc5T3yFBsZqri3Wm2ASZl66yq7ahgpz6+ZfQD dow7t3N9dVVErHnYKFIJxdntPSf2UwexxHIaeqSrWa31y6l3HmnvJdbfgOjhtgSrdk5s RNDHPMHDOHfCSyAu/7R8WFKHJMr6/IVTFgerqhU7oo9Ouj/ue2BjxGc+sO4T0MSH/959 6NnjCGRnZAEgIChw1VkzZeknT1e+zb2XqDTXkKQGm+VNkl06kZl4HebcrZpyXenMbghj jdvd70Br3Vv76M8LPLW9zsClqU43v9DXBt163xmq+uCQ/GBIccsJ5KfvANR66spHwM9x XQ+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:spamdiagnosticmetadata :spamdiagnosticoutput:content-language:accept-language:message-id :date:thread-index:thread-topic:to:from:delivered-to :arc-authentication-results; bh=S2mwcrnvKBmmz0Czjyoas2SVjdXhZ0bdf8c5Con1Njo=; b=JCIXMfKRgOCoGzlBRONQKqcb6qdXlK6g5aAXGEeSo35oYMJL9EPj2qUAC9z2TgRrlT l+PIqt2olYYlW4BdPZJT4jVcagGD/Zg2iqevM6KdQyPARSD5cicxuF1bX53hQbkWQVpg MxACUn9L+KPct8ubUiYxy3qhYDw3kxl1J1U+fGUW+jZfcGlBGjsdiwJdCymkLry7rYDd oIt7/bxZ/nVylI+s/vbjHKcu0qkEuH/yIOwnwxN8y93/H+e5Qv0zdJEGUULt6bYqPJZa 3bi212jLJbM/YF7j2Q07MfT8+pyC6SSm64RTAjP7Gs0sLHkTdCt/pIuwHtrXghvSOkvD J/SQ== 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 w189si1658356wme.106.2017.05.16.01.27.47; Tue, 16 May 2017 01:27:49 -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; 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 9BDF2689800; Tue, 16 May 2017 11:27:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-PU1-obe.outbound.protection.outlook.com (mail-oln040092254108.outbound.protection.outlook.com [40.92.254.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4E2668065E for ; Tue, 16 May 2017 11:27:37 +0300 (EEST) Received: from SG2APC01FT063.eop-APC01.prod.protection.outlook.com (10.152.250.60) by SG2APC01HT185.eop-APC01.prod.protection.outlook.com (10.152.251.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1075.5; Tue, 16 May 2017 08:27:33 +0000 Received: from SG2PR06MB0601.apcprd06.prod.outlook.com (10.152.250.56) by SG2APC01FT063.mail.protection.outlook.com (10.152.251.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.5 via Frontend Transport; Tue, 16 May 2017 08:27:33 +0000 Received: from SG2PR06MB0601.apcprd06.prod.outlook.com ([10.161.10.151]) by SG2PR06MB0601.apcprd06.prod.outlook.com ([10.161.10.151]) with mapi id 15.01.1084.029; Tue, 16 May 2017 08:27:33 +0000 From: Wiki Wang To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] avcodec/cuvid: Use a dummy packet to flush cuvid. Thread-Index: AQHSzh5DJdDjeGTVxEKmKUNzkqeIww== Date: Tue, 16 May 2017 08:27:33 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-slblob-mailprops: /ntUcd07daeON38pmuRIIyjFZ5LimZxDJ+9djfCZfdhD9xb7B1oUbN0Mojfh8DDHzt1tHLENaaPo6DXjbWgtxMKMP+p+Uk67cgwaaHWsqzp5cfJZN/S6ZcfCsuwmwcBqI6AwTXzQlvz3PdD8gOAnSPerhudUNdD6DPsFd1pJGzjTakKkn0Um4BE6+FbLzLp52KppHGo9zD8cZYJ21FDNuN3Mo4/ZesCOAWjXPjb1kTT7IPYGBLeT41Gy7H11Gqch0BWuKuLgNfEhXSsqDhJTA6IWxqqYgF3J0lomO9HBGRT4ySe+Ur2MdS2YpJeIIN4zYnj161Plfwd58I3q3XVsMByTX18dMoq8WyGJ3sElBUuz4mWdB+8cJf7L1cZf79gK4mG7Pj3NyrAOCEHR/pKODq6AixHElH5V+EynU9Wmo05JQX9bOyeVPeO3yhZSsywwx05OtVEdrig1w5oIhLs/OqgY8SwLzIYm8kUCSFalEk1n6Q7mR9OYvlzcWzbze7hCGNuYR/8y4Ja/sa431bWxtVcECAtIL4FDV93QaHZiBir13p/DLUv4/HMb7yABOlvATMhNI8LDMlp5/Nmkt7VC/BJ0KZDajBO4Ffn/ZQVByBmzHoPWf3CyqCE4UvHuY9zIlC8qU9uhs1Yfuz4vCKEUX/kuGtt2h8rlcXJGXTb04ukkMCaWuKxU300qRfVo5dV9XZdD7FxjdZoSR9itYBeOnVm2KKq2Wlwh authentication-results: ffmpeg.org; dkim=none (message not signed) header.d=none; ffmpeg.org; dmarc=none action=none header.from=live.com; x-incomingtopheadermarker: OriginalChecksum:BDF265689026603C44FB7D99A1B06EA7089B7CB97EB66EBB34C5E7BFFBF7535B; UpperCasedChecksum:FC647C8A2E9C3DF776FFC3B2062DB5B322E4B9243E9994E961C59624F9849DEB; SizeAsReceived:8689; Count:42 x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SG2APC01HT185; 5:wS5/mtltZOu77J50VOdqTt6hVurIeLAnFGF3spYNUV8uNImd6X0PGQ0FvjqaXhzwo/oMCMEsanY4y1oMQbum0ts8954IQjeqtrybg5xjufEcXdQvNIXAs0V1G1izJyaFUTLkKNbE5euw+2FYjEsnhg==; 24:I08+hnMIOo5TUBqwszlLCI1+AplLcDjDCy9pV/IVBjJUJSyh77pwMjMtxzjEuwopzKzTEkxJOe3fywe2QRUQCIDSWbvOL6Uf5m0UE8ongVI=; 7:1RI/sFn41ORK2QBtAJBeKlN5eohato1yyX5+qOfdlcg1SMJGzmQVURlcHa9jx4fjLRQaYCP1eTE188saJQXfweGRRHIN4L9WytqXaIYvYUioW4sWwd8LEvgE3XoBQZ5br3yEfPGdIR8ABXmJBQ/a5I4u7AAGGwKbFehhbFZRjALunjJJZiwYr8aAGV3XJSnQbR5NiT8wjBe9TF5t51DkMepPzJcXDNvV6hAq+Ac4VKQWdk26r/fNj+KrTqFDMJs+pNCSzye75alp+/LTkEvV7xBC38RimEpod5GDkvNS0Lo0jGFEpAYKGEHVupJ/MZcZ x-incomingheadercount: 42 x-eopattributedmessage: 0 x-forefront-antispam-report: EFV:NLI; SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:SG2APC01HT185; H:SG2PR06MB0601.apcprd06.prod.outlook.com; FPR:; SPF:None; LANG:en; x-ms-office365-filtering-correlation-id: ef02fe53-9eb8-456d-5995-08d49c3564e7 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322274)(1601125374)(1603101448)(1701031045); SRVR:SG2APC01HT185; x-ms-exchange-slblob-mailprops: NS9Gj58uCj1ppS2ZIc5KJB/9A4O/NhGTG0kfmnzWwEYtoLeuWp+YRobYctDOOYqh+PJhmL1Q4cmKIbL7W7cKJRG9FKafMmbQDDdSYLvnzCV+4bXHB6JVL3rt/KNviRfiKE5zdcklkuxIjimTz7mEkbfsLcDUpagC/vjAcp8kCIfANJGP3/KIW5mLCtyzoICxx557YMxVgf2/M8lIEI6qpc+DeezvnaJAGeB251ymWMi3VzqnIK2RiGZc65BOfmxNuWNIepYkNkXjekYHfTHRCvd/fpY+hZZNAoba+6aZzvKs0n/JpiyHzPyUpb6mzMqIXBzXXwZZYaKjBsUpX4V37oWVPEUioGryo99k+I9EqjYRH8po70fNDieMhLZ6xAbTW0ScQIQ+OdZ+bEWJRQ7M1kunQygNbkTRqBw1U9Fn/VDxgVuTKMNatXBbAI2g2C1iBf60Ni5JWHlY6yBEcU3FIDMQ+ZISMZSe/mwRv6VtunejbO0cWi3wSYVM+NwJRMIUJiVa4NTe4wP6SejxnrFpCTT+GlBvbbl3vM124HGmDXORDMg0YUz46EnD6ZG0XU0GNHoDbrot7GYSBnk+xAYfNb1qNLPL9UUicuUP3icDvjlCTARHbfnDLCeE43ITfe1N89LbksMPQ6tqXJPm7PFtAjZtGPKvr6qJWWlx+82CRieTkwE8dJSU4aMxYpVbWdYNpGjq4/shvQR03JGVG7cfAA== x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:SG2APC01HT185; BCL:0; PCL:0; RULEID:; SRVR:SG2APC01HT185; x-forefront-prvs: 03094A4065 spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: live.com X-MS-Exchange-CrossTenant-originalarrivaltime: 16 May 2017 08:27:33.2917 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2APC01HT185 Subject: [FFmpeg-devel] [PATCH] avcodec/cuvid: Use a dummy packet to flush cuvid. 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 Cc: Wiki Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/cuvid.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c index 218be8495d..0b1710bd46 100644 --- a/libavcodec/cuvid.c +++ b/libavcodec/cuvid.c @@ -1029,20 +1029,13 @@ static void cuvid_flush(AVCodecContext *avctx) return; } - if (ctx->cudecoder) { - ctx->cvdl->cuvidDestroyDecoder(ctx->cudecoder); - ctx->cudecoder = NULL; - } + seq_pkt.flags = CUVID_PKT_ENDOFSTREAM; - if (ctx->cuparser) { - ctx->cvdl->cuvidDestroyVideoParser(ctx->cuparser); - ctx->cuparser = NULL; - } - - ret = CHECK_CU(ctx->cvdl->cuvidCreateVideoParser(&ctx->cuparser, &ctx->cuparseinfo)); + ret = CHECK_CU(ctx->cvdl->cuvidParseVideoData(ctx->cuparser, &seq_pkt)); if (ret < 0) goto error; + seq_pkt.flags = 0; seq_pkt.payload = ctx->cuparse_ext.raw_seqhdr_data; seq_pkt.payload_size = ctx->cuparse_ext.format.seqhdr_data_length;