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

Side by Side Diff: remoting/codec/audio_decoder_verbatim.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 #include "remoting/codec/audio_decoder_verbatim.h" 5 #include "remoting/codec/audio_decoder_verbatim.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "remoting/proto/audio.pb.h" 8 #include "remoting/proto/audio.pb.h"
9 9
10 namespace remoting { 10 namespace remoting {
11 11
12 AudioDecoderVerbatim::AudioDecoderVerbatim() { 12 AudioDecoderVerbatim::AudioDecoderVerbatim() {
13 } 13 }
14 14
15 AudioDecoderVerbatim::~AudioDecoderVerbatim() { 15 AudioDecoderVerbatim::~AudioDecoderVerbatim() {
16 } 16 }
17 17
18 scoped_ptr<AudioPacket> AudioDecoderVerbatim::Decode( 18 scoped_ptr<AudioPacket> AudioDecoderVerbatim::Decode(
19 scoped_ptr<AudioPacket> packet) { 19 scoped_ptr<AudioPacket> packet) {
20 // Return a null scoped_ptr if we get a corrupted packet. 20 // Return a null scoped_ptr if we get a corrupted packet.
21 if ((packet->encoding() != AudioPacket::ENCODING_RAW) || 21 if ((packet->encoding() != AudioPacket::ENCODING_RAW) ||
22 (packet->data_size() != 1) || 22 (packet->data_size() != 1) ||
23 (packet->sampling_rate() == AudioPacket::SAMPLING_RATE_INVALID) || 23 (packet->sampling_rate() == AudioPacket::SAMPLING_RATE_INVALID) ||
24 (packet->bytes_per_sample() != AudioPacket::BYTES_PER_SAMPLE_2) || 24 (packet->bytes_per_sample() != AudioPacket::BYTES_PER_SAMPLE_2) ||
25 (packet->channels() != AudioPacket::CHANNELS_STEREO) || 25 (packet->channels() != AudioPacket::CHANNELS_STEREO) ||
26 (packet->data(0).size() % 26 (packet->data(0).size() %
27 (AudioPacket::CHANNELS_STEREO * AudioPacket::BYTES_PER_SAMPLE_2) != 0)) { 27 (AudioPacket::CHANNELS_STEREO * AudioPacket::BYTES_PER_SAMPLE_2) != 0)) {
28 LOG(WARNING) << "Verbatim decoder received an invalid packet."; 28 LOG(WARNING) << "Verbatim decoder received an invalid packet.";
29 return scoped_ptr<AudioPacket>(); 29 return nullptr;
30 } 30 }
31 return packet.Pass(); 31 return packet.Pass();
32 } 32 }
33 33
34 } // namespace remoting 34 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698