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

Allow nested read only maps of QVideoFrame.

Browse Source 
It's useful when video frame is accessed from multiple places
like display and encoding.

Change-Id: I8af175c780783216d8b7717cdf0744ad9bc95348
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2011-11-28 15:00:26 +10:00
committed by Qt by Nokia
parent be7cc17cbf
commit 3319639a6f
2 changed files with 69 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/auto/unit/qvideoframe/tst_qvideoframe.cpp
View File

@@ -647,8 +647,27 @@ void tst_QVideoFrame::map()
QVERIFY(frame.map(mode));
// Mapping twice should fail, but leave it mapped (and the mode is ignored)
QVERIFY(!frame.map(mode));
// Mapping multiple times is allowed in ReadOnly mode
if (mode == QAbstractVideoBuffer::ReadOnly) {
const uchar *bits = frame.bits();
QVERIFY(frame.map(QAbstractVideoBuffer::ReadOnly));
QVERIFY(frame.isMapped());
QCOMPARE(frame.bits(), bits);
frame.unmap();
//frame should still be mapped after the first nested unmap
QVERIFY(frame.isMapped());
QCOMPARE(frame.bits(), bits);
//re-mapping in Write or ReadWrite modes should fail
QVERIFY(!frame.map(QAbstractVideoBuffer::WriteOnly));
QVERIFY(!frame.map(QAbstractVideoBuffer::ReadWrite));
} else {
// Mapping twice in ReadWrite or WriteOnly modes should fail, but leave it mapped (and the mode is ignored)
QVERIFY(!frame.map(mode));
QVERIFY(!frame.map(QAbstractVideoBuffer::ReadOnly));
}
QVERIFY(frame.bits());
QCOMPARE(frame.mappedBytes(), mappedBytes);