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

2
webrtc/examples/android/opensl_loopback/fake_audio_device_buffer.cc
View File

@ -22,7 +22,7 @@ FakeAudioDeviceBuffer::FakeAudioDeviceBuffer()
next_available_buffer_(0),
record_channels_(0),
play_channels_(0) {
buf_.reset(new scoped_ptr<int8_t[]>[kNumBuffers]);
buf_.reset(new rtc::scoped_ptr<int8_t[]>[kNumBuffers]);
for (int i = 0; i < kNumBuffers; ++i) {
buf_[i].reset(new int8_t[buffer_size_bytes()]);
}

4
webrtc/examples/android/opensl_loopback/fake_audio_device_buffer.h
View File

@ -11,10 +11,10 @@
#ifndef WEBRTC_EXAMPLES_ANDROID_OPENSL_LOOPBACK_FAKE_AUDIO_DEVICE_BUFFER_H_
#define WEBRTC_EXAMPLES_ANDROID_OPENSL_LOOPBACK_FAKE_AUDIO_DEVICE_BUFFER_H_
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/audio_device/android/audio_manager_jni.h"
#include "webrtc/modules/audio_device/android/single_rw_fifo.h"
#include "webrtc/modules/audio_device/audio_device_buffer.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
@ -55,7 +55,7 @@ class FakeAudioDeviceBuffer : public AudioDeviceBuffer {
AudioManagerJni audio_manager_;
SingleRwFifo fifo_;
scoped_ptr<scoped_ptr<int8_t[]>[]> buf_;
rtc::scoped_ptr<rtc::scoped_ptr<int8_t[]>[]> buf_;
int next_available_buffer_;
uint8_t record_channels_;

2
webrtc/examples/android/opensl_loopback/jni/opensl_runner.cc
View File

@ -11,13 +11,13 @@
#include <assert.h>
#include <jni.h>
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/examples/android/opensl_loopback/fake_audio_device_buffer.h"
#include "webrtc/modules/audio_device/android/audio_device_template.h"
#include "webrtc/modules/audio_device/android/audio_record_jni.h"
#include "webrtc/modules/audio_device/android/audio_track_jni.h"
#include "webrtc/modules/audio_device/android/opensles_input.h"
#include "webrtc/modules/audio_device/android/opensles_output.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
// Java globals
static JavaVM* g_vm = NULL;