From patchwork Wed Nov 9 19:36:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Buzdyk X-Patchwork-Id: 39244 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp506052pzb; Wed, 9 Nov 2022 11:36:29 -0800 (PST) X-Google-Smtp-Source: AMsMyM4AAFmru/xWNoZK6v0DumFu1rYX+njpiT+EUnz4IwTEqFx/W2AV45OZosg+sFvryNzIpil3 X-Received: by 2002:a17:907:9603:b0:742:9ed3:3af2 with SMTP id gb3-20020a170907960300b007429ed33af2mr57188501ejc.510.1668022588876; Wed, 09 Nov 2022 11:36:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668022588; cv=none; d=google.com; s=arc-20160816; b=S6E5w4WTvNbW/fCvKGH93WVCow1LkiMie9v/ifeoKADKrh/ezFKWNVwUE2nBAppHQt p/UPu1bnI8k97xxhWakGmPTOBGq8yGdkKa6PnzZJrev2oKjvNQuf187DQOvUsI5LYz3G 4+Jtsou8nuiYwI+/mkpoRVSNVVdGUPWNdmg3/GHi/kHawJwTbQ+4scHuDQUROCS3dcjH yo6TRAHv2MQFxqUKClTAS7kUj3cypo9Q97ZZb+Ee/f4JOwSqf/qAvXIc2kBblqPfkVh1 j2mqCc7OD+Ai90hPe2YHftoDiJ473Ix90VSjBXnsD6y+ZeweXBs052PbSFz9HZ9GtART IAXg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=WKf7p9RYmQyJQ/wEn/b0qvDHLLUhs4zAXPcEOqLO6OE=; b=fh+ZjWD0zXW0mVqMHffsqdIFr/NRjNBVpIo6jy5JZi0ErlfkxI/a1sx8/AeQjDLQzu TOV6Rt9jt0/ml/3CNrnLJ5WzLTRRfrKssd3EbtOh8PqXwWUhm+paHXoLEuSngCW3u3NW UHjcvCAru3ALWUPzGTYkfwj5rXcXss+T5Th1K7fNWDlcXTc/lGthKs+msYKuuPslFUNf 5wc7Bx/LI82njkGhmqXjrNz92aIIO62Ta7tQDIq4Uyj2TWKGIq/Ugpph+u+oPMrG2in6 DTbjHzBrNIqVzdL+9eqbniw6GeejY3QG+kHojb4NtFux3A39/Orpd+ar9OUQl4rAIkc8 R2CQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=J2lqwXa+; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds12-20020a170907724c00b007add8160fd4si14679600ejc.766.2022.11.09.11.36.27; Wed, 09 Nov 2022 11:36:28 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=J2lqwXa+; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2FB668BA98; Wed, 9 Nov 2022 21:36:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D93368B766 for ; Wed, 9 Nov 2022 21:36:18 +0200 (EET) Received: by mail-lf1-f41.google.com with SMTP id j4so27543329lfk.0 for ; Wed, 09 Nov 2022 11:36:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RTQCSPV37Y8EHi3OY5MKOr3mGdv16lrEHJMUYfobUuE=; b=J2lqwXa+zSl5vHsdSaUi3zoI5GfEVi2HAGFRoS43ZTowKuFnG+eOMzot+vuP0UsSyC ZBZuoaDE658OV8wz+All7BY5mPQfvAFhbo/Nhvn7gHUNJnJxbth0/0dKN4JCR20Vcugs CR2A8GMP8RBNWORHPAgZDgYmAIACisnbm64SClW4t+HFuKcH7RMIMZq8ZmeRfpjd2A37 1M1lyrGBN+od09VtAsm9GTPuwjwYjBkCnLt3FW7Th/CEDWL/pbMAJNi41+fK07Pw2ZH9 BuvBkTd9mmEqZ1CnsR//FFP3LQseC/b8YmZWt8Ax/teJWNxFsxkXXU4an0qysyJf36/3 z0Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RTQCSPV37Y8EHi3OY5MKOr3mGdv16lrEHJMUYfobUuE=; b=GKvm64cb85V2ngP3ceGj01g9Kr0MA4LzWIqGzh7jeHzDdumkQ1r3ZH1FbpSgKdJ4cl TV7XE0pi36GdvR75lTuedD4qf5YiphB/699aBMSBzr6//AQokwg9ALIWiXUed6NyR1AJ zF0tVzvd+wCK9Wf5E+RBHtQLjtmp/bFxk3E7hyBduQvb7vHVGdauhIeRLk7bL80opNOo tvVJfqYPuvij0Lcok7B66WSeJ+wvXZAfQkJeN4TbYW9exnmHyAHnz4920z86djk0YR7+ CDV7T6dvFRYubzi2lcEl5AYfg4jNnvXY39eZ9YbgWLNKOZ+33ayWdcyXEbkixL3HpfDk ybUw== X-Gm-Message-State: ACrzQf2MSFFdaKPnA/cmPa4L9u2CSbZ8OCBEyJJqtr6BToguAnb0GiD2 jtD6aCLBPLXoicfhLL+IIWp2shkskEo= X-Received: by 2002:a05:6512:b9e:b0:4a2:3ba8:fae9 with SMTP id b30-20020a0565120b9e00b004a23ba8fae9mr799531lfv.440.1668022577010; Wed, 09 Nov 2022 11:36:17 -0800 (PST) Received: from db360.apsetup.link ([37.99.37.17]) by smtp.gmail.com with ESMTPSA id v16-20020ac258f0000000b00494813c689dsm2357388lfo.219.2022.11.09.11.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Nov 2022 11:36:16 -0800 (PST) From: Dima Buzdyk To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Nov 2022 01:36:03 +0600 Message-Id: <20221109193603.55080-1-dima.buzdyk@gmail.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [RFC PATCH] lavd/v4l2: cover all bufer if bytesperline is set by driver X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Dima Buzdyk Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zGDYi+cKWIR1 Some drivers may set bytesperline if hardware use padding bytes for alignment. In this case lavd/v4l2 will expect W*H bytes per frame, but driver will provide Pitch*H bytes which makes v4l2 unhappy. This change adjusts frame width to cover entire data buffer aligning lavd/v4l2 expectations with data provided by the driver. As a result user will be able to get image stream from device, albeit having garbage in padding bytes. Signed-off-by: Dima Buzdyk --- libavdevice/v4l2.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 5e85d1a2b3..b1e837f740 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -83,7 +83,7 @@ struct video_data { AVClass *class; int fd; int pixelformat; /* V4L2_PIX_FMT_* */ - int width, height; + int width, height, pitch; int frame_size; int interlaced; int top_field_first; @@ -202,7 +202,7 @@ fail: } static int device_init(AVFormatContext *ctx, int *width, int *height, - uint32_t pixelformat) + int *pitch, uint32_t pixelformat) { struct video_data *s = ctx->priv_data; struct v4l2_format fmt = { .type = V4L2_BUF_TYPE_VIDEO_CAPTURE }; @@ -224,6 +224,7 @@ static int device_init(AVFormatContext *ctx, int *width, int *height, *width, *height, fmt.fmt.pix.width, fmt.fmt.pix.height); *width = fmt.fmt.pix.width; *height = fmt.fmt.pix.height; + *pitch = fmt.fmt.pix.bytesperline; } if (pixelformat != fmt.fmt.pix.pixelformat) { @@ -779,6 +780,7 @@ static int device_try_init(AVFormatContext *ctx, enum AVPixelFormat pix_fmt, int *width, int *height, + int *pitch, uint32_t *desired_format, enum AVCodecID *codec_id) { @@ -787,7 +789,7 @@ static int device_try_init(AVFormatContext *ctx, *desired_format = ff_fmt_ff2v4l(pix_fmt, ctx->video_codec_id); if (*desired_format) { - ret = device_init(ctx, width, height, *desired_format); + ret = device_init(ctx, width, height, pitch, *desired_format); if (ret < 0) { *desired_format = 0; if (ret != AVERROR(EINVAL)) @@ -804,7 +806,7 @@ static int device_try_init(AVFormatContext *ctx, (char *)av_x_if_null(av_get_pix_fmt_name(ff_fmt_conversion_table[i].ff_fmt), "none")); *desired_format = ff_fmt_conversion_table[i].v4l2_fmt; - ret = device_init(ctx, width, height, *desired_format); + ret = device_init(ctx, width, height, pitch, *desired_format); if (ret >= 0) break; else if (ret != AVERROR(EINVAL)) @@ -933,11 +935,13 @@ static int v4l2_read_header(AVFormatContext *ctx) s->width = fmt.fmt.pix.width; s->height = fmt.fmt.pix.height; + s->pitch = fmt.fmt.pix.bytesperline; av_log(ctx, AV_LOG_VERBOSE, "Setting frame size to %dx%d\n", s->width, s->height); } - res = device_try_init(ctx, pix_fmt, &s->width, &s->height, &desired_format, &codec_id); + res = device_try_init(ctx, pix_fmt, &s->width, &s->height, &s->pitch, + &desired_format, &codec_id); if (res < 0) goto fail; @@ -948,6 +952,24 @@ static int v4l2_read_header(AVFormatContext *ctx) if (codec_id != AV_CODEC_ID_NONE && ctx->video_codec_id == AV_CODEC_ID_NONE) ctx->video_codec_id = codec_id; + /* If bytesperpixel is set by driver then set width co cover full + * buffer area even if there are garbage data to be displayed. + * It is better to display padding bytes and give application ability + * to crop image later than fail to display image stream completely */ + if (s->pitch) { + int linesize; + + pix_fmt = ff_fmt_v4l2ff(desired_format, codec_id); + linesize = av_image_get_linesize(pix_fmt, s->width, 0); + if (linesize > 0) { + s->width = s->pitch * s->width / linesize; + + av_log(ctx, AV_LOG_INFO, + "Expand frame width to %dx%d to cover full buffer\n", + s->width, s->height); + } + } + if ((res = av_image_check_size(s->width, s->height, 0, ctx)) < 0) goto fail;