test: media_device: Make MediaDeviceTest a MediaDevicePrintTest
As a new class for test link handling will be added as a separate test, it makes no sense to have a generic "MediaDeviceTest" class. Rename it in "MediaDevicePrintTest", and make it run only printing test. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
parent
4bf28fa225
commit
d85767a8c8
2 changed files with 15 additions and 18 deletions
|
@ -1,10 +1,8 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2018, Google Inc.
|
* Copyright (C) 2018-2019, Google Inc.
|
||||||
*
|
*
|
||||||
* media_device_test.cpp - Tests for the media device class.
|
* media_device_print_test.cpp - Print out media devices
|
||||||
*
|
|
||||||
* Test library for the media device class.
|
|
||||||
*/
|
*/
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
@ -20,16 +18,16 @@ using namespace libcamera;
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* MediaDeviceTest object: runs a sequence of tests on all media
|
* MediaDevicePrintTest takes all media devices found in the system and print
|
||||||
* devices found in the system.
|
* them out to verify correctness.
|
||||||
*
|
*
|
||||||
* If no accessible media device is found, the test is skipped.
|
* If no accessible media device is found, the test is skipped.
|
||||||
*/
|
*/
|
||||||
class MediaDeviceTest : public Test
|
class MediaDevicePrintTest : public Test
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
MediaDeviceTest() { }
|
MediaDevicePrintTest() { }
|
||||||
~MediaDeviceTest() { }
|
~MediaDevicePrintTest() { }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
int init() { return 0; }
|
int init() { return 0; }
|
||||||
|
@ -44,7 +42,7 @@ private:
|
||||||
void printNode(const MediaPad *pad, ostream &os);
|
void printNode(const MediaPad *pad, ostream &os);
|
||||||
};
|
};
|
||||||
|
|
||||||
void MediaDeviceTest::printNode(const MediaPad *pad, ostream &os)
|
void MediaDevicePrintTest::printNode(const MediaPad *pad, ostream &os)
|
||||||
{
|
{
|
||||||
const MediaEntity *entity = pad->entity();
|
const MediaEntity *entity = pad->entity();
|
||||||
|
|
||||||
|
@ -52,7 +50,7 @@ void MediaDeviceTest::printNode(const MediaPad *pad, ostream &os)
|
||||||
<< pad->index() << "]";
|
<< pad->index() << "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
void MediaDeviceTest::printLinkFlags(const MediaLink *link, ostream &os)
|
void MediaDevicePrintTest::printLinkFlags(const MediaLink *link, ostream &os)
|
||||||
{
|
{
|
||||||
unsigned int flags = link->flags();
|
unsigned int flags = link->flags();
|
||||||
|
|
||||||
|
@ -68,7 +66,7 @@ void MediaDeviceTest::printLinkFlags(const MediaLink *link, ostream &os)
|
||||||
* For each entity in the media graph, printout links directed to its sinks
|
* For each entity in the media graph, printout links directed to its sinks
|
||||||
* and source pads.
|
* and source pads.
|
||||||
*/
|
*/
|
||||||
void MediaDeviceTest::printMediaGraph(const MediaDevice &media, ostream &os)
|
void MediaDevicePrintTest::printMediaGraph(const MediaDevice &media, ostream &os)
|
||||||
{
|
{
|
||||||
os << "\n" << media.driver() << " - " << media.devnode() << "\n\n";
|
os << "\n" << media.driver() << " - " << media.devnode() << "\n\n";
|
||||||
|
|
||||||
|
@ -110,7 +108,7 @@ void MediaDeviceTest::printMediaGraph(const MediaDevice &media, ostream &os)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test a single media device. */
|
/* Test a single media device. */
|
||||||
int MediaDeviceTest::testMediaDevice(const string devnode)
|
int MediaDevicePrintTest::testMediaDevice(const string devnode)
|
||||||
{
|
{
|
||||||
MediaDevice dev(devnode);
|
MediaDevice dev(devnode);
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -134,9 +132,8 @@ int MediaDeviceTest::testMediaDevice(const string devnode)
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
/* Run tests in sequence. */
|
/* Print out the media graph. */
|
||||||
printMediaGraph(dev, cerr);
|
printMediaGraph(dev, cerr);
|
||||||
/* TODO: add more tests here. */
|
|
||||||
|
|
||||||
dev.close();
|
dev.close();
|
||||||
|
|
||||||
|
@ -145,7 +142,7 @@ int MediaDeviceTest::testMediaDevice(const string devnode)
|
||||||
|
|
||||||
/* Run tests on all media devices. */
|
/* Run tests on all media devices. */
|
||||||
#define MAX_MEDIA_DEV 256
|
#define MAX_MEDIA_DEV 256
|
||||||
int MediaDeviceTest::run()
|
int MediaDevicePrintTest::run()
|
||||||
{
|
{
|
||||||
const string devnode("/dev/media");
|
const string devnode("/dev/media");
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
@ -171,4 +168,4 @@ int MediaDeviceTest::run()
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_REGISTER(MediaDeviceTest);
|
TEST_REGISTER(MediaDevicePrintTest);
|
|
@ -1,5 +1,5 @@
|
||||||
media_device_tests = [
|
media_device_tests = [
|
||||||
['media_device_test', 'media_device_test.cpp'],
|
['media_device_print_test', 'media_device_print_test.cpp'],
|
||||||
]
|
]
|
||||||
|
|
||||||
foreach t : media_device_tests
|
foreach t : media_device_tests
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue