From patchwork Sun Jan 19 15:52:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 17423 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 DE91E44B653 for ; Sun, 19 Jan 2020 17:53:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BA69668B0B5; Sun, 19 Jan 2020 17:53:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30FAA689F3F for ; Sun, 19 Jan 2020 17:52:54 +0200 (EET) Received: by mail-pf1-f194.google.com with SMTP id q10so14501046pfs.6 for ; Sun, 19 Jan 2020 07:52:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=DC+G4rO1qAY9OK5ttppFmQ4blimRXqdRw15yfGZtCTU=; b=M9fb4ruwNU81TV0mQLl8zrzkRZJtaNslWPtIVG2NnHVlmIS3IKrzttcC46QsTfpHa2 MVM6aoQLQURlNZnpjjSwq1OogURd/dDhPBubh7xCbfBOtsfTyShhXdPNuhfzA6iFSvlL C+nSFqziNTC1QTbj0UEai++vUvrZRTpMbWpLpvUXOjy8R3fRcFwId+bWt4zJ6TIGzB88 QMuSvmIdTYMv4Z8Zqvq3cI3ptdzsCVGzMxRB05uikkWsHHtvviv8QRB30HJcAtKJ1S4s pMB+ZPd4/S+h3iZSSy2WWb/jNve9XEXF4aIpBcVVpR5hA8RxylTVWi+Th9Jit3lp1Q9U 2q2Q== 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=DC+G4rO1qAY9OK5ttppFmQ4blimRXqdRw15yfGZtCTU=; b=M1awh9dH2THlP21Zpnm3dBNB3d845u9KXex6gxUA1f7ePbGNWdSfnAiWbYLicJxx7Q 2jtwRil61ZeM/ueUOch3J2dU3h8725NGEM1/wjAXym4jwzYSJ4aeiOTnptJkf/bi5lDM GXQEiBVv9fPbwBNqdyXPlThk8xNlzgxIddj01a0GHOAHBoePXlpGWH6/M7dzGGRCRWx/ O1S7f9SDEJA/W5dQQ/kUvf2egHIp++AArc5kFIGZQtsPOVyfAWMKsBfI4WE9dPyk4Nwg TX1i4LZJy/LN5eyqhCgEH7X0XDihM+V6fEPDcRjSTBQSPYb2V+B02p2nAJDoyr8aMlIt R/UA== X-Gm-Message-State: APjAAAUM6ZpbqhCrYSe64YenVzsuEijYFEt1t8DHRgoE39ToDJwYiHWc mO1sFlFaWwEri47XPjwdDjRHw8Rt X-Google-Smtp-Source: APXvYqyaBHthhXjLNN7ea6ZLgB0NXEPi82R9lquLAeun1tNCrVL6EsnBsllYwfwjg1EgWyvrXvUFLw== X-Received: by 2002:a63:289:: with SMTP id 131mr56506718pgc.149.1579449171719; Sun, 19 Jan 2020 07:52:51 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id z130sm34819520pgz.6.2020.01.19.07.52.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Jan 2020 07:52:51 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Jan 2020 23:52:45 +0800 Message-Id: <20200119155245.3297-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1] 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 77bf887..3dc15a4 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -437,6 +437,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;