Convert Pass()→std::move() in //media

media/cast/receiver/audio_decoder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/receiver/audio_decoder.h"
 
 #include <stdint.h>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/sys_byteorder.h"
 #include "build/build_config.h"
 #include "third_party/opus/src/include/opus.h"
 
@@ skipping 44 matching lines @@
     scoped_ptr<AudioBus> decoded_audio = Decode(
         encoded_frame->mutable_bytes(),
         static_cast<int>(encoded_frame->data.size()));
 
     scoped_ptr<FrameEvent> event(new FrameEvent());
     event->timestamp = cast_environment_->Clock()->NowTicks();
     event->type = FRAME_DECODED;
     event->media_type = AUDIO_EVENT;
     event->rtp_timestamp = encoded_frame->rtp_timestamp;
     event->frame_id = encoded_frame->frame_id;
-    cast_environment_->logger()->DispatchFrameEvent(event.Pass());
+    cast_environment_->logger()->DispatchFrameEvent(std::move(event));
 
     cast_environment_->PostTask(CastEnvironment::MAIN,
                                 FROM_HERE,
                                 base::Bind(callback,
                                            base::Passed(&decoded_audio),
                                            is_continuous));
   }
 
  protected:
   friend class base::RefCountedThreadSafe<ImplBase>;
@@ skipping 51 matching lines @@
         opus_decode_float(
             opus_decoder_, NULL, 0, buffer_.get(), max_samples_per_frame_, 0);
     DCHECK_GE(result, 0);
   }
 
   scoped_ptr<AudioBus> Decode(uint8_t* data, int len) final {
     scoped_ptr<AudioBus> audio_bus;
     const opus_int32 num_samples_decoded = opus_decode_float(
         opus_decoder_, data, len, buffer_.get(), max_samples_per_frame_, 0);
     if (num_samples_decoded <= 0)
-      return audio_bus.Pass();  // Decode error.
+      return audio_bus;  // Decode error.
 
     // Copy interleaved samples from |buffer_| into a new AudioBus (where
     // samples are stored in planar format, for each channel).
-    audio_bus = AudioBus::Create(num_channels_, num_samples_decoded).Pass();
+    audio_bus = AudioBus::Create(num_channels_, num_samples_decoded);
     // TODO(miu): This should be moved into AudioBus::FromInterleaved().
     for (int ch = 0; ch < num_channels_; ++ch) {
       const float* src = buffer_.get() + ch;
       const float* const src_end = src + num_samples_decoded * num_channels_;
       float* dest = audio_bus->channel(ch);
       for (; src < src_end; src += num_channels_, ++dest)
         *dest = *src;
     }
-    return audio_bus.Pass();
+    return audio_bus;
   }
 
   const scoped_ptr<uint8_t[]> decoder_memory_;
   OpusDecoder* const opus_decoder_;
   const int max_samples_per_frame_;
   const scoped_ptr<float[]> buffer_;
 
   // According to documentation in third_party/opus/src/include/opus.h, we must
   // provide enough space in |buffer_| to contain 120ms of samples.  At 48 kHz,
   // then, that means 5760 samples times the number of channels.
@@ skipping 16 matching lines @@
     ImplBase::operational_status_ = STATUS_INITIALIZED;
   }
 
  private:
   ~Pcm16Impl() final {}
 
   scoped_ptr<AudioBus> Decode(uint8_t* data, int len) final {
     scoped_ptr<AudioBus> audio_bus;
     const int num_samples = len / sizeof(int16_t) / num_channels_;
     if (num_samples <= 0)
-      return audio_bus.Pass();
+      return audio_bus;
 
     int16_t* const pcm_data = reinterpret_cast<int16_t*>(data);
 #if defined(ARCH_CPU_LITTLE_ENDIAN)
     // Convert endianness.
     const int num_elements = num_samples * num_channels_;
     for (int i = 0; i < num_elements; ++i)
       pcm_data[i] = static_cast<int16_t>(base::NetToHost16(pcm_data[i]));
 #endif
-    audio_bus = AudioBus::Create(num_channels_, num_samples).Pass();
+    audio_bus = AudioBus::Create(num_channels_, num_samples);
     audio_bus->FromInterleaved(pcm_data, num_samples, sizeof(int16_t));
-    return audio_bus.Pass();
+    return audio_bus;
   }
 
   DISALLOW_COPY_AND_ASSIGN(Pcm16Impl);
 };
 
 AudioDecoder::AudioDecoder(
     const scoped_refptr<CastEnvironment>& cast_environment,
     int channels,
     int sampling_rate,
     Codec codec)
@@ skipping 31 matching lines @@
   cast_environment_->PostTask(CastEnvironment::AUDIO,
                               FROM_HERE,
                               base::Bind(&AudioDecoder::ImplBase::DecodeFrame,
                                          impl_,
                                          base::Passed(&encoded_frame),
                                          callback));
 }
 
 }  // namespace cast
 }  // namespace media