Merge lp:~phablet-team/aethercast/fix-for-microsoft-dongle into lp:aethercast

[Alfonso Sanchez-Beato]

Fix for Microsoft dongle

Fix for Microsoft dongle

[Jim Hodapp (jhodapp)]

I'd be curious what the negotiation phase looks like with the Microsoft dongle. Maybe it states that it always requires an audio codec be specified even though it's supposed to support video-only streams?

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

The source (us) tells the sink the parameters for the transmission in a SET_PARAMETERS command. The sink does not say in any way that it needs an audio codec: it only says the supported codecs, and we decide which to use if any.

[Simon Fels (morphis)]

There is no "I-require-video-and-audio-together" flag in the spec. My suspect ion is more that this is simply a test case nobody tests that much as anybody out there doing WiDi supports audio/video always together and not just video as we do at the moment.

review: Approve

=== modified file 'src/mcs/basesourcemediamanager.cpp'
--- src/mcs/basesourcemediamanager.cpp	2016-04-22 08:17:23 +0000
+++ src/mcs/basesourcemediamanager.cpp	2016-05-05 17:34:16 +0000
@@ -39,7 +39,12 @@
 }
 
 wds::SessionType BaseSourceMediaManager::GetSessionType() const {
-    return wds::VideoSession;
+    /* Even though we will send only video for the moment in the MPEG stream,
+     * we identify ourselves as an audio/video session, because some buggy
+     * dongles need the audio codec to be set in the negotiation for screencast
+     * to happen.
+     */
+    return wds::AudioVideoSession;
 }
 
 void BaseSourceMediaManager::SetSinkRtpPorts(int port1, int port2) {
@@ -121,19 +126,16 @@
 }
 
 bool BaseSourceMediaManager::InitOptimalAudioFormat(const std::vector<wds::AudioCodec>& sink_codecs) {
-    for (const auto& codec : sink_codecs) {
-        if (codec.format == wds::AAC && codec.modes.test(wds::AAC_48K_16B_2CH))
-            return true;
-    }
+    if (sink_codecs.empty())
+        return false;
 
-    return false;
+    /* Just take first codec until we implement audio */
+    audio_codec_ = sink_codecs[0];
+    return true;
 }
 
 wds::AudioCodec BaseSourceMediaManager::GetOptimalAudioFormat() const {
-  wds::AudioModes audio_modes;
-  audio_modes.set(wds::AAC_48K_16B_2CH);
-
-  return wds::AudioCodec(wds::AAC, audio_modes, 0);
+  return audio_codec_;
 }
 
 void BaseSourceMediaManager::SendIDRPicture() {

=== modified file 'src/mcs/basesourcemediamanager.h'
--- src/mcs/basesourcemediamanager.h	2016-04-22 08:17:23 +0000
+++ src/mcs/basesourcemediamanager.h	2016-05-05 17:34:16 +0000
@@ -61,6 +61,7 @@
     int sink_port1_;
     int sink_port2_;
     wds::H264VideoFormat format_;
+    wds::AudioCodec audio_codec_;
     unsigned int session_id_;
 };
 } // namespace mcs