commit 456f01441aa4f8c0c8b98aa6d9c2af4a4817e8db
author minyue@webrtc.org <minyue@webrtc.org> Fri Jan 23 11:58:42 2015 +0000
committer minyue@webrtc.org <minyue@webrtc.org> Fri Jan 23 11:58:42 2015 +0000
tree f0b41a196460b54b9572d6aa0d90e823a8da0346
parent 182ea46facde45811faebec40ad4981fd8db56a1

Re-allowing RED in voice engine.

Path of audio RED packets was blocked in r4692 by accident. It ought be enabled again.

BUG=3619
R=henrika@webrtc.org, stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/34799004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8137 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/voice_engine/channel.cc

diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index dec40cb..62d5882 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -1654,8 +1654,8 @@
                             size_t packet_length,
                             const RTPHeader& header,
                             bool in_order) {
-  if (rtp_payload_registry_->IsEncapsulated(header)) {
-    return HandleEncapsulation(packet, packet_length, header);
+  if (rtp_payload_registry_->IsRtx(header)) {
+    return HandleRtxPacket(packet, packet_length, header);
   }
   const uint8_t* payload = packet + header.headerLength;
   assert(packet_length >= header.headerLength);
@@ -1669,9 +1669,9 @@
                                           payload_specific, in_order);
 }
 
-bool Channel::HandleEncapsulation(const uint8_t* packet,
-                                  size_t packet_length,
-                                  const RTPHeader& header) {
+bool Channel::HandleRtxPacket(const uint8_t* packet,
+                              size_t packet_length,
+                              const RTPHeader& header) {
   if (!rtp_payload_registry_->IsRtx(header))
     return false;
 

webrtc/voice_engine/channel.h

diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
index d7656ce..b856af3 100644
--- a/webrtc/voice_engine/channel.h
+++ b/webrtc/voice_engine/channel.h
@@ -457,9 +457,9 @@
 private:
     bool ReceivePacket(const uint8_t* packet, size_t packet_length,
                        const RTPHeader& header, bool in_order);
-    bool HandleEncapsulation(const uint8_t* packet,
-                             size_t packet_length,
-                             const RTPHeader& header);
+    bool HandleRtxPacket(const uint8_t* packet,
+                         size_t packet_length,
+                         const RTPHeader& header);
     bool IsPacketInOrder(const RTPHeader& header) const;
     bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const;
     int ResendPackets(const uint16_t* sequence_numbers, int length);

webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc

diff --git a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
index 09a70a9..1155234 100644
--- a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
+++ b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
@@ -457,9 +457,14 @@
       if (option_selection < option_index) {
         res = codec->GetCodec(option_selection, cinst);
         VALIDATE;
-        SetStereoIfOpus(opus_stereo, &cinst);
-        printf("Set primary codec\n");
-        res = codec->SetSendCodec(chan, cinst);
+        if (strcmp(cinst.plname, "red") == 0) {
+          printf("Enabling RED\n");
+          res = rtp_rtcp->SetREDStatus(chan, true, cinst.pltype);
+        } else {
+          SetStereoIfOpus(opus_stereo, &cinst);
+          printf("Set primary codec\n");
+          res = codec->SetSendCodec(chan, cinst);
+        }
         VALIDATE;
       } else if (option_selection == option_index++) {
         enable_cng = !enable_cng;