directrenderer: Use smart ptr for frame

-Also set the size for every frame
-This patch also fix the API break of IncomingTrustRequest

Refs #75280

-Warning : This break frame retrieval for OS X

Change-Id: I6f488b7f11d884ab21a2edf10a4f211d541fb9ef

src/private/directrenderer.cpp

@@ -72,13 +72,15 @@ void Video::DirectRenderer::stopRendering ()
    emit stopped();
 }
 
-void Video::DirectRenderer::onNewFrame(const QByteArray& frame)
+void Video::DirectRenderer::onNewFrame(const std::shared_ptr<std::vector<unsigned char> >& frame, int w, int h)
 {
    if (!isRendering()) {
       return;
    }
 
-   Video::Renderer::d_ptr->m_pFrame = const_cast<char*>(frame.data());
+   Video::Renderer::d_ptr->m_pSize.setWidth(w);
+   Video::Renderer::d_ptr->m_pSize.setHeight(h);
+   Video::Renderer::d_ptr->m_pSFrame = frame;
    emit frameUpdated();
 }
 

src/private/directrenderer.h

@@ -18,6 +18,8 @@
 #ifndef VIDEO_DIRECT_RENDERER_H
 #define VIDEO_DIRECT_RENDERER_H
 
+#include <memory>
+
 //Base
 #include <QtCore/QObject>
 #include "typedefs.h"
@@ -51,7 +53,7 @@ public:
    //Getter
    virtual ColorSpace colorSpace() const override;
 
-   void onNewFrame(const QByteArray& frame);
+   void onNewFrame(const std::shared_ptr<std::vector<unsigned char> >& frame, int w, int h);
 
 public Q_SLOTS:
    virtual void startRendering() override;

src/private/videorenderer_p.h

@@ -18,6 +18,8 @@
 #ifndef RENDERERPRIVATE_H
 #define RENDERERPRIVATE_H
 
+#include <memory>
+
 //Qt
 #include <QtCore/QObject>
 #include <QtCore/QSize>
@@ -42,6 +44,7 @@ public:
    QString           m_Id         ;
    QSize             m_pSize      ;
    char*             m_pFrame     ;
+   std::shared_ptr<std::vector<unsigned char> > m_pSFrame;
    QByteArray        m_Content    ;
    unsigned int      m_FrameSize  ;
 

src/private/videorenderermanager.cpp

@@ -213,9 +213,9 @@ void VideoRendererManagerPrivate::startedDecoding(const QString& id, const QStri
       m_hRenderers[rid] = r;
       m_hRendererIds[r]=rid;
 
-      DBus::VideoManager::instance().registerSinkTarget(id, [this, id, width, height] (const unsigned char* frame) {
+      DBus::VideoManager::instance().registerSinkTarget(id, [this, id, width, height] (const std::shared_ptr<std::vector<unsigned char> >& frame, int w, int h) {
          static_cast<Video::DirectRenderer*>(m_hRenderers[id.toLatin1()])->onNewFrame(
-            QByteArray::fromRawData(reinterpret_cast<const char *>(frame), width*height)
+            frame, w, h
          );
       });
 
@@ -243,10 +243,9 @@ void VideoRendererManagerPrivate::startedDecoding(const QString& id, const QStri
       r->setSize(res);
 
 #ifdef ENABLE_LIBWRAP
-
-      DBus::VideoManager::instance().registerSinkTarget(id, [this, id, width, height] (const unsigned char* frame) {
+      DBus::VideoManager::instance().registerSinkTarget(id, [this, id, width, height] (const std::shared_ptr<std::vector<unsigned char> >& frame, int w, int h) {
         static_cast<Video::DirectRenderer*>(m_hRenderers[id.toLatin1()])->onNewFrame(
-            QByteArray::fromRawData(reinterpret_cast<const char *>(frame), width*height)
+            frame, w, h
         );
       });
 

src/qtwrapper/configurationmanager_wrap.h

@@ -119,7 +119,7 @@ public:
          }),
 
          exportable_callback<ConfigurationSignal::IncomingTrustRequest>(
-               [this] (const std::string &accountId, const std::string &certId, time_t timestamp) {
+               [this] (const std::string &accountId, const std::string &certId, const std::vector<uint8_t> &payload, time_t timestamp) {
                      QTimer::singleShot(0, [this, certId,accountId,timestamp] {
                            Q_EMIT this->incomingTrustRequest(QString(accountId.c_str()), QString(certId.c_str()), timestamp);
                      });

src/qtwrapper/videomanager_wrap.h

@@ -196,14 +196,14 @@ public Q_SLOTS: // METHODS
 #endif
     }
 
-    void registerSinkTarget(const QString &sinkID, std::function<void(uint8_t*)>&& cb)
+    void registerSinkTarget(const QString &sinkID, std::function<void(std::shared_ptr<std::vector<unsigned char> >&, int, int)>&& cb)
     {
 #ifdef ENABLE_VIDEO
         DRing::registerSinkTarget(sinkID.toStdString(), std::move(cb));
 #endif
     }
 
-    void registerSinkTarget(const QString &sinkID, std::function<void(uint8_t*)>& cb)
+    void registerSinkTarget(const QString &sinkID, std::function<void(std::shared_ptr<std::vector<unsigned char> >&, int, int)>& cb)
     {
 #ifdef ENABLE_VIDEO
         DRing::registerSinkTarget(sinkID.toStdString(), std::move(cb));

src/video/renderer.cpp

@@ -73,6 +73,21 @@ const QByteArray& Video::Renderer::currentFrame() const
    return d_ptr->m_Content;
 }
 
+const std::shared_ptr<std::vector<unsigned char> >& Video::Renderer::currentSmartFrame() const
+{
+   return d_ptr->m_pSFrame;
+}
+
+bool Video::Renderer::isFrameSmart() const
+{
+#ifdef ENABLE_LIBWRAP
+  return true;
+#else
+  return false;
+#endif
+}
+
+
 /*****************************************************************************
  *                                                                           *
  *                                 Setters                                   *

src/video/renderer.h

@@ -18,6 +18,8 @@
 #ifndef VIDEO_ABSTRACT_RENDERER_H
 #define VIDEO_ABSTRACT_RENDERER_H
 
+#include <memory>
+
 //Base
 #include <QtCore/QObject>
 #include <typedefs.h>
@@ -75,6 +77,8 @@ public:
    //Getters
    virtual bool              isRendering     () const;
    virtual const QByteArray& currentFrame    () const;
+   virtual const std::shared_ptr<std::vector<unsigned char> >& currentSmartFrame() const;
+   virtual bool        isFrameSmart() const;
    virtual QSize             size            () const;
    virtual QMutex*           mutex           () const;
    virtual ColorSpace        colorSpace      () const = 0;

xml/configurationmanager-introspec.xml

@@ -936,6 +936,8 @@
            </arg>
            <arg type="s" name="from">
            </arg>
+           <arg type="ay" name="payload">
+           </arg>
            <arg type="t" name="receiveTime">
            </arg>
        </signal>