From patchwork Sat Apr 18 04:52:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19039 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C1D8244B90E for ; Sat, 18 Apr 2020 07:53:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 94DA168BD9F; Sat, 18 Apr 2020 07:53:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 84CE768B6A3 for ; Sat, 18 Apr 2020 07:52:58 +0300 (EEST) Received: by mail-pl1-f195.google.com with SMTP id g2so1765099plo.3 for ; Fri, 17 Apr 2020 21:52:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=sIwPelKOYq0wL8dygyywiMjts3t2MR/PlUi3uCghve8=; b=bX8tt0BNFmQQxv57DtXWhnQ4Su8ANGxKfui5UCCld2wuzzAPEzuORm8q+/lGfLJ4YV eHJBvjlOdfCjqKRNYClXcfwhfdR519qv98U4ggnQpfxIeZ6cwFV2UZR2+/fmmI9BpKiY rmvszeb2lm2Z3rqMzVWKzazyu69C2LUDLz8hWYdRlzRXG+lI95SGZc6mEO2iOLuxg/JV 0gx8dvPS/q4Kj4UDS47ofNR8+sRDLHxZx/3KyuGKF+qkq/HsZ5mE6HFhGVD29MEA//yE 1+C3YW7SZs3fa6nuKdMAX2nCDLJJftgQgTaUgt00aGbHlU2C08LifVTW3elwhTWtvwS2 0fbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=sIwPelKOYq0wL8dygyywiMjts3t2MR/PlUi3uCghve8=; b=K0KbItH5DcsuBkG+QqN6n33ZxcbvsUDKzbo+IqGWb4JushOjuooQ1n6RSQ3mAx2xsM N/YWfdtJ4RgM9YX2HhTAMcgdPmIGGLJJFu0F/uk2EZOZRFZi9NsiTaavK1PdgOkQzKdh aK0YfzqLaCaAq4dkejEk3/coI8CmPpZU6QOy3qVu6nsCDUKWfX4Sn0b0yJBBiuXA2QxR yY2dW7yeGEMHGLOSNG40s70touFKke8uekYCMzNuiJ0AwlINL042AW6mWSDcnVCDhNdK Nmo9hcHXu0mteGGQTe+dsczp5qnLXfmzhpmBSPbaFMXG5ouHFjGxgi5PwERUUQ27tIOF wT1Q== X-Gm-Message-State: AGi0PuZdCWfuGL/S3TWPu7X1ghCTuJi5GBwXrSZThrYBVxOpNqDSA54A IvQwvprJeaw+FZ6FG2CHg7gJmx6c X-Google-Smtp-Source: APiQypLvrU3FlHPNrQgCqCrhy0ISO3WtDCsyRzLS6kqQbuk5ztiJB/C0nE6NzSCHgQKzDO1cKpnfZw== X-Received: by 2002:a17:90a:252b:: with SMTP id j40mr8739485pje.60.1587185576276; Fri, 17 Apr 2020 21:52:56 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id y26sm15992769pfq.107.2020.04.17.21.52.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Apr 2020 21:52:55 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Apr 2020 12:52:47 +0800 Message-Id: <20200418045249.8057-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v3 1/3] avcodec/libx265: Fix Uninitialized scalar variable 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang return error if unknown picture type encountered Fixes CID 1457234 Signed-off-by: Limin Wang Signed-off-by: Limin Wang --- haven't merge yet, so rebase to the git master libavcodec/libx265.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index e42c7b4..573ecc8 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -550,6 +550,9 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, case X265_TYPE_BREF: pict_type = AV_PICTURE_TYPE_B; break; + default: + av_log(avctx, AV_LOG_ERROR, "Unknown picture type encountered.\n"); + return AVERROR_EXTERNAL; } #if FF_API_CODED_FRAME From patchwork Sat Apr 18 04:52:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19040 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id EB92544B90E for ; Sat, 18 Apr 2020 07:53:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D791368BEB7; Sat, 18 Apr 2020 07:53:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D86A68B6A3 for ; Sat, 18 Apr 2020 07:52:59 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id v2so1751265plp.9 for ; Fri, 17 Apr 2020 21:52:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3kC+hDiv92AeXdVkyZOR/4udXzE+brjC0zpE64MyJd0=; b=BVLkS5bjGMxgYz1QA+9LScD5Sdmn0yF6jqWV7w5GIlPu5TncbkHarCMrIFdC+thm4J hEysp5E7SGIXbd5PBTFZ43V+GHLevSb/K108pSreB9Vcv7QKvGcuaevOQU2G9GwFyoJ0 cPiViRl+dbSq9sUZ9bWqM7/t+Gb5XF8Ya4TgKGEHaW+73YvsJab1EsjNONJsXCVgAt9l 8de1zxNyNwwDQgUtya+FQhRFf77HFD99BIOH4c1fsl2n9iO5wlBfAwXFPzLSOw77DCPC kQZb5v9X+z1tIkiRUp5LTLmh4Ocqqgy9+wNbmeKrxnsyqe3HIXdFOOL4WoQN9mFbMdxB SMmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3kC+hDiv92AeXdVkyZOR/4udXzE+brjC0zpE64MyJd0=; b=qlWQNjZdJ2hro/tJLM33uqvn24IbZ5/PiY5N50mtE3VQ32nu5dFKkauLWo7zCVIo7h QpVWcK6A1N8C2sXhCosGIXlLoKx0aX700PzhnT+5m9ru7MvHYripXddZMYH7NcVnoT5r K9wlE41oYMFsvvwoDK6mNXIVJaWZjn0V2PkG+iAAvO4pGrGIJdvVpd6XHJ+k/LR/18MI hL4riNnS669GHGVNMrgub2tekCAZ7e5loJ2qDDwKWUL0d0UK5NPOBHMXJ+fzA1mELXeT eMB878jLroblkBpg5KOKcBB/tGSZB67Fxfu9IKfI6q+e3WtkGTgoERT8S3fYZZTS1gxh bucw== X-Gm-Message-State: AGi0PuYo2UaX7UKMk9vutyGPhk5NPBa47prAYJ1YElyOXTO5rOhvQsTu Dx1lgHZCNAcFMLBrJ8YceiKtC70N X-Google-Smtp-Source: APiQypIfEXiLY7GJLwBCC6ADvJl6qhVETJQdie4wcJVuDg+2N1aF4xM+LPeLlBlob7sgBECxTQ2x/w== X-Received: by 2002:a17:902:aa88:: with SMTP id d8mr6708705plr.201.1587185577706; Fri, 17 Apr 2020 21:52:57 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id y26sm15992769pfq.107.2020.04.17.21.52.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Apr 2020 21:52:57 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Apr 2020 12:52:48 +0800 Message-Id: <20200418045249.8057-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200418045249.8057-1-lance.lmwang@gmail.com> References: <20200418045249.8057-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 2/3] avcodec/libx264: return immediately if encode_nals return 0 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang x264_encoder_encode can return 0 with nnal 0. As a result, encode_nals will return 0. In this condition, it's better to return 0 immediately to avoid the following unneeded pict_type and flags setting. Signed-off-by: Limin Wang --- libavcodec/libx264.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index a08fe0c..edd343e 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -447,6 +447,9 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, return ret; } while (!ret && !frame && x264_encoder_delayed_frames(x4->enc)); + if (!ret) + return 0; + pkt->pts = pic_out.i_pts; pkt->dts = pic_out.i_dts; From patchwork Sat Apr 18 04:52:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19041 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DF7FA44B90E for ; Sat, 18 Apr 2020 07:53:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C273F68BEE6; Sat, 18 Apr 2020 07:53:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA81E68BEA7 for ; Sat, 18 Apr 2020 07:53:00 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id k18so1757998pll.6 for ; Fri, 17 Apr 2020 21:53:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bUzYXHNdtwG9/E2jg8e6KZE10JId2o5JZC9or7JDQd8=; b=SOW5YYoyiI9cUNH5cdtOQA85/EVyWsBTTUUdVHxgPKrBj2z7bB9il6je1kHnToxmmA 6g3R1nzR3VDevqiUgWgAUf2ouofjVxuh8VeQJCy9wMXQtZRz+CqjVDPzItZ7zM+k4YHQ 4ERCWKxheY++wI+6vzYSB4Ux5TEyuTehCf6Vxzg5eiblRWimVGlWoKdUuQKHf4coZVF7 DwZSZmmQ2UK9WRRosOV2H67BmtcOxjEZL7peTufGdLfS2pNo4msCNfDIv9thIMuREY4q wDQRyWL+/wWtKByQ5WoiYCK7/mLrlNxL9TlbiayGtxL7PFwEK5xclWTVYUIbfUgWDHEd HdUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bUzYXHNdtwG9/E2jg8e6KZE10JId2o5JZC9or7JDQd8=; b=aqLXYAJyaMI6DZV2bdq6Z7k+fC82BrIX+3nCZne54167UAwJivsSrk/OlhfEFyqm1t 9wWkC6Zq4FHGPnZ0FaccFBQy7BFazgBJQAgKvEiN5w+OOUL9N9FJuw/YIi92mzHQsNy8 gulCXWJB7DKpjNPwBu8ABWz4zjvegaMzhFpE+FQLRY06pMo7SHR9xEenLaGtLRl7g+fC CPNSJbMExPzIoZJoSmAKZyPBM+plXaQugNvCypGtJA1R3wi/zw7snQCs8JQ4a9y+ia8B +1JKf8xGt4gTG4AXYfTLn1yr3vGRGB2YEnJsjK5aRHEmWpq5TrRjUOpLv8xMPXr2y2Ru aCZg== X-Gm-Message-State: AGi0PubBg175R5w41pHh5lL7lcAGuQTHkhehEsjn45jxOVJ7MVLG0V8C 09mLPuG1lProgglIrig/Rs8T5KHD X-Google-Smtp-Source: APiQypKduXGJdZcSGSI/GggWQI1sZIFnuHWno78ZaZxz0IfBrDU5ZT8Pf/J2BhVUkHMUMficirP1HA== X-Received: by 2002:a17:90a:bc4a:: with SMTP id t10mr8541569pjv.104.1587185579054; Fri, 17 Apr 2020 21:52:59 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id y26sm15992769pfq.107.2020.04.17.21.52.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Apr 2020 21:52:58 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Apr 2020 12:52:49 +0800 Message-Id: <20200418045249.8057-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200418045249.8057-1-lance.lmwang@gmail.com> References: <20200418045249.8057-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 3/3] avcodec/libx264: return error if unknown picture type encountered 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/libx264.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index edd343e..3fa2311 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -476,7 +476,8 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, pict_type = AV_PICTURE_TYPE_B; break; default: - pict_type = AV_PICTURE_TYPE_NONE; + av_log(ctx, AV_LOG_ERROR, "Unknown picture type encountered.\n"); + return AVERROR_EXTERNAL; } #if FF_API_CODED_FRAME FF_DISABLE_DEPRECATION_WARNINGS