diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-10-04 10:36:18 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-04 16:23:07 +0000 |
| commit | a4f505e5274a58477a1df4e9ca4b9c25f50e1a7d (patch) | |
| tree | 11c92886d0448bfef8b3fc7a488a92547e5f3027 | |
| parent | 3709d30a5b3e071a1193d4e2fb534f2d0eed935a (diff) | |
PySide6: Expose QVideoFrame::bits(int)
QVideoFrame::bits() was removed in Qt 6; expose QVideoFrame::bits(int
plane).
Fixes: PYSIDE-1674
Change-Id: I23f58f71286e445ad1b1e170924ee5e40f0b2491
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit d410d3b621a9273be7a466a7ab3eb278fc225cdf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml | 3 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtmultimedia.cpp | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml index b4b4271bd..27ec02d02 100644 --- a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml +++ b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml @@ -152,10 +152,9 @@ <value-type name="QVideoFrame"> <enum-type name="HandleType"/> <enum-type name="MapMode" since="6.1"/> - <modify-function signature="bits()"> + <modify-function signature="bits(int)"> <inject-code file="../glue/qtmultimedia.cpp" snippet="qvideoframe-bits"/> </modify-function> - <modify-function signature="bits(int)" remove="all"/> <modify-function signature="bits(int)const" remove="all"/> </value-type> <value-type name="QVideoFrameFormat" since="6.1"> diff --git a/sources/pyside6/PySide6/glue/qtmultimedia.cpp b/sources/pyside6/PySide6/glue/qtmultimedia.cpp index ddb63740f..36f831f07 100644 --- a/sources/pyside6/PySide6/glue/qtmultimedia.cpp +++ b/sources/pyside6/PySide6/glue/qtmultimedia.cpp @@ -39,7 +39,8 @@ // @snippet qvideoframe-bits %BEGIN_ALLOW_THREADS -%RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(); +%RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1); %END_ALLOW_THREADS -%PYARG_0 = Shiboken::Buffer::newObject(%0, %CPPSELF.bytesPerLine() * %CPPSELF.height(), Shiboken::Buffer::ReadWrite); +const auto size = %CPPSELF.mappedBytes(%1); +%PYARG_0 = Shiboken::Buffer::newObject(%0, size, Shiboken::Buffer::ReadWrite); // @snippet qvideoframe-bits |