slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Android: add missing information in frames retrieved with QVideoProbe.

Browse Source 
The number of bytes per line was missing.

Change-Id: I0afbdcfd6d7195b7beb3fd09f4ed262f756be848
Reviewed-by: Denis Kormalev <dkormalev@ics.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Yoann Lopes
2014-01-30 14:01:55 +01:00
committed by The Qt Project
parent bffb1cc117
commit 8fd3a5a198
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
View File

@@ -57,15 +57,16 @@ QT_BEGIN_NAMESPACE
class DataVideoBuffer : public QAbstractVideoBuffer class DataVideoBuffer : public QAbstractVideoBuffer
{ {
public: public:
DataVideoBuffer(const QByteArray &d) DataVideoBuffer(const QByteArray &d, int bpl = -1)
: QAbstractVideoBuffer(NoHandle) : QAbstractVideoBuffer(NoHandle)
, data(d) , data(d)
, mode(NotMapped) , mode(NotMapped)
, bytesPerLine(bpl)
{ } { }
MapMode mapMode() const { return mode; } MapMode mapMode() const { return mode; }
uchar *map(MapMode m, int *numBytes, int *bytesPerLine) uchar *map(MapMode m, int *numBytes, int *bpl)
{ {
if (mode != NotMapped || m == NotMapped) if (mode != NotMapped || m == NotMapped)
return 0; return 0;
@@ -75,8 +76,8 @@ public:
if (numBytes) if (numBytes)
*numBytes = data.size(); *numBytes = data.size();
if (bytesPerLine) if (bpl)
*bytesPerLine = -1; *bpl = bytesPerLine;
return reinterpret_cast<uchar *>(data.data()); return reinterpret_cast<uchar *>(data.data());
} }
@@ -86,6 +87,7 @@ public:
private: private:
QByteArray data; QByteArray data;
MapMode mode; MapMode mode;
int bytesPerLine;
}; };
@@ -543,8 +545,11 @@ void QAndroidCameraSession::onCameraFrameFetched(const QByteArray &frame)
{ {
m_videoProbesMutex.lock(); m_videoProbesMutex.lock();
if (frame.size() && m_videoProbes.count()) { if (frame.size() && m_videoProbes.count()) {
QVideoFrame videoFrame(new DataVideoBuffer(frame), const QSize frameSize = m_camera->previewSize();
m_camera->previewSize(), // Bytes per line should be only for the first plane. For NV21, the Y plane has 8 bits
// per sample, so bpl == width
QVideoFrame videoFrame(new DataVideoBuffer(frame, frameSize.width()),
frameSize,
QVideoFrame::Format_NV21); QVideoFrame::Format_NV21);
foreach (QAndroidMediaVideoProbeControl *probe, m_videoProbes) foreach (QAndroidMediaVideoProbeControl *probe, m_videoProbes)
probe->newFrameProbed(videoFrame); probe->newFrameProbed(videoFrame);