| Index: webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
|
| index 12c2db564bda22447678ab95eee7c311636d988e..d29e3d4f212bad5dabb73781fec56395f0300aa9 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
|
| @@ -8,11 +8,11 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#include <memory>
|
| #include <vector>
|
|
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| +#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/modules/include/module_common_types.h"
|
| #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
|
| #include "webrtc/modules/rtp_rtcp/source/rtp_format.h"
|
| @@ -72,7 +72,7 @@
|
| void TestFua(size_t frame_size,
|
| size_t max_payload_size,
|
| const std::vector<size_t>& expected_sizes) {
|
| - std::unique_ptr<uint8_t[]> frame;
|
| + rtc::scoped_ptr<uint8_t[]> frame;
|
| frame.reset(new uint8_t[frame_size]);
|
| frame[0] = 0x05; // F=0, NRI=0, Type=5.
|
| for (size_t i = 0; i < frame_size - kNalHeaderSize; ++i) {
|
| @@ -82,11 +82,11 @@
|
| fragmentation.VerifyAndAllocateFragmentationHeader(1);
|
| fragmentation.fragmentationOffset[0] = 0;
|
| fragmentation.fragmentationLength[0] = frame_size;
|
| - std::unique_ptr<RtpPacketizer> packetizer(RtpPacketizer::Create(
|
| + rtc::scoped_ptr<RtpPacketizer> packetizer(RtpPacketizer::Create(
|
| kRtpVideoH264, max_payload_size, NULL, kEmptyFrame));
|
| packetizer->SetPayloadData(frame.get(), frame_size, &fragmentation);
|
|
|
| - std::unique_ptr<uint8_t[]> packet(new uint8_t[max_payload_size]);
|
| + rtc::scoped_ptr<uint8_t[]> packet(new uint8_t[max_payload_size]);
|
| size_t length = 0;
|
| bool last = false;
|
| size_t offset = kNalHeaderSize;
|
| @@ -156,7 +156,7 @@
|
| fragmentation.VerifyAndAllocateFragmentationHeader(1);
|
| fragmentation.fragmentationOffset[0] = 0;
|
| fragmentation.fragmentationLength[0] = sizeof(frame);
|
| - std::unique_ptr<RtpPacketizer> packetizer(
|
| + rtc::scoped_ptr<RtpPacketizer> packetizer(
|
| RtpPacketizer::Create(kRtpVideoH264, kMaxPayloadSize, NULL, kEmptyFrame));
|
| packetizer->SetPayloadData(frame, sizeof(frame), &fragmentation);
|
| uint8_t packet[kMaxPayloadSize] = {0};
|
| @@ -185,7 +185,7 @@
|
| frame[fragmentation.fragmentationOffset[0]] = 0x01;
|
| frame[fragmentation.fragmentationOffset[1]] = 0x01;
|
|
|
| - std::unique_ptr<RtpPacketizer> packetizer(
|
| + rtc::scoped_ptr<RtpPacketizer> packetizer(
|
| RtpPacketizer::Create(kRtpVideoH264, kMaxPayloadSize, NULL, kEmptyFrame));
|
| packetizer->SetPayloadData(frame, kFrameSize, &fragmentation);
|
|
|
| @@ -222,7 +222,7 @@
|
| fragmentation.fragmentationOffset[2] = 4;
|
| fragmentation.fragmentationLength[2] =
|
| kNalHeaderSize + kFrameSize - kPayloadOffset;
|
| - std::unique_ptr<RtpPacketizer> packetizer(
|
| + rtc::scoped_ptr<RtpPacketizer> packetizer(
|
| RtpPacketizer::Create(kRtpVideoH264, kMaxPayloadSize, NULL, kEmptyFrame));
|
| packetizer->SetPayloadData(frame, kFrameSize, &fragmentation);
|
|
|
| @@ -257,7 +257,7 @@
|
| fragmentation.fragmentationOffset[2] = 4;
|
| fragmentation.fragmentationLength[2] =
|
| kNalHeaderSize + kFrameSize - kPayloadOffset;
|
| - std::unique_ptr<RtpPacketizer> packetizer(
|
| + rtc::scoped_ptr<RtpPacketizer> packetizer(
|
| RtpPacketizer::Create(kRtpVideoH264, kMaxPayloadSize, NULL, kEmptyFrame));
|
| packetizer->SetPayloadData(frame, kFrameSize, &fragmentation);
|
|
|
| @@ -305,7 +305,7 @@
|
| frame[nalu_offset + j] = i + j;
|
| }
|
| }
|
| - std::unique_ptr<RtpPacketizer> packetizer(
|
| + rtc::scoped_ptr<RtpPacketizer> packetizer(
|
| RtpPacketizer::Create(kRtpVideoH264, kMaxPayloadSize, NULL, kEmptyFrame));
|
| packetizer->SetPayloadData(frame, kFrameSize, &fragmentation);
|
|
|
| @@ -394,7 +394,7 @@
|
| ::testing::ElementsAreArray(data, length));
|
| }
|
|
|
| - std::unique_ptr<RtpDepacketizer> depacketizer_;
|
| + rtc::scoped_ptr<RtpDepacketizer> depacketizer_;
|
| };
|
|
|
| TEST_F(RtpDepacketizerH264Test, TestSingleNalu) {
|
|
|