From patchwork Mon Feb 17 00:15:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Hauxwell X-Patchwork-Id: 17806 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 67CE8447FF4 for ; Mon, 17 Feb 2020 02:15:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 461AE689924; Mon, 17 Feb 2020 02:15:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20045.outbound.protection.outlook.com [40.107.2.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60626688135 for ; Mon, 17 Feb 2020 02:15:04 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R1TUNcLvzXbRqUT5Lmn5lhK+zovpJZ2iRZrMFKlFvd7N3/maagBvP+c1Bu2lRI+tGXHTjVckgG1LPAIxovDYHZX8DLyTI4O6Yb/oinWcD6MCeVbXtfZgtwKpaEzNCLB8ItBTvw1tQhHmwZPZFct9vPKHQ1ejGiwiDlNamod4kzKV8yUrizDqTXCPkPvo/U/DetjjzvCj834KxoVZt5irYc9eRFBps/JEFaVgMjOCWKsLp1IILwPCgANRAMDPASoPoT7YOHJM2Bo1tmhocqBU0cgjm5lA2NqHcesAjfVPDCFJrFRdgddfQM7VFaWwd0apKmDyg4aPgyq7SE/+ZJrXkw== 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-SenderADCheck; bh=N3gs9v8wpIqC6A7/tjVsXrm7XlbafF+rUQVkKhg3xwg=; b=ZWANv8R3ae+bQk7rjPBsB1vgNnTAHAFCLNhfalpLDirRwa9zQhqbix8j6Y4YNG2yGM/moZ15JMQcErZW343rZVAGkyaggAGvVbCPqRXscjj2YuGaDe9f+HCSU7hodzP2SCMqfJ0d5eqpuAqpALjzeRU+Cwle8u4d06w7En79VW6g0xmRyLcyWCTqJxKK1fZQIPtJ7N6gKn5ccjW+YGsFUgvJ2c07Uqdt2mzQM3jEYfZZnBnmnwHv98HmWuAFfK9XhM1O3sBMrGxQig6i45g+eZwdCTLITDa3gFIVzYPDIYmmQyIPc4jdlUCKz8KlOhx2vxvPj1RIa/flCthtiDu9VQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=dattrax.co.uk; dmarc=pass action=none header.from=dattrax.co.uk; dkim=pass header.d=dattrax.co.uk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dattrax.onmicrosoft.com; s=selector2-dattrax-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N3gs9v8wpIqC6A7/tjVsXrm7XlbafF+rUQVkKhg3xwg=; b=PRwoxiZGG0ZvndqVLDDpuNV72HRN1sqYTFRUYuTldui3nHnhIiIXNJ3D0of774o/1HtqMY6f0RdcQ4iDuzosDWcjAemSfj/K4wpXmaxvbGpuK0QxfqMjiTrkXjVloVrDRKK/s3JdpsiDybJPZYhUj0kkmqfBnQkGxQPM74cHyhI= Received: from DB7PR09MB2634.eurprd09.prod.outlook.com (20.177.121.24) by DB7PR09MB2299.eurprd09.prod.outlook.com (20.176.239.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2729.25; Mon, 17 Feb 2020 00:15:02 +0000 Received: from DB7PR09MB2634.eurprd09.prod.outlook.com ([fe80::35c2:117e:9ae5:4ade]) by DB7PR09MB2634.eurprd09.prod.outlook.com ([fe80::35c2:117e:9ae5:4ade%4]) with mapi id 15.20.2729.031; Mon, 17 Feb 2020 00:15:02 +0000 Received: from DESKTOP-JM9DK4N.localdomain (77.100.236.77) by LO2P265CA0275.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a1::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2729.23 via Frontend Transport; Mon, 17 Feb 2020 00:15:01 +0000 From: Jim Hauxwell To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] add MEDIASUBTYPE_RGB8 support Thread-Index: AQHV5SdM7svaO7DnSU61tF4E45aRGg== Date: Mon, 17 Feb 2020 00:15:02 +0000 Message-ID: <20200217001436.23067-1-james@dattrax.co.uk> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0275.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a1::23) To DB7PR09MB2634.eurprd09.prod.outlook.com (2603:10a6:10:4c::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=james@dattrax.co.uk; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [77.100.236.77] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e64b8618-cbe1-4ecf-cd0b-08d7b33e6e6d x-ms-traffictypediagnostic: DB7PR09MB2299: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:626; x-forefront-prvs: 0316567485 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(396003)(136003)(376002)(39830400003)(346002)(189003)(199004)(66476007)(66446008)(64756008)(66556008)(6512007)(66946007)(186003)(107886003)(86362001)(26005)(16526019)(36756003)(81166006)(71200400001)(8676002)(81156014)(4326008)(5660300002)(1076003)(8936002)(956004)(2906002)(2616005)(316002)(6486002)(6916009)(508600001)(6506007)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR09MB2299; H:DB7PR09MB2634.eurprd09.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: dattrax.co.uk does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: sGmLKs3dPqo/77VbY62Hgv8fGRLZ98MUj4KfaguZejBw/8S96RjGntIcjXUxcYt+ptm9nG5ZI6veEhjTXs54DCmNtxxUBNDw4biotKL6VpFkZyhugB7EvPFZhfcQvP9IYY4QuN6JjvCQQYzvTlBTfRKm1VogTRz0FfhiE/ysFLfuvR99miBLcUqJdKlwXrRnei2qw9m5c4PcfraOaBSMqsyGPnqANT9sc4f3VrpthvgWGF7Qb1FTegBTl3c1ddVlq0jTaoVGlEOKkL4BGo9LoMsSK+HEgU/UUSNGGhFumqfaFTMRBOyFPevGRiqE1pGwS9reSdil9iRS5X56155JowPks984dfjXJ4KW4WvgSZXHiVXa328N/jEwpLwhGNEgJjqfpUI63vwPtUp15Wjpkb0aAZuMwxkMfsVAuCTVaASsTH/1FR0hg2+YAByZGNzL x-ms-exchange-antispam-messagedata: /mwN3xBIp1uuNue9NrobWhs9t3OhqTtPKPyqnV6eXmSMd0lYhLBEGqwLhtgKhbetRkyGz9sASAs7vawtpGy7B1PiSDMEXFfNV7ge05o3eJ/pyyjnbBPNu7RNZU/z6JMSNrNEcWFQGYsYxuZLc/GvoA== MIME-Version: 1.0 X-OriginatorOrg: dattrax.co.uk X-MS-Exchange-CrossTenant-Network-Message-Id: e64b8618-cbe1-4ecf-cd0b-08d7b33e6e6d X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Feb 2020 00:15:02.1796 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 398ba9b2-60ae-4191-b9e6-16913861844a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: /B0mjKY2F8E5dW3TOkyiGKzBePwI+qlrOu7oxE/eUlQlZpO8F8MI8IlxpBmRIBJPXLlUJ9NAaGxALATd7hMByA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR09MB2299 Subject: [FFmpeg-devel] [PATCH] add MEDIASUBTYPE_RGB8 support 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: Jim Hauxwell Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" windows/win32/directshow/uncompressed-rgb-video-subtypes The Magwell series of HDMI USB capture boards use this format for bgr24 input. --- libavcodec/raw.c | 3 +++ libavcodec/rawdec.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/raw.c b/libavcodec/raw.c index b6fb91c1c6..f9ad1548c1 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -289,6 +289,9 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUV444P16LE, MKTAG('I', '4', 'F', 'L') }, { AV_PIX_FMT_YUV444P16BE, MKTAG('I', '4', 'F', 'B') }, + /* directshow */ + { AV_PIX_FMT_BGR24, MKTAG(0x7D, 0xEB, 0x36, 0xE4) }, /* MEDIASUBTYPE_RGB8 */ + /* special */ { AV_PIX_FMT_RGB565LE,MKTAG( 3 , 0 , 0 , 0 ) }, /* flipped RGB565LE */ { AV_PIX_FMT_YUV444P, MKTAG('Y', 'V', '2', '4') }, /* YUV444P, swapped UV */ diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index a110a690f5..43d8e8a5ae 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -111,7 +111,8 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) !memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9)) || avctx->codec_tag == MKTAG('c','y','u','v') || avctx->codec_tag == MKTAG(3, 0, 0, 0) || - avctx->codec_tag == MKTAG('W','R','A','W')) + avctx->codec_tag == MKTAG('W','R','A','W') || + avctx->codec_tag == MKTAG(0x7D, 0xEB, 0x36, 0xE4)) context->flip = 1; if (avctx->pix_fmt == AV_PIX_FMT_MONOWHITE ||