zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use base/scoped_ptr.h; system_wrappers/interface/scoped_ptr.h is going away

Browse Source 
BUG=
R=andrew@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8517}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8517 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kwiberg@webrtc.org
2015-02-26 14:34:55 +00:00
parent ac2d27d9ae
commit 00b8f6b364
391 changed files with 1427 additions and 1402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/video_coding/codecs/test/videoprocessor.cc
View File

@ -271,7 +271,7 @@ void VideoProcessorImpl::FrameEncoded(const EncodedImage& encoded_image) {
assert(false);
}
}
scoped_ptr<uint8_t[]> copied_buffer(new uint8_t[encoded_image._length]);
rtc::scoped_ptr<uint8_t[]> copied_buffer(new uint8_t[encoded_image._length]);
memcpy(copied_buffer.get(), encoded_image._buffer, encoded_image._length);
EncodedImage copied_image;
memcpy(&copied_image, &encoded_image, sizeof(copied_image));
@ -337,7 +337,7 @@ void VideoProcessorImpl::FrameDecoded(const I420VideoFrame& image) {
}
// TODO(mikhal): Extracting the buffer for now - need to update test.
size_t length = CalcBufferSize(kI420, up_image.width(), up_image.height());
scoped_ptr<uint8_t[]> image_buffer(new uint8_t[length]);
rtc::scoped_ptr<uint8_t[]> image_buffer(new uint8_t[length]);
int extracted_length = ExtractBuffer(up_image, length, image_buffer.get());
assert(extracted_length > 0);
// Update our copy of the last successful frame:
@ -351,7 +351,7 @@ void VideoProcessorImpl::FrameDecoded(const I420VideoFrame& image) {
// Update our copy of the last successful frame:
// TODO(mikhal): Add as a member function, so won't be allocated per frame.
size_t length = CalcBufferSize(kI420, image.width(), image.height());
scoped_ptr<uint8_t[]> image_buffer(new uint8_t[length]);
rtc::scoped_ptr<uint8_t[]> image_buffer(new uint8_t[length]);
int extracted_length = ExtractBuffer(image, length, image_buffer.get());
assert(extracted_length > 0);
memcpy(last_successful_frame_buffer_, image_buffer.get(), extracted_length);

4
webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
View File

@ -11,10 +11,10 @@
#include "gtest/gtest.h"
#include "vpx/vpx_encoder.h"
#include "vpx/vp8cx.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
#include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h"
#include "webrtc/modules/video_coding/utility/include/mock/mock_frame_dropper.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
using ::testing::_;
using ::testing::NiceMock;
@ -93,7 +93,7 @@ class ScreenshareLayerTest : public ::testing::Test {
NiceMock<MockFrameDropper> tl0_frame_dropper_;
NiceMock<MockFrameDropper> tl1_frame_dropper_;
scoped_ptr<ScreenshareLayersFT> layers_;
rtc::scoped_ptr<ScreenshareLayersFT> layers_;
};
TEST_F(ScreenshareLayerTest, 1Layer) {

6
webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h
View File

@ -14,8 +14,8 @@
#include <vector>
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
@ -97,8 +97,8 @@ class SimulcastEncoderAdapter : public VP8Encoder,
bool Initialized() const;
scoped_ptr<VideoEncoderFactory> factory_;
scoped_ptr<Config> screensharing_extra_options_;
rtc::scoped_ptr<VideoEncoderFactory> factory_;
rtc::scoped_ptr<Config> screensharing_extra_options_;
VideoCodec codec_;
std::vector<StreamInfo> streaminfos_;
EncodedImageCallback* encoded_complete_callback_;

4
webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
View File

@ -281,8 +281,8 @@ class TestSimulcastEncoderAdapterFake : public ::testing::Test {
}
protected:
scoped_ptr<TestSimulcastEncoderAdapterFakeHelper> helper_;
scoped_ptr<VP8Encoder> adapter_;
rtc::scoped_ptr<TestSimulcastEncoderAdapterFakeHelper> helper_;
rtc::scoped_ptr<VP8Encoder> adapter_;
VideoCodec codec_;
};

6
webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h
View File

@ -14,6 +14,7 @@
#include <algorithm>
#include <vector>
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/common.h"
#include "webrtc/experiments.h"
#include "webrtc/common_video/interface/i420_video_frame.h"
@ -21,7 +22,6 @@
#include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "gtest/gtest.h"
@ -987,9 +987,9 @@ class TestVp8Simulcast : public ::testing::Test {
}
}
scoped_ptr<VP8Encoder> encoder_;
rtc::scoped_ptr<VP8Encoder> encoder_;
MockEncodedImageCallback encoder_callback_;
scoped_ptr<VP8Decoder> decoder_;
rtc::scoped_ptr<VP8Decoder> decoder_;
MockDecodedImageCallback decoder_callback_;
VideoCodec settings_;
I420VideoFrame input_frame_;

