45736468c8
This is a partial revert of commit 395d43d6d7 ("libcamera:
v4l2_videodevice: Drop toV4L2PixelFormat()")
The function was removed because it incorrectly maps non-contiguous V4L2
format variants (ie V4L2_PIX_FMT_YUV420M) to the API version supported
by the video device (singleplanar API and multiplanar API). It was
decided at the time to remove the function and let its users call
directly V4L2PixelFormat::fromPixelFormat() which accepts a
'multiplanar' flags.
As we aim to associate multiple V4L2PixelFormat to a single libcamera
format, the next patches will verify which of them is actually supported
by the video device. For now, return the contiguous version
unconditionally.
Re-introduce V4L2VideoDevice::toV4L2PixelFormat() and convert all
the V4L2PixelFormat::fromPixelFormat() users to use it.
The V4L2 compatibility layer is the only outlier as it doesn't have a
video device to poke, hence it still uses
V4L2PixelFormat::fromPixelFormat().
Next patches will implement the device format matching logic and handle
the non-contiguous plane issue in V4L2VideoDevice::toV4L2PixelFormat().
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Paul Elder <paul.elder@ideasonboard.com>
94 lines
2.1 KiB
C++
94 lines
2.1 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (C) 2020, Google Inc.
|
|
*
|
|
* A provider of external buffers, suitable for use in tests.
|
|
*/
|
|
|
|
#include "buffer_source.h"
|
|
|
|
#include <iostream>
|
|
#include <memory>
|
|
|
|
#include "libcamera/internal/device_enumerator.h"
|
|
|
|
#include "test.h"
|
|
|
|
using namespace libcamera;
|
|
|
|
BufferSource::BufferSource()
|
|
{
|
|
}
|
|
|
|
BufferSource::~BufferSource()
|
|
{
|
|
if (media_)
|
|
media_->release();
|
|
}
|
|
|
|
int BufferSource::allocate(const StreamConfiguration &config)
|
|
{
|
|
/* Locate and open the video device. */
|
|
std::string videoDeviceName = "vivid-000-vid-out";
|
|
|
|
std::unique_ptr<DeviceEnumerator> enumerator =
|
|
DeviceEnumerator::create();
|
|
if (!enumerator) {
|
|
std::cout << "Failed to create device enumerator" << std::endl;
|
|
return TestFail;
|
|
}
|
|
|
|
if (enumerator->enumerate()) {
|
|
std::cout << "Failed to enumerate media devices" << std::endl;
|
|
return TestFail;
|
|
}
|
|
|
|
DeviceMatch dm("vivid");
|
|
dm.add(videoDeviceName);
|
|
|
|
media_ = enumerator->search(dm);
|
|
if (!media_) {
|
|
std::cout << "No vivid output device available" << std::endl;
|
|
return TestSkip;
|
|
}
|
|
|
|
std::unique_ptr<V4L2VideoDevice> video = V4L2VideoDevice::fromEntityName(media_.get(), videoDeviceName);
|
|
if (!video) {
|
|
std::cout << "Failed to get video device from entity "
|
|
<< videoDeviceName << std::endl;
|
|
return TestFail;
|
|
}
|
|
|
|
if (video->open()) {
|
|
std::cout << "Unable to open " << videoDeviceName << std::endl;
|
|
return TestFail;
|
|
}
|
|
|
|
/* Configure the format. */
|
|
V4L2DeviceFormat format;
|
|
if (video->getFormat(&format)) {
|
|
std::cout << "Failed to get format on output device" << std::endl;
|
|
return TestFail;
|
|
}
|
|
|
|
format.size = config.size;
|
|
format.fourcc = video->toV4L2PixelFormat(config.pixelFormat);
|
|
if (video->setFormat(&format)) {
|
|
std::cout << "Failed to set format on output device" << std::endl;
|
|
return TestFail;
|
|
}
|
|
|
|
if (video->allocateBuffers(config.bufferCount, &buffers_) < 0) {
|
|
std::cout << "Failed to allocate buffers" << std::endl;
|
|
return TestFail;
|
|
}
|
|
|
|
video->close();
|
|
|
|
return TestPass;
|
|
}
|
|
|
|
const std::vector<std::unique_ptr<FrameBuffer>> &BufferSource::buffers()
|
|
{
|
|
return buffers_;
|
|
}
|