Cast: merge InsertCoded{Audio,Video}Frame into InsertFrame

media/cast/net/cast_transport_sender_impl_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <gtest/gtest.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 146 matching lines @@
   InitializeVideo();
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(50));
 
   // A fake frame that will be decomposed into 4 packets.
   EncodedFrame fake_frame;
   fake_frame.frame_id = 1;
   fake_frame.rtp_timestamp = 1;
   fake_frame.dependency = EncodedFrame::KEY;
   fake_frame.data.resize(5000, ' ');
 
-  transport_sender_->InsertCodedVideoFrame(fake_frame);
+  transport_sender_->InsertFrame(kVideoSsrc, fake_frame);
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(10));
   EXPECT_EQ(4, transport_.packets_sent());
 
   // Resend packet 0.
   MissingFramesAndPacketsMap missing_packets;
   missing_packets[1].insert(0);
   missing_packets[1].insert(1);
   missing_packets[1].insert(2);
 
   transport_.SetPaused(true);
@@ skipping 24 matching lines @@
   InitializeVideo();
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(50));
 
   // A fake frame that will be decomposed into 4 packets.
   EncodedFrame fake_frame;
   fake_frame.frame_id = 1;
   fake_frame.rtp_timestamp = 1;
   fake_frame.dependency = EncodedFrame::KEY;
   fake_frame.data.resize(5000, ' ');
 
-  transport_sender_->InsertCodedVideoFrame(fake_frame);
+  transport_sender_->InsertFrame(kVideoSsrc, fake_frame);
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(10));
   EXPECT_EQ(4, transport_.packets_sent());
 
   // Resend all packets for frame 1.
   MissingFramesAndPacketsMap missing_packets;
   missing_packets[1].insert(kRtcpCastAllPacketsLost);
 
   transport_.SetPaused(true);
   DedupInfo dedup_info;
   dedup_info.resend_interval = base::TimeDelta::FromMilliseconds(10);
@@ skipping 18 matching lines @@
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(50));
 
   // A fake frame that will be decomposed into 4 packets.
   EncodedFrame fake_frame;
   fake_frame.frame_id = 1;
   fake_frame.rtp_timestamp = 1;
   fake_frame.dependency = EncodedFrame::KEY;
   fake_frame.data.resize(5000, ' ');
 
   transport_.SetPaused(true);
-  transport_sender_->InsertCodedVideoFrame(fake_frame);
+  transport_sender_->InsertFrame(kVideoSsrc, fake_frame);
   transport_sender_->ResendFrameForKickstart(kVideoSsrc, 1);
   transport_.SetPaused(false);
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(10));
   EXPECT_EQ(4, transport_.packets_sent());
 
   // Resend 2 packets for frame 1.
   MissingFramesAndPacketsMap missing_packets;
   missing_packets[1].insert(0);
   missing_packets[1].insert(1);
 
@@ skipping 16 matching lines @@
   InitializeAudio();
   InitializeVideo();
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(50));
 
   // Send two audio frames.
   EncodedFrame fake_audio;
   fake_audio.frame_id = 1;
   fake_audio.reference_time = testing_clock_.NowTicks();
   fake_audio.dependency = EncodedFrame::KEY;
   fake_audio.data.resize(100, ' ');
-  transport_sender_->InsertCodedAudioFrame(fake_audio);
+  transport_sender_->InsertFrame(kAudioSsrc, fake_audio);
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(2));
   fake_audio.frame_id = 2;
   fake_audio.reference_time = testing_clock_.NowTicks();
-  transport_sender_->InsertCodedAudioFrame(fake_audio);
+  transport_sender_->InsertFrame(kAudioSsrc, fake_audio);
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(2));
   EXPECT_EQ(2, transport_.packets_sent());
 
   // Ack the first audio frame.
   RtcpCastMessage cast_message;
   cast_message.media_ssrc = kAudioSsrc;
   cast_message.ack_frame_id = 1;
   transport_sender_->OnReceivedCastMessage(kAudioSsrc,
                                            RtcpCastMessageCallback(),
                                            cast_message);
   task_runner_->RunTasks();
   EXPECT_EQ(2, transport_.packets_sent());
 
   // Send a fake video frame that will be decomposed into 4 packets.
   EncodedFrame fake_video;
   fake_video.frame_id = 1;
   fake_video.dependency = EncodedFrame::KEY;
   fake_video.data.resize(5000, ' ');
-  transport_sender_->InsertCodedVideoFrame(fake_video);
+  transport_sender_->InsertFrame(kVideoSsrc, fake_video);
   task_runner_->RunTasks();
   EXPECT_EQ(6, transport_.packets_sent());
 
   // Retransmission is reject because audio is not acked yet.
   cast_message.media_ssrc = kVideoSsrc;
   cast_message.ack_frame_id = 0;
   cast_message.missing_frames_and_packets[1].insert(3);
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(10));
   transport_sender_->OnReceivedCastMessage(kVideoSsrc,
                                            RtcpCastMessageCallback(),
@@ skipping 19 matching lines @@
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(2));
   transport_sender_->OnReceivedCastMessage(kVideoSsrc,
                                            RtcpCastMessageCallback(),
                                            cast_message);
   task_runner_->RunTasks();
   EXPECT_EQ(7, transport_.packets_sent());
 }
 
 }  // namespace cast
 }  // namespace media