X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Fwebrtc%2Fmodules%2Fvideo_coding%2Fmain%2Fsource%2Fvideo_sender_unittest.cc;h=6bc8b80d8f42be4677fa04f61a4160c4ced590d2;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=0b8193b21ca498ec971299c1c163dc3852ec87a3;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/webrtc/modules/video_coding/main/source/video_sender_unittest.cc b/src/third_party/webrtc/modules/video_coding/main/source/video_sender_unittest.cc index 0b8193b..6bc8b80 100644 --- a/src/third_party/webrtc/modules/video_coding/main/source/video_sender_unittest.cc +++ b/src/third_party/webrtc/modules/video_coding/main/source/video_sender_unittest.cc @@ -70,7 +70,10 @@ MATCHER_P(MatchesVp8StreamInfo, expected, "") { class EmptyFrameGenerator : public FrameGenerator { public: - I420VideoFrame* NextFrame() OVERRIDE { frame_.ResetSize(); return &frame_; } + virtual I420VideoFrame* NextFrame() OVERRIDE { + frame_.ResetSize(); + return &frame_; + } private: I420VideoFrame frame_; @@ -90,7 +93,7 @@ class PacketizationCallback : public VCMPacketizationCallback { const uint8_t* payload_data, uint32_t payload_size, const RTPFragmentationHeader& fragmentation_header, - const RTPVideoHeader* rtp_video_header) { + const RTPVideoHeader* rtp_video_header) OVERRIDE { assert(rtp_video_header); frame_data_.push_back(FrameData(payload_size, *rtp_video_header)); return 0; @@ -172,7 +175,7 @@ class TestVideoSender : public ::testing::Test { // a special case (e.g. frame rate in media optimization). TestVideoSender() : clock_(1000), packetization_callback_(&clock_) {} - virtual void SetUp() { + virtual void SetUp() OVERRIDE { sender_.reset(new VideoSender(&clock_, &post_encode_callback_)); EXPECT_EQ(0, sender_->InitializeSender()); EXPECT_EQ(0, sender_->RegisterTransportCallback(&packetization_callback_)); @@ -198,7 +201,7 @@ class TestVideoSenderWithMockEncoder : public TestVideoSender { static const int kNumberOfLayers = 3; static const int kUnusedPayloadType = 10; - virtual void SetUp() { + virtual void SetUp() OVERRIDE { TestVideoSender::SetUp(); generator_.reset(new EmptyFrameGenerator()); EXPECT_EQ( @@ -221,7 +224,7 @@ class TestVideoSenderWithMockEncoder : public TestVideoSender { EXPECT_EQ(0, sender_->RegisterSendCodec(&settings_, 1, 1200)); } - virtual void TearDown() { sender_.reset(); } + virtual void TearDown() OVERRIDE { sender_.reset(); } void ExpectIntraRequest(int stream) { if (stream == -1) { @@ -314,7 +317,7 @@ class TestVideoSenderWithVp8 : public TestVideoSender { TestVideoSenderWithVp8() : codec_bitrate_kbps_(300), available_bitrate_kbps_(1000) {} - virtual void SetUp() { + virtual void SetUp() OVERRIDE { TestVideoSender::SetUp(); const char* input_video = "foreman_cif";