From patchwork Mon Jan 13 04:11:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17314 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 59D4D449F25 for ; Mon, 13 Jan 2020 06:19:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E97468B0C7; Mon, 13 Jan 2020 06:19:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 832B768B0AA for ; Mon, 13 Jan 2020 06:19:22 +0200 (EET) Received: by mail-qt1-f196.google.com with SMTP id n15so8031113qtp.5 for ; Sun, 12 Jan 2020 20:19:22 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=XTGlbinFKOsJeA9c0zAvm5gRb60jOHstSSCt+WrUH70=; b=s4x8WRuyJEhduw9hxckjEswNnUzY41dUaJllbVaE9BXtkzVqzpmdB7gs7v11JYPiQy UWIsgF/LmQDeuFhN+s1r/jlIAIHQimel+Q+uVge/GckQn4Jqm0Mq/yBuPUEZuKhRmUeo 0xp6cAJEihobi8j3L9pYZQgkI8TnmiywyP3keeYrv/p/FOqXxqC6qCfVC2CfrPOBBQWN ovFCg0nAtpItx9BAG2WrB3PWirWExCir6MsFV6dznlxtrUg2tzHbcgLqCHCohA1ASH9j TYkFQYbp8LbyCRvSTdin4q4ZF4aczZPvbaYKn4SYN3FQ1JG0XDpftXYVJdM1XGELqnVq Bbfg== 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:mime-version:content-transfer-encoding; bh=XTGlbinFKOsJeA9c0zAvm5gRb60jOHstSSCt+WrUH70=; b=OavBVGkfDvl8fxECqTrPSOFJbiFWmrDdUFxo8ay+0cWCeo5pbAo0vJ/60OUlHAtNxY 484RxkqvCIv9uC0FxxbsMLPV/9AG5W3flXE6oMdlycOiR0+9mYZwAJTuwlMCH7VFLwH4 QQWGcB5MBuIDw+DWm5DxbLpBOS9UVm2i0Q+wwaExF/XFdr6mw0lAiTF9LtJvJEoRceNh rsaHVoKnsHA1pwlTN7sQ4a0SQDZV++FkA1t9I7CInn0iN5NTYGeigRMPwl9fitGEEJf0 0w8cdwhtkJoZ1lZ9FwJDQUGg9stF+tVyerAcXtmyY1+NjqpSzhLxisKdRoWX1LrYXjuu g4bw== X-Gm-Message-State: APjAAAUdZtpkDLbsmVwaSFbmHcVgDWPh+GtiO8bFQoq2B415k1kRblKH zLdNsIV9O2gLxlaJoFnNg46x4Xf7 X-Google-Smtp-Source: APXvYqyUIaG36lPcljQoZ1PqRM5c2PcHWb5RkmAD/VKinn+K/FjOn434XeWO5U4cIXrt/keHKLLZJA== X-Received: by 2002:ac8:747:: with SMTP id k7mr12666925qth.120.1578888716090; Sun, 12 Jan 2020 20:11:56 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id u57sm5087630qth.68.2020.01.12.20.11.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jan 2020 20:11:55 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jan 2020 23:11:27 -0500 Message-Id: <20200113041130.30126-3-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200113041130.30126-1-andriy.gelman@gmail.com> References: <20200113041130.30126-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/v4l2_m2m: Simplify capture buffer init check 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Before this commit s->avctx == NULL was used to infer that an encoder is being initialzed. Code readability has been improved by directly using !av_codec_is_decoder() instead. Signed-off-by: Andriy Gelman --- libavcodec/v4l2_m2m.c | 4 ++-- libavcodec/v4l2_m2m_enc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c index 1112d71eadb..b5a9fd10347 100644 --- a/libavcodec/v4l2_m2m.c +++ b/libavcodec/v4l2_m2m.c @@ -176,7 +176,7 @@ static int v4l2_configure_contexts(V4L2m2mContext* s) } /* decoder's buffers need to be updated at a later stage */ - if (!s->avctx || !av_codec_is_decoder(s->avctx->codec)) { + if (s->avctx && !av_codec_is_decoder(s->avctx->codec)) { ret = ff_v4l2_context_init(&s->capture); if (ret) { av_log(log_ctx, AV_LOG_ERROR, "no v4l2 capture context's buffers\n"); @@ -307,7 +307,7 @@ int ff_v4l2_m2m_codec_full_reinit(V4L2m2mContext *s) } /* decoder's buffers need to be updated at a later stage */ - if (!s->avctx || !av_codec_is_decoder(s->avctx->codec)) { + if (s->avctx && !av_codec_is_decoder(s->avctx->codec)) { ret = ff_v4l2_context_init(&s->capture); if (ret) { av_log(log_ctx, AV_LOG_ERROR, "no v4l2 capture context's buffers\n"); diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 8059e3bb48f..98b9dfc2c0b 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -312,12 +312,12 @@ static av_cold int v4l2_encode_init(AVCodecContext *avctx) capture->av_codec_id = avctx->codec_id; capture->av_pix_fmt = AV_PIX_FMT_NONE; + s->avctx = avctx; ret = ff_v4l2_m2m_codec_init(priv); if (ret) { av_log(avctx, AV_LOG_ERROR, "can't configure encoder\n"); return ret; } - s->avctx = avctx; if (V4L2_TYPE_IS_MULTIPLANAR(output->type)) v4l2_fmt_output = output->format.fmt.pix_mp.pixelformat;