LibAAH_RTP: Add unicast mode support to the RXPlayer

Add support for unicast mode to the AAH RXPlayer.  At the API level,
things should be pretty simple.  To use unicast mode, instead of
passing the multicast address and port in the data source URL, just
pass the unicast address and port of the transmitters command and
control port.  For example, instead of

aahRX://224.128.60.5:8867

one might instead pass

aahRX://192.168.63.5:55476

Change-Id: I7b40716983d7a91def86dcf40f093dda4255aae3
Signed-off-by: John Grossman <johngro@google.com>

Author: johngro

media/libaah_rtp/aah_rx_player.cpp

@@ -39,14 +39,15 @@ AAH_RXPlayer::AAH_RXPlayer()
 
     is_playing_          = false;
     multicast_joined_    = false;
+    multicast_mode_      = false;
     transmitter_known_   = false;
     current_epoch_known_ = false;
     data_source_set_     = false;
     sock_fd_             = -1;
 
     substreams_.setCapacity(4);
 
-    memset(&listen_addr_,      0, sizeof(listen_addr_));
+    memset(&data_source_addr_, 0, sizeof(data_source_addr_));
     memset(&transmitter_addr_, 0, sizeof(transmitter_addr_));
 
     fetchAudioFlinger();
@@ -112,10 +113,10 @@ status_t AAH_RXPlayer::setDataSource(
 
     a = (a << 24) | (b << 16) | (c <<  8) | d;
 
-    memset(&listen_addr_, 0, sizeof(listen_addr_));
-    listen_addr_.sin_family      = AF_INET;
-    listen_addr_.sin_port        = htons(port);
-    listen_addr_.sin_addr.s_addr = htonl(a);
+    memset(&data_source_addr_, 0, sizeof(data_source_addr_));
+    data_source_addr_.sin_family      = AF_INET;
+    data_source_addr_.sin_port        = htons(port);
+    data_source_addr_.sin_addr.s_addr = htonl(a);
     data_source_set_ = true;
 
     return OK;
@@ -202,9 +203,9 @@ void AAH_RXPlayer::reset_l() {
     CHECK(sock_fd_ < 0);
     CHECK(!multicast_joined_);
     is_playing_ = false;
-    data_source_set_ = false;
     transmitter_known_ = false;
-    memset(&listen_addr_, 0, sizeof(listen_addr_));
+    memset(&data_source_addr_, 0, sizeof(data_source_addr_));
+    data_source_set_ = false;
 }
 
 status_t AAH_RXPlayer::setLooping(int loop) {

media/libaah_rtp/aah_rx_player.h

@@ -266,19 +266,23 @@ class AAH_RXPlayer : public MediaPlayerInterface {
     void                processRingBuffer();
     void                processCommandPacket(PacketBuffer* pb);
     bool                processGaps();
+    bool                processRetransmitNAK(const uint8_t* data, size_t amt);
     void                setGapStatus(GapStatus status);
     void                cleanoutExpiredSubstreams();
+    void                sendUnicastGroupJoin();
+    void                sendUnicastGroupLeave();
     void                fetchAudioFlinger();
 
     PipeEvent           wakeup_work_thread_evt_;
     sp<ThreadWrapper>   thread_wrapper_;
     Mutex               api_lock_;
     bool                is_playing_;
-    bool                data_source_set_;
 
-    struct sockaddr_in  listen_addr_;
-    int                 sock_fd_;
+    struct sockaddr_in  data_source_addr_;
+    bool                data_source_set_;
+    bool                multicast_mode_;
     bool                multicast_joined_;
+    int                 sock_fd_;
 
     struct sockaddr_in  transmitter_addr_;
     bool                transmitter_known_;
@@ -291,6 +295,7 @@ class AAH_RXPlayer : public MediaPlayerInterface {
     Timeout             next_retrans_req_timeout_;
 
     Timeout             ss_cleanout_timeout_;
+    Timeout             unicast_group_report_timeout_;
 
     RXRingBuffer        ring_buffer_;
     SubstreamVec        substreams_;
@@ -301,13 +306,13 @@ class AAH_RXPlayer : public MediaPlayerInterface {
     sp<IAudioFlinger>   audio_flinger_;
 
     static const uint32_t kRTPRingBufferSize;
-    static const uint32_t kRetransRequestMagic;
-    static const uint32_t kFastStartRequestMagic;
-    static const uint32_t kRetransNAKMagic;
+
     static const uint32_t kGapRerequestTimeoutMsec;
     static const uint32_t kFastStartTimeoutMsec;
     static const uint32_t kRTPActivityTimeoutMsec;
     static const uint32_t kSSCleanoutTimeoutMsec;
+    static const uint32_t kGrpMemberSlowReportIntervalMsec;
+    static const uint32_t kGrpMemberFastReportIntervalMsec;
 
     static const uint32_t INVOKE_GET_MASTER_VOLUME = 3;
     static const uint32_t INVOKE_SET_MASTER_VOLUME = 4;