[Tizen-submit] 21658: Changes to Tizen:Generic/qt5-qtmultimedia

noreply at tizen.org noreply at tizen.org
Wed Feb 26 11:11:51 GMT 2014


Hi,
Tomasz Olszak have made the following changes to qt5-qtmultimedia in project Tizen:Generic. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #21658

  submit:       Tizen:Generic:build/qt5-qtmultimedia(cleanup) -> Tizen:Generic


Message:
Submitter: Tomasz Olszak <olszak.tomasz at gmail.com>
Comments: Update from upstream: Bug-Tizen:TIVI-2416
Git project: platform/upstream/qtmultimedia
Tag: submit/tizen/20140226.110304
Commit: b361dc502d4c7743ca71a982a8e45e54e74732f5 spec: Explicitly add all content of cmake and qml/QtMultimedia.

State:   new        2014-02-26T11:09:09 tizenrobot
Comment: <no comment>
spec files:
-----------
--- qtmultimedia.spec
+++ qtmultimedia.spec
@@ -1,5 +1,5 @@
 Name:       qt5-qtmultimedia
-VCS:        platform/upstream/qtmultimedia#5905fe0afa223e50cce5c11dc46cbca16135d17d
+VCS:        platform/upstream/qtmultimedia#b361dc502d4c7743ca71a982a8e45e54e74732f5
 Summary:    Qt Multimedia module
 Version:    5.2.2
 Release:    0
@@ -192,13 +192,13 @@
 %{_libdir}/libqgsttools_p.prl
 %{_libdir}/pkgconfig/*
 %{_includedir}/qt5/*
-%{_datadir}/qt5/mkspecs/
-%{_libdir}/cmake/
+%{_datadir}/qt5/mkspecs/*
+%{_libdir}/cmake/*
 
 
 %files -n qt5-qtdeclarative-import-multimedia
 %defattr(-,root,root,-)
-%{_libdir}/qt5/qml/QtMultimedia/
+%{_libdir}/qt5/qml/QtMultimedia/*
 
 %files gsttools
 %defattr(-,root,root,-)

other changes:
--------------

++++++ qt5-qtmultimedia-5.2.2.tar.bz2
--- qt5-qtmultimedia-5.2.2/qtmultimedia/.tag
+++ qt5-qtmultimedia-5.2.2/qtmultimedia/.tag
@@ -1 +1 @@
-bffb1cc117e08fb7571836698a5b688d0f4f5de9
+db7f7cc5654ddec60297259bc9f86f5f777749cd
--- qt5-qtmultimedia-5.2.2/qtmultimedia/src/multimedia/audio/qsoundeffect_pulse_p.cpp
+++ qt5-qtmultimedia-5.2.2/qtmultimedia/src/multimedia/audio/qsoundeffect_pulse_p.cpp
@@ -928,12 +928,8 @@
         return;
 
     pa_proplist *propList = pa_proplist_new();
-    if (m_category.isNull()) {
-        // Meant to be one of the strings "video", "music", "game", "event", "phone", "animation", "production", "a11y", "test"
-        pa_proplist_sets(propList, PA_PROP_MEDIA_ROLE, "game");
-    } else {
+    if (!m_category.isNull())
         pa_proplist_sets(propList, PA_PROP_MEDIA_ROLE, m_category.toLatin1().constData());
-    }
     pa_stream *stream = pa_stream_new_with_proplist(pulseDaemon()->context(), m_name.constData(), &m_pulseSpec, 0, propList);
     pa_proplist_free(propList);
 
--- qt5-qtmultimedia-5.2.2/qtmultimedia/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
+++ qt5-qtmultimedia-5.2.2/qtmultimedia/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
@@ -57,15 +57,16 @@
 class DataVideoBuffer : public QAbstractVideoBuffer
 {
 public:
-    DataVideoBuffer(const QByteArray &d)
+    DataVideoBuffer(const QByteArray &d, int bpl = -1)
         : QAbstractVideoBuffer(NoHandle)
         , data(d)
         , mode(NotMapped)
+        , bytesPerLine(bpl)
     { }
 
     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)
             return 0;
@@ -75,8 +76,8 @@
         if (numBytes)
             *numBytes = data.size();
 
-        if (bytesPerLine)
-            *bytesPerLine = -1;
+        if (bpl)
+            *bpl = bytesPerLine;
 
         return reinterpret_cast<uchar *>(data.data());
     }

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list