Merge lp:~morphis/aethercast/fix-wds-api-break into lp:aethercast

[Simon Fels]

With WDS 1.0.0 the API has slightly changed. This adopts our implementation to respect the new API and build again.

With WDS 1.0.0 the API has slightly changed. This adopts our implementation to respect the new API and build again.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:185
http://jenkins.qa.ubuntu.com/job/aethercast-ci/133/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-amd64-ci/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-armhf-ci/133
        deb: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-armhf-ci/133/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-i386-ci/132

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/aethercast-ci/133/rebuild

review: Approve (continuous-integration)

[Thomas Voß (thomas-voss)]

Minor niggles inline.

review: Needs Fixing

[lp:~morphis/aethercast/fix-wds-api-break]

186. By Simon Fels on 2016-03-02

Fix review comments

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:186
http://jenkins.qa.ubuntu.com/job/aethercast-ci/147/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-amd64-ci/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-armhf-ci/147
        deb: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-armhf-ci/147/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/aethercast-vivid-i386-ci/146

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/aethercast-ci/147/rebuild

review: Approve (continuous-integration)

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

=== modified file 'src/mcs/basesourcemediamanager.cpp'
--- src/mcs/basesourcemediamanager.cpp	2015-12-07 16:02:43 +0000
+++ src/mcs/basesourcemediamanager.cpp	2016-03-02 11:29:57 +0000
@@ -20,7 +20,15 @@
 #include "basesourcemediamanager.h"
 #include "logger.h"
 
+namespace {
+static unsigned int next_session_id = 0;
+}
+
 namespace mcs {
+BaseSourceMediaManager::BaseSourceMediaManager() :
+    session_id_(++next_session_id) {
+}
+
 wds::SessionType BaseSourceMediaManager::GetSessionType() const {
     return wds::VideoSession;
 }
@@ -102,4 +110,8 @@
 void BaseSourceMediaManager::SendIDRPicture() {
     WARNING("Unimplemented IDR picture request");
 }
+
+std::string BaseSourceMediaManager::GetSessionId() const {
+    return std::to_string(session_id_);
+}
 } // namespace mcs

=== modified file 'src/mcs/basesourcemediamanager.h'
--- src/mcs/basesourcemediamanager.h	2015-11-26 16:48:53 +0000
+++ src/mcs/basesourcemediamanager.h	2016-03-02 11:29:57 +0000
@@ -24,6 +24,8 @@
 class BaseSourceMediaManager : public wds::SourceMediaManager
 {
 public:
+    explicit BaseSourceMediaManager();
+
     void SetSinkRtpPorts(int port1, int port2) override;
     std::pair<int,int> GetSinkRtpPorts() const override;
     int GetLocalRtpPort() const override;
@@ -35,6 +37,7 @@
     bool InitOptimalAudioFormat(const std::vector<wds::AudioCodec>& sink_supported_codecs) override;
     wds::AudioCodec GetOptimalAudioFormat() const override;
     void SendIDRPicture() override;
+    std::string GetSessionId() const override;
 
 protected:
     virtual void Configure() = 0;
@@ -43,6 +46,7 @@
     int sink_port1_;
     int sink_port2_;
     wds::H264VideoFormat format_;
+    unsigned int session_id_;
 };
 } // namespace mcs
 #endif

=== modified file 'src/mcs/miracastsourceclient.cpp'
--- src/mcs/miracastsourceclient.cpp	2015-12-09 16:07:13 +0000
+++ src/mcs/miracastsourceclient.cpp	2016-03-02 11:29:57 +0000
@@ -33,6 +33,10 @@
 #include "utils.h"
 #include "logging.h"
 
+namespace {
+static int send_cseq = 0;
+}
+
 namespace mcs {
 std::shared_ptr<MiracastSourceClient> MiracastSourceClient::Create(ScopedGObject<GSocket>&& socket) {
     std::shared_ptr<MiracastSourceClient> sp{new MiracastSourceClient{std::move(socket)}};
@@ -85,6 +89,13 @@
     return local_address_;
 }
 
+int MiracastSourceClient::GetNextCSeq(int *initial_peer_cseq) const {
+    ++send_cseq;
+    if (initial_peer_cseq && send_cseq == *initial_peer_cseq)
+        send_cseq *= 2;
+    return send_cseq;
+}
+
 class TimerCallbackData {
 public:
     TimerCallbackData(MiracastSourceClient *delegate) :

=== modified file 'src/mcs/miracastsourceclient.h'
--- src/mcs/miracastsourceclient.h	2015-12-07 09:07:50 +0000
+++ src/mcs/miracastsourceclient.h	2016-03-02 11:29:57 +0000
@@ -57,6 +57,7 @@
     std::string GetLocalIPAddress() const override;
     uint CreateTimer(int seconds) override;
     void ReleaseTimer(uint timerId) override;
+    int GetNextCSeq(int* initial_peer_cseq = nullptr) const override;
 
 public:
     static gboolean OnTimeout(gpointer user_data);