From patchwork Tue Sep 3 01:02:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 14856 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 F392F449F2B for ; Tue, 3 Sep 2019 04:03:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2CD3687FA1; Tue, 3 Sep 2019 04:03:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D84DC687F19 for ; Tue, 3 Sep 2019 04:03:08 +0300 (EEST) Received: by mail-ot1-f65.google.com with SMTP id 67so3580656oto.3 for ; Mon, 02 Sep 2019 18:03:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9jiZyjwGNij4sVYqC4z754X0oHMKwRxPGGnrmz7vxyo=; b=j2g0qQ36BO4Q2T62pwXJOqoExYYIm5ylcHc0jqc6XuzQ+xmKplWp5Mv2n31BB1kcid cNvZbksNCRliiNC451gQkFbyAgddsErOZzsj5z/pqjeCmjQFtLxotgDh5Uyomd4x5hL+ lZ2maVvaCILA2YLoJIqZrCJW8cqVdD3iQvfqV5nbme4Zf6UBduWxc7yc6LtBwZ/bZ4Wb mVY8YWPcffjByg384BPA0ozMFB39bHAiomWO9hcJHhgyo1D3khdXlXQ5ZWvNlxYPX0lz 7fRiRlHNVHx3+GHpxaNApRd41Y4LrKzCqQMoujV2CopA7PnF8ZsCnayhGaM9jB4twWNB VtkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9jiZyjwGNij4sVYqC4z754X0oHMKwRxPGGnrmz7vxyo=; b=DB4TGYWQYcDARKhDe+XPq5Nxn5fo5Gj15xWGsoQVYyeZgG9FTBrS0KH5SaVXcGmEpA 4wQ/llLs7ci7r19+Y2vFe9euxMC2+nY6wYW7CnNYItDoVkcn7lTj71TNvxVGT9IEm7OR ajonSMA7K4TyTPWbjnaXUD8VaQjNuwxRdM2q1fM3/yAGvpHFqpr8dlu/fk2H0LWEPM5x qz8XtQ6JF1oRMv3lbDLp08BRjHXzA0bbi26CmbL+Z0Z8XVW0R0+gVGeUGMeR5L/RzNTt pCgoJcQ7pqPmC93fzRMdNGTOQ4GoqxTsT4jizBNvjeKZbPDhRtXn4tg9VsFiQB078k0l ccfA== X-Gm-Message-State: APjAAAWaUlNGgnXMFQ9ZraLkckPf3dmCK+0HchQj0jiaDwJC8UXmNIEP qOlscFUzRZ9E96lDpqdhMsaUjOZ9Z2U= X-Google-Smtp-Source: APXvYqzEU4JS0HRq2cTqysjO+00BhqkqJhG385ajVYMkbKXrYTenD7AfC82k0YeX7FBPQq41313kFA== X-Received: by 2002:a05:6830:1e96:: with SMTP id n22mr13573201otr.368.1567472587284; Mon, 02 Sep 2019 18:03:07 -0700 (PDT) Received: from tmm1-imac.lan (ip184-189-221-177.sb.sd.cox.net. [184.189.221.177]) by smtp.gmail.com with ESMTPSA id a21sm4299633oie.9.2019.09.02.18.03.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Sep 2019 18:03:06 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Sep 2019 18:02:17 -0700 Message-Id: <20190903010230.96236-13-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903010230.96236-1-ffmpeg@tmm1.net> References: <20190903010230.96236-1-ffmpeg@tmm1.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/25] avcodec/v4l2_buffers: split out V4L2Buffer generation into helper method 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: lorusak@gmail.com, Aman Gupta , jorge.ramirez.ortiz@gmail.com, Aman Gupta Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Signed-off-by: Aman Gupta --- libavcodec/v4l2_buffers.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/libavcodec/v4l2_buffers.c b/libavcodec/v4l2_buffers.c index 784ea94d4c..721e01420b 100644 --- a/libavcodec/v4l2_buffers.c +++ b/libavcodec/v4l2_buffers.c @@ -322,13 +322,7 @@ static int v4l2_buffer_buf_to_swframe(AVFrame *frame, V4L2Buffer *avbuf) return 0; } -/****************************************************************************** - * - * V4L2Buffer interface - * - ******************************************************************************/ - -int ff_v4l2_buffer_avframe_to_buf(const AVFrame *frame, V4L2Buffer *out) +static int v4l2_buffer_swframe_to_buf(const AVFrame *frame, V4L2Buffer *out) { int i, ret; struct v4l2_format fmt = out->context->format; @@ -354,8 +348,6 @@ int ff_v4l2_buffer_avframe_to_buf(const AVFrame *frame, V4L2Buffer *out) is_planar_format = 1; } - v4l2_set_pts(out, frame->pts); - if (!is_planar_format) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); int planes_nb = 0; @@ -387,6 +379,19 @@ int ff_v4l2_buffer_avframe_to_buf(const AVFrame *frame, V4L2Buffer *out) return 0; } +/****************************************************************************** + * + * V4L2Buffer interface + * + ******************************************************************************/ + +int ff_v4l2_buffer_avframe_to_buf(const AVFrame *frame, V4L2Buffer *out) +{ + v4l2_set_pts(out, frame->pts); + + return v4l2_buffer_swframe_to_buf(frame, out); +} + int ff_v4l2_buffer_buf_to_avframe(AVFrame *frame, V4L2Buffer *avbuf) { V4L2m2mContext *s = buf_to_m2mctx(avbuf);