From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3C1A847A13 for ; Fri, 29 Sep 2023 11:02:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73B9168CBD3; Fri, 29 Sep 2023 14:02:47 +0300 (EEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2010.outbound.protection.outlook.com [40.92.65.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0BE368CAD8 for ; Fri, 29 Sep 2023 14:02:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cvOJwz/LjNHJxLVIyfKzZ+3q71UlHohq5m2zImiMoasxy48d5/bzkDf84IUFhzmo1qxP03I4mpUepPNKnvjSkaSu5CXmla726/us7Nle9dRDC34z4iazfSNNtlhaHaADLZ5mZ8LSgPZiYUKAtaC9IZ0H2/XBX6J68Jcw4rKUa8Aw6LMreQ1jWv6EnhF4g4Aj6K0N/Y+1c7bx3Hclgs0cFhKgkvjT6WVQkdM3CH42/j8w/xCzdsop50youS/labhDZg6/Uhcstt8/S0s6XhhjZptwuzFfz78KY0ttFur5tJ6VC4sDPny39UCrhIxvososVdx1GeKWlNZYhHiRAUZ4ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=t0jrpHA6RTxO2pDrz4jKuP1dq54gx/y9BbQE+MS7ywY=; b=USiyJBsS9US40Fbe/5MnaO/QfZCULDBsjLLvgWnsdJ7pQ2vsphBTR5DZ4+UGsg2DayWmyyRPPKi+QTXTNZ60ZQ/gg/tXSt+qdaN1srMbtwLLE2eEhVBOsfM7c2Vu9ThUSAl+Hc2V0iYKdRUxBD6ehX5DUn794c8jbb8H2c4QCVn9zaEQY2mp19RNL+GBmqefVZb5GeRBuqKFYHRgkkBiX4SE5Gwc7+pj5LFgPmgEr0L+4XZxvLig8qG8aPbkmBlzxNTHo+1q0pbkz6SRENmiArmxHfGdDTBKVc1aC1Q47F8ZRCXTH5Ntrbtf0e3rxIVgwMM/FF1YpcQDVX9h3MefPA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t0jrpHA6RTxO2pDrz4jKuP1dq54gx/y9BbQE+MS7ywY=; b=GYhcsOXuTvm98c3ckXD120YO3EfiMHU8Rum16OpnLbTLssRCU2UWrgmcTUFxVRwQeroetGdTKMswKGNEYgV+IsNhAS3zuuLaw1BvcO1UK/V5u28q0nAZhv8Zon0ska582STSkpUCzRz2YeLYkKVUhc86IkwXf9o8fOQnxe9SusBiYd9Z2aGkUfuqL8qqAP0jXI+bjtrdJV1g3UJCGzqjZstUKvoBg3GJISTm5Mfvy//bxBRVMc0nNBMCuB5HfiO5bkv2aTZlCPtgBqZGfVJ7Z9lu/ZRJshQu6ogr+mxkrl6MUUmtePtLSYNm4JbHpB3WO2anuh22D7N7grZQYCisxg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0137.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:320::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Fri, 29 Sep 2023 11:02:37 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Fri, 29 Sep 2023 11:02:37 +0000 Message-ID: Date: Fri, 29 Sep 2023 13:03:52 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20230929-v4l2-strides-v1-1-26c10bf10726@asahilina.net> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20230929-v4l2-strides-v1-1-26c10bf10726@asahilina.net> X-TMN: [ZdyCvq1tSvhAUGK7ecsZ7tsD6EgcFHlx] X-ClientProxiedBy: ZR0P278CA0072.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::23) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <1798b246-b5ba-47be-9e63-33b32d3aefcb@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0137:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e3d1631-c7c0-4beb-65b1-08dbc0db976b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lTScGH2DYA2WhWdyDxINaTuUTm3RSHdxbyjzpi0Cu8wYk0+he/NhGXdxmeiu1V2g5Mzv8Qw/SuE4gneQ7S2Zny27y6umsdUyiGshyZjI/1nnkPExYJVC1sYii8j/QQeNp2Z1oqPbhAVECJkkRgaiIyCvjBR+ltDLrcrWKlKQ7crbCHa2mkbI2vrYLruKKKtvi6xvRzN/QyLuiJjX6P8u791LsSsnwHNJHr490Wt7nRq5JXIUIBn9rHdYCc1vKXkLb25EC/J5pTqSRFX74/07pAgIFsHxxNKgYDW8FTBHYMBpFRFVn0xZQ2cHXRVwmAbR6sYg6t8Ay4o//dDgHjg0auLCeQNCRgkgYedS/UOqzp4I+BJMMXljZuJuS68h7WUlmrpm0IGC4rbh+wT0QEnwEefQCcXzMzGD18OpWYr/utYe4SoGDAFqBvO2Xz/jsxQeXXWtHTR85TkPnm50pufi1243qZm68FWr1BJhVp2FhnYnIKrZySgFa9uSbncjDULiGdobA7dG3JIEfY48zA7HrIvJ3/qaNSbOm45jy/geMTBb/UdWSUcN55h7v6WHI1JE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?czI2UXNuVzdoaVRJZzdqU3BodmJjRE5qTC9pei9ia0xaNDZVNHhQMlcwbHZ1?= =?utf-8?B?Uk11cVpzV3MrZTFtZHIvMjcyYTdVanVXaW1wYjFDRUpkTkVuMWhORVdCZWMz?= =?utf-8?B?MzRTNGJoNTFGWmFZNTZya3ovUWhZbHJWSDRhbm5PcnVPZG1RdDFISC9EM3Nz?= =?utf-8?B?aXdyZzlLM1p1KzlTYTRMUGN6VllVN2o1UlNmSkNJYTFwdjcyaGZkMmhDcXZI?= =?utf-8?B?WVRtV3pNY0REYjgyTTRkc05vMU9rNmpnaTFWc1JGeVFsSXVWUWdZMVNWNHln?= =?utf-8?B?S1RlVlp1WllwSnI2Ykt4YkRZR1JPdzhGemg2Vzh0UlBIaUR6cGhya3llcDB5?= =?utf-8?B?UEwzYVdBUFZQZDRvcHVGRXoyM3NtdHpFUFF2V3dzU04reUlCSy9Zdk80RVZW?= =?utf-8?B?NWNRT0w4VWluVlh0a0UrMUhBd3ZIWlhmMlhEVXBrWDF3eis2c0dxSy91bTBj?= =?utf-8?B?YXdZdXZxRVlOQmNmRHd0SzlHcHBPellyZ0VmeDhXWTdoRXBHME1UbUJYTVFG?= =?utf-8?B?cW91SFZXdGdFVS91MzZvc09MNmJPdDRZOUpKQWIxbm8zWHhudTg3bVNlV3FF?= =?utf-8?B?U3dDaEJZcDJMd2JVNXNrRFl1UkJCR1FDSzZsK2ZEaGdFdmg2NVZRcnd2bmhi?= =?utf-8?B?NDQvWEJneDlmdVoyV2JZZ3VOVVBRYVlGcGNOdmJsbFd0Tk9zTjl3ajJKdXlj?= =?utf-8?B?U2JZR3lMamxzeHl3L29EYThxRXptclBBdDZSR1Mzd1ozaEdmYXorUEdLWm05?= =?utf-8?B?VmxqUThGamlhZlFQRGFSZUd1MXRkU1ZXQ2lzZFplNTBIb3JEMFpWSnNEa3Fx?= =?utf-8?B?Sk1jQnN0S3pJRFFabUNEY1I3MTF2RTRGLzdYVzl0Yzl5U3RlaGdWdVNiZXcw?= =?utf-8?B?Zlg2c0s2NkhaQmFNbzQ3dVV5MXVjN0pWZDRneWhMNHZHR3J4NDZSdldPM2Zs?= =?utf-8?B?d0ViZ0xGNGs0U3ZQck51MjhKSkd5Z0tUZFRKWVp1ak5EUWtIakxmSGdXZEht?= =?utf-8?B?MmVueGpIaWdjRnhsNFFHZk05QU1jRlJoblNsSzZkRncvMjVSZ29RRmVndXFK?= =?utf-8?B?RncxdmVJZzRNT3Nkc21uaWc0a3hiVkZ2eDFFaGNmV3VoZ2ZFalRZNVdFSkMw?= =?utf-8?B?YWVnT1MrVDJOYW9MRXhSV01zWjJVYUh6ZXVUalhDbVAyZVpyRW9GbVd0RGRh?= =?utf-8?B?RWhrZHZRQm9iVkRHamQwYThDRHh2RzNLeXNiSE5ESy9xTGZoU3FWODRHSGFX?= =?utf-8?B?WjBqVkdGcDNhWVFDSjB0K3E0dWU1RzhNaWdyVVJNSnRrY243eVlaYytOQjFI?= =?utf-8?B?RlV6dUNPejZQSU1EaGVsLzZKQlMydW5RTzlHcGduMlVjSjkxVkZSU1ZZT3ht?= =?utf-8?B?bk9nNFBwWE9QeThzSWJtYTRDbU5uaytLa1dHekNyM2hPYUFnbEhJcmN4aXJq?= =?utf-8?B?c1lRM2UvQmFjM0kyRjhRRWUrOEZIYlV5SXN4aXdSUGdoTlFaRnd3bFM2c3Rq?= =?utf-8?B?bUpydWZHcW53UmlmR3pUNkVtMk9HeTVSUGtQUjVDRDVoclQxWUR0Y3dRdEpt?= =?utf-8?B?RGU3cG8vdjlzQko3YzJZU0o2K1Q3RStkUWxlNHA4ZnFSMG55dDFGekFkTy84?= =?utf-8?B?dVNWT3EwS0EvTldwNXdweExSM3h6ZnFDbmw1UWUvVjJPVkg5RW1PKzJ3RC92?= =?utf-8?Q?w3SzKDuqsy7Q0JC0EETG?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e3d1631-c7c0-4beb-65b1-08dbc0db976b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2023 11:02:37.6231 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0137 Subject: Re: [FFmpeg-devel] [PATCH] avdevice/v4l2: Switch to wrapped AVFrames and implement strides 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Asahi Lina via ffmpeg-devel: > V4L2 provides a line stride to the client for hardware that has > alignment requirements. rawvideo cannot represent this, so switch to > wrapped_avframe for raw video formats and calculate the plane strides > manually. > > This is slightly messy because the existing helper APIs expect > dimensions and an alignment value, while v4l2 provides the stride of > plane 0 and the subsequent plane strides are implied, so we need to > open-code the logic to calculate the plane strides. > > This makes vertical video work properly on Apple Macs with "1080p" > cameras, which are actually square and can support resolutions like > 1080x1920, which require stride padding to a multiple of 64 bytes. > > In principle, this could be extended to support the V4L2 multiplanar > API, though there seem to be practically no capture (not M2M) drivers > that support this, so it's not terribly useful right now. > > Signed-off-by: Asahi Lina > --- > libavdevice/v4l2-common.c | 68 +++++++++++------------ > libavdevice/v4l2.c | 138 +++++++++++++++++++++++++++++++++++++++------- > 2 files changed, 151 insertions(+), 55 deletions(-) > > diff --git a/libavdevice/v4l2-common.c b/libavdevice/v4l2-common.c > index b5b4448a3154..944ffe3d87e1 100644 > --- a/libavdevice/v4l2-common.c > +++ b/libavdevice/v4l2-common.c > @@ -19,53 +19,53 @@ > #include "v4l2-common.h" > > const struct fmt_map ff_fmt_conversion_table[] = { > - //ff_fmt codec_id v4l2_fmt > - { AV_PIX_FMT_YUV420P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV420 }, > - { AV_PIX_FMT_YUV420P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YVU420 }, > - { AV_PIX_FMT_YUV422P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV422P }, > - { AV_PIX_FMT_YUYV422, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUYV }, > - { AV_PIX_FMT_UYVY422, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_UYVY }, > - { AV_PIX_FMT_YUV411P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV411P }, > - { AV_PIX_FMT_YUV410P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV410 }, > - { AV_PIX_FMT_YUV410P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YVU410 }, > - { AV_PIX_FMT_RGB555LE,AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB555 }, > - { AV_PIX_FMT_RGB555BE,AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB555X }, > - { AV_PIX_FMT_RGB565LE,AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB565 }, > - { AV_PIX_FMT_RGB565BE,AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB565X }, > - { AV_PIX_FMT_BGR24, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR24 }, > - { AV_PIX_FMT_RGB24, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB24 }, > + //ff_fmt codec_id v4l2_fmt > + { AV_PIX_FMT_YUV420P, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_YUV420 }, > + { AV_PIX_FMT_YUV420P, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_YVU420 }, > + { AV_PIX_FMT_YUV422P, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_YUV422P }, > + { AV_PIX_FMT_YUYV422, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_YUYV }, > + { AV_PIX_FMT_UYVY422, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_UYVY }, > + { AV_PIX_FMT_YUV411P, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_YUV411P }, > + { AV_PIX_FMT_YUV410P, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_YUV410 }, > + { AV_PIX_FMT_YUV410P, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_YVU410 }, > + { AV_PIX_FMT_RGB555LE,AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_RGB555 }, > + { AV_PIX_FMT_RGB555BE,AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_RGB555X }, > + { AV_PIX_FMT_RGB565LE,AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_RGB565 }, > + { AV_PIX_FMT_RGB565BE,AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_RGB565X }, > + { AV_PIX_FMT_BGR24, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_BGR24 }, > + { AV_PIX_FMT_RGB24, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_RGB24 }, > #ifdef V4L2_PIX_FMT_XBGR32 > - { AV_PIX_FMT_BGR0, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_XBGR32 }, > - { AV_PIX_FMT_0RGB, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_XRGB32 }, > - { AV_PIX_FMT_BGRA, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_ABGR32 }, > - { AV_PIX_FMT_ARGB, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_ARGB32 }, > + { AV_PIX_FMT_BGR0, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_XBGR32 }, > + { AV_PIX_FMT_0RGB, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_XRGB32 }, > + { AV_PIX_FMT_BGRA, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_ABGR32 }, > + { AV_PIX_FMT_ARGB, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_ARGB32 }, > #endif > - { AV_PIX_FMT_BGR0, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR32 }, > - { AV_PIX_FMT_0RGB, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB32 }, > - { AV_PIX_FMT_GRAY8, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_GREY }, > + { AV_PIX_FMT_BGR0, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_BGR32 }, > + { AV_PIX_FMT_0RGB, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_RGB32 }, > + { AV_PIX_FMT_GRAY8, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_GREY }, > #ifdef V4L2_PIX_FMT_Y16 > - { AV_PIX_FMT_GRAY16LE,AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_Y16 }, > + { AV_PIX_FMT_GRAY16LE,AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_Y16 }, > #endif > #ifdef V4L2_PIX_FMT_Z16 > - { AV_PIX_FMT_GRAY16LE,AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_Z16 }, > + { AV_PIX_FMT_GRAY16LE,AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_Z16 }, > #endif > - { AV_PIX_FMT_NV12, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_NV12 }, > - { AV_PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_MJPEG }, > - { AV_PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_JPEG }, > + { AV_PIX_FMT_NV12, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_NV12 }, > + { AV_PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_MJPEG }, > + { AV_PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_JPEG }, > #ifdef V4L2_PIX_FMT_H264 > - { AV_PIX_FMT_NONE, AV_CODEC_ID_H264, V4L2_PIX_FMT_H264 }, > + { AV_PIX_FMT_NONE, AV_CODEC_ID_H264, V4L2_PIX_FMT_H264 }, > #endif > #ifdef V4L2_PIX_FMT_MPEG4 > - { AV_PIX_FMT_NONE, AV_CODEC_ID_MPEG4, V4L2_PIX_FMT_MPEG4 }, > + { AV_PIX_FMT_NONE, AV_CODEC_ID_MPEG4, V4L2_PIX_FMT_MPEG4 }, > #endif > #ifdef V4L2_PIX_FMT_CPIA1 > - { AV_PIX_FMT_NONE, AV_CODEC_ID_CPIA, V4L2_PIX_FMT_CPIA1 }, > + { AV_PIX_FMT_NONE, AV_CODEC_ID_CPIA, V4L2_PIX_FMT_CPIA1 }, > #endif > #ifdef V4L2_PIX_FMT_SRGGB8 > - { AV_PIX_FMT_BAYER_BGGR8, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_SBGGR8 }, > - { AV_PIX_FMT_BAYER_GBRG8, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_SGBRG8 }, > - { AV_PIX_FMT_BAYER_GRBG8, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_SGRBG8 }, > - { AV_PIX_FMT_BAYER_RGGB8, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_SRGGB8 }, > + { AV_PIX_FMT_BAYER_BGGR8, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_SBGGR8 }, > + { AV_PIX_FMT_BAYER_GBRG8, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_SGBRG8 }, > + { AV_PIX_FMT_BAYER_GRBG8, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_SGRBG8 }, > + { AV_PIX_FMT_BAYER_RGGB8, AV_CODEC_ID_WRAPPED_AVFRAME, V4L2_PIX_FMT_SRGGB8 }, > #endif > { AV_PIX_FMT_NONE, AV_CODEC_ID_NONE, 0 }, > }; > diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c > index 5e85d1a2b34e..534aa79b639e 100644 > --- a/libavdevice/v4l2.c > +++ b/libavdevice/v4l2.c > @@ -83,7 +83,10 @@ struct video_data { > AVClass *class; > int fd; > int pixelformat; /* V4L2_PIX_FMT_* */ > + int pix_fmt; /* AV_PIX_FMT_* */ > int width, height; > + int bytesperline; > + int linesize[AV_NUM_DATA_POINTERS]; > int frame_size; > int interlaced; > int top_field_first; > @@ -240,6 +243,7 @@ static int device_init(AVFormatContext *ctx, int *width, int *height, > s->interlaced = 1; > } > > + s->bytesperline = fmt.fmt.pix.bytesperline; > return res; > } > > @@ -501,9 +505,18 @@ static int convert_timestamp(AVFormatContext *ctx, int64_t *ts) > return 0; > } > > +static void v4l2_free_frame(void *opaque, uint8_t *data) > +{ > + AVFrame *frame = (AVFrame*)data; > + > + av_frame_free(&frame); You should include libavutil/frame.h for this; don't rely on implicit inclusions via avcodec.h. > +} > + > static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) > { > struct video_data *s = ctx->priv_data; > + struct AVBufferRef *avbuf = NULL; > + struct AVFrame *frame = NULL; > struct v4l2_buffer buf = { > .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, > .memory = V4L2_MEMORY_MMAP > @@ -560,13 +573,13 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) > /* Image is at s->buff_start[buf.index] */ > if (atomic_load(&s->buffers_queued) == FFMAX(s->buffers / 8, 1)) { > /* when we start getting low on queued buffers, fall back on copying data */ > - res = av_new_packet(pkt, buf.bytesused); > - if (res < 0) { > - av_log(ctx, AV_LOG_ERROR, "Error allocating a packet.\n"); > + avbuf = av_buffer_alloc(buf.bytesused); 1. This is missing the padding. av_new_packet() exists for a reason. > + if (!avbuf) { > + av_log(ctx, AV_LOG_ERROR, "Error allocating a buffer.\n"); > enqueue_buffer(s, &buf); > return res; > } > - memcpy(pkt->data, s->buf_start[buf.index], buf.bytesused); > + memcpy(avbuf->data, s->buf_start[buf.index], buf.bytesused); > > res = enqueue_buffer(s, &buf); > if (res) { > @@ -576,9 +589,6 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) > } else { > struct buff_data *buf_descriptor; > > - pkt->data = s->buf_start[buf.index]; > - pkt->size = buf.bytesused; > - > buf_descriptor = av_malloc(sizeof(struct buff_data)); > if (!buf_descriptor) { > /* Something went wrong... Since av_malloc() failed, we cannot even > @@ -592,19 +602,65 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) > buf_descriptor->index = buf.index; > buf_descriptor->s = s; > > - pkt->buf = av_buffer_create(pkt->data, pkt->size, mmap_release_buffer, > - buf_descriptor, 0); > - if (!pkt->buf) { > + avbuf = av_buffer_create(s->buf_start[buf.index], buf.bytesused, > + mmap_release_buffer, buf_descriptor, 0); > + if (!avbuf) { > av_log(ctx, AV_LOG_ERROR, "Failed to create a buffer\n"); > enqueue_buffer(s, &buf); > av_freep(&buf_descriptor); > return AVERROR(ENOMEM); > } > } > + > + if (ctx->video_codec_id == AV_CODEC_ID_WRAPPED_AVFRAME) { > + frame = av_frame_alloc(); > + > + if (!frame) { > + av_log(ctx, AV_LOG_ERROR, "Failed to create an AVFrame\n"); > + goto err_free; > + } > + > + frame->buf[0] = avbuf; 2. You are moving ownership of avbuf to the frame here and therefore the av_frame_unref() will free avbuf in the err_free codepath on error, but it has already been freed in av_buffer_unref(). > + > + memcpy(frame->linesize, s->linesize, sizeof(s->linesize)); > + res = av_image_fill_pointers(frame->data, s->pix_fmt, s->height, > + avbuf->data, frame->linesize); > + if (res < 0) { > + av_log(ctx, AV_LOG_ERROR, "Failed to compute data pointers\n"); > + goto err_free; > + } > + > + frame->format = s->pix_fmt; > + frame->width = s->width; > + frame->height = s->height; > + > + pkt->buf = av_buffer_create((uint8_t*)frame, sizeof(*frame), > + &v4l2_free_frame, ctx, 0); There is no need to use an opaque here at all as v4l2_free_frame doesn't use it at all; in fact, this buffer might outlive ctx, which is all the more reason not to use ctx as opaque. > + if (!pkt->buf) { > + av_log(ctx, AV_LOG_ERROR, "Failed to create an AVBuffer\n"); > + goto err_free; > + } > + > + pkt->data = (uint8_t*)frame; > + pkt->size = sizeof(*frame); > + pkt->flags |= AV_PKT_FLAG_TRUSTED; > + frame = NULL; > + } else { > + pkt->buf = avbuf; > + pkt->data = avbuf->data; > + pkt->size = buf.bytesused; > + avbuf = NULL; > + } > + > pkt->pts = buf_ts.tv_sec * INT64_C(1000000) + buf_ts.tv_usec; > convert_timestamp(ctx, &pkt->pts); > > return pkt->size; > + > +err_free: > + av_buffer_unref(&avbuf); > + av_frame_unref(frame); 3. This may call av_frame_unref(NULL) in case the AVFrame could not be allocated, which currently works, but is not guaranteed to do so (I consider av_frame_unref(NULL) a programmer error that should not exist and we should just let it crash). It also leaks the AVFrame in case av_image_fill_pointers() or av_buffer_create() fails. To fix 2. and 3., you can proceed as follows: Call av_image_fill_pointers() before allocating the frame (store the data pointers on the stack), then allocate the frame, then wrap it into a buffer. If wrapping it in a buffer fails, you free the frame. You do not free it on all other error paths; actually, you should make the AVFrame* local to the block where you allocate it. (This is not to say that I actually like the whole wrapped avframe hack.) - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".