18
webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
View File

@ -11,9 +11,9 @@
#include <stdio.h>
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/gtest_disable.h"
@ -41,7 +41,7 @@ class Vp8UnitTestEncodeCompleteCallback : public webrtc::EncodedImageCallback {
private:
EncodedImage* const encoded_frame_;
scoped_ptr<uint8_t[]> frame_buffer_;
rtc::scoped_ptr<uint8_t[]> frame_buffer_;
bool encode_complete_;
};
@ -177,13 +177,13 @@ class TestVp8Impl : public ::testing::Test {
const int kWidth = 172;
const int kHeight = 144;
scoped_ptr<Vp8UnitTestEncodeCompleteCallback> encode_complete_callback_;
scoped_ptr<Vp8UnitTestDecodeCompleteCallback> decode_complete_callback_;
scoped_ptr<uint8_t[]> source_buffer_;
rtc::scoped_ptr<Vp8UnitTestEncodeCompleteCallback> encode_complete_callback_;
rtc::scoped_ptr<Vp8UnitTestDecodeCompleteCallback> decode_complete_callback_;
rtc::scoped_ptr<uint8_t[]> source_buffer_;
FILE* source_file_;
I420VideoFrame input_frame_;
scoped_ptr<VideoEncoder> encoder_;
scoped_ptr<VideoDecoder> decoder_;
rtc::scoped_ptr<VideoEncoder> encoder_;
rtc::scoped_ptr<VideoDecoder> decoder_;
EncodedImage encoded_frame_;
I420VideoFrame decoded_frame_;
size_t length_source_frame_;
@ -257,13 +257,13 @@ TEST_F(TestVp8Impl, TestReset) {
EXPECT_EQ(0, encoder_->Encode(input_frame_, NULL, NULL));
EXPECT_EQ(0, decoder_->Decode(encoded_frame_, false, NULL));
size_t length = CalcBufferSize(kI420, kWidth, kHeight);
scoped_ptr<uint8_t[]> first_frame_buffer(new uint8_t[length]);
rtc::scoped_ptr<uint8_t[]> first_frame_buffer(new uint8_t[length]);
ExtractBuffer(decoded_frame_, length, first_frame_buffer.get());
EXPECT_EQ(0, decoder_->Reset());
EXPECT_EQ(0, decoder_->Decode(encoded_frame_, false, NULL));
scoped_ptr<uint8_t[]> second_frame_buffer(new uint8_t[length]);
rtc::scoped_ptr<uint8_t[]> second_frame_buffer(new uint8_t[length]);
ExtractBuffer(decoded_frame_, length, second_frame_buffer.get());
EXPECT_EQ(

4
webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc
View File

@ -9,11 +9,11 @@
*/
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/common_video/interface/i420_video_frame.h"
#include "webrtc/common_video/interface/video_image.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/metrics/video_metrics.h"
@ -142,7 +142,7 @@ int SequenceCoder(webrtc::test::CommandLineParser& parser) {
EXPECT_EQ(0, decoder->InitDecode(&inst, 1));
webrtc::I420VideoFrame input_frame;
size_t length = webrtc::CalcBufferSize(webrtc::kI420, width, height);
webrtc::scoped_ptr<uint8_t[]> frame_buffer(new uint8_t[length]);
rtc::scoped_ptr<uint8_t[]> frame_buffer(new uint8_t[length]);
int half_width = (width + 1) / 2;
// Set and register callbacks.