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

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

Issue 1545723002: Use std::move() instead of .Pass() in remoting/* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_not_pass_host
Patch Set: Created 5 years 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
« no previous file with comments | « remoting/codec/audio_decoder_opus.cc ('k') | remoting/codec/audio_encoder_opus.cc » ('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 #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 AudioDecoderVerbatim::~AudioDecoderVerbatim() {}
14
15 AudioDecoderVerbatim::~AudioDecoderVerbatim() {
16 }
17 14
18 scoped_ptr<AudioPacket> AudioDecoderVerbatim::Decode( 15 scoped_ptr<AudioPacket> AudioDecoderVerbatim::Decode(
19 scoped_ptr<AudioPacket> packet) { 16 scoped_ptr<AudioPacket> packet) {
20 // Return a null scoped_ptr if we get a corrupted packet. 17 // Return a null scoped_ptr if we get a corrupted packet.
21 if ((packet->encoding() != AudioPacket::ENCODING_RAW) || 18 if ((packet->encoding() != AudioPacket::ENCODING_RAW) ||
22 (packet->data_size() != 1) || 19 (packet->data_size() != 1) ||
23 (packet->sampling_rate() == AudioPacket::SAMPLING_RATE_INVALID) || 20 (packet->sampling_rate() == AudioPacket::SAMPLING_RATE_INVALID) ||
24 (packet->bytes_per_sample() != AudioPacket::BYTES_PER_SAMPLE_2) || 21 (packet->bytes_per_sample() != AudioPacket::BYTES_PER_SAMPLE_2) ||
25 (packet->channels() != AudioPacket::CHANNELS_STEREO) || 22 (packet->channels() != AudioPacket::CHANNELS_STEREO) ||
26 (packet->data(0).size() % 23 (packet->data(0).size() %
27 (AudioPacket::CHANNELS_STEREO * AudioPacket::BYTES_PER_SAMPLE_2) != 0)) { 24 (AudioPacket::CHANNELS_STEREO * AudioPacket::BYTES_PER_SAMPLE_2) != 0)) {
28 LOG(WARNING) << "Verbatim decoder received an invalid packet."; 25 LOG(WARNING) << "Verbatim decoder received an invalid packet.";
29 return nullptr; 26 return nullptr;
30 } 27 }
31 return packet.Pass(); 28 return packet;
32 } 29 }
33 30
34 } // namespace remoting 31 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/codec/audio_decoder_opus.cc ('k') | remoting/codec/audio_encoder_opus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698