Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Side by Side Diff: remoting/codec/audio_encoder_opus.h

Issue 13642007: Rewrite scoped_array<T> to scoped_ptr<T[]> in remoting/, Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Manually rewrite Win files. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/client/audio_player_unittest.cc ('k') | remoting/codec/audio_encoder_speex.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_CODEC_AUDIO_ENCODER_OPUS_H_ 5 #ifndef REMOTING_CODEC_AUDIO_ENCODER_OPUS_H_
6 #define REMOTING_CODEC_AUDIO_ENCODER_OPUS_H_ 6 #define REMOTING_CODEC_AUDIO_ENCODER_OPUS_H_
7 7
8 #include "remoting/codec/audio_encoder.h" 8 #include "remoting/codec/audio_encoder.h"
9 9
10 #include "remoting/proto/audio.pb.h" 10 #include "remoting/proto/audio.pb.h"
(...skipping 25 matching lines...) Expand all
36 36
37 void FetchBytesToResample(int resampler_frame_delay, 37 void FetchBytesToResample(int resampler_frame_delay,
38 media::AudioBus* audio_bus); 38 media::AudioBus* audio_bus);
39 39
40 int sampling_rate_; 40 int sampling_rate_;
41 AudioPacket::Channels channels_; 41 AudioPacket::Channels channels_;
42 OpusEncoder* encoder_; 42 OpusEncoder* encoder_;
43 43
44 int frame_size_; 44 int frame_size_;
45 scoped_ptr<media::MultiChannelResampler> resampler_; 45 scoped_ptr<media::MultiChannelResampler> resampler_;
46 scoped_array<char> resample_buffer_; 46 scoped_ptr<char[]> resample_buffer_;
47 scoped_ptr<media::AudioBus> resampler_bus_; 47 scoped_ptr<media::AudioBus> resampler_bus_;
48 48
49 // Used to pass packet to the FetchBytesToResampler() callback. 49 // Used to pass packet to the FetchBytesToResampler() callback.
50 const char* resampling_data_; 50 const char* resampling_data_;
51 int resampling_data_size_; 51 int resampling_data_size_;
52 int resampling_data_pos_; 52 int resampling_data_pos_;
53 53
54 // Left-over unencoded samples from the previous AudioPacket. 54 // Left-over unencoded samples from the previous AudioPacket.
55 scoped_array<int16> leftover_buffer_; 55 scoped_ptr<int16[]> leftover_buffer_;
56 int leftover_buffer_size_; 56 int leftover_buffer_size_;
57 int leftover_samples_; 57 int leftover_samples_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(AudioEncoderOpus); 59 DISALLOW_COPY_AND_ASSIGN(AudioEncoderOpus);
60 }; 60 };
61 61
62 } // namespace remoting 62 } // namespace remoting
63 63
64 #endif // REMOTING_CODEC_AUDIO_ENCODER_OPUS_H_ 64 #endif // REMOTING_CODEC_AUDIO_ENCODER_OPUS_H_
OLDNEW
« no previous file with comments | « remoting/client/audio_player_unittest.cc ('k') | remoting/codec/audio_encoder_speex.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698