Allow shaped-desktop hosts to send shape only when it changes.

remoting/codec/audio_encoder_opus.cc

 // Copyright (c) 2012 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 "remoting/codec/audio_encoder_opus.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "media/base/audio_bus.h"
@@ skipping 24 matching lines @@
 
 bool IsSupportedSampleRate(int rate) {
   return rate == 44100 || rate == 48000;
 }
 
 }  // namespace
 
 AudioEncoderOpus::AudioEncoderOpus()
     : sampling_rate_(0),
       channels_(AudioPacket::CHANNELS_STEREO),
-      encoder_(NULL),
+      encoder_(nullptr),
       frame_size_(0),
-      resampling_data_(NULL),
+      resampling_data_(nullptr),
       resampling_data_size_(0),
       resampling_data_pos_(0) {
 }
 
 AudioEncoderOpus::~AudioEncoderOpus() {
   DestroyEncoder();
 }
 
 void AudioEncoderOpus::InitEncoder() {
   DCHECK(!encoder_);
@@ skipping 28 matching lines @@
   leftover_samples_ = 0;
   leftover_buffer_size_ =
       frame_size_ + media::SincResampler::kDefaultRequestSize;
   leftover_buffer_.reset(
       new int16[leftover_buffer_size_ * channels_]);
 }
 
 void AudioEncoderOpus::DestroyEncoder() {
   if (encoder_) {
     opus_encoder_destroy(encoder_);
-    encoder_ = NULL;
+    encoder_ = nullptr;
   }
 
   resampler_.reset();
 }
 
 bool AudioEncoderOpus::ResetForPacket(AudioPacket* packet) {
   if (packet->channels() != channels_ ||
       packet->sampling_rate() != sampling_rate_) {
     DestroyEncoder();
 
     channels_ = packet->channels();
     sampling_rate_ = packet->sampling_rate();
 
     if (channels_ <= 0 || channels_ > 2 ||
         !IsSupportedSampleRate(sampling_rate_)) {
       LOG(WARNING) << "Unsupported OPUS parameters: "
                    << channels_ << " channels with "
                    << sampling_rate_ << " samples per second.";
       return false;
     }
 
     InitEncoder();
   }
 
-  return encoder_ != NULL;
+  return encoder_ != nullptr;
 }
 
 void AudioEncoderOpus::FetchBytesToResample(int resampler_frame_delay,
                                             media::AudioBus* audio_bus) {
   DCHECK(resampling_data_);
   int samples_left = (resampling_data_size_ - resampling_data_pos_) /
       kBytesPerSample / channels_;
   DCHECK_LE(audio_bus->frames(), samples_left);
   audio_bus->FromInterleaved(
       resampling_data_ + resampling_data_pos_,
@@ skipping 25 matching lines @@
   scoped_ptr<AudioPacket> encoded_packet(new AudioPacket());
   encoded_packet->set_encoding(AudioPacket::ENCODING_OPUS);
   encoded_packet->set_sampling_rate(kOpusSamplingRate);
   encoded_packet->set_channels(channels_);
 
   int prefetch_samples =
       resampler_.get() ? media::SincResampler::kDefaultRequestSize : 0;
   int samples_wanted = frame_size_ + prefetch_samples;
 
   while (leftover_samples_ + samples_in_packet >= samples_wanted) {
-    const int16* pcm_buffer = NULL;
+    const int16* pcm_buffer = nullptr;
 
     // Combine the packet with the leftover samples, if any.
     if (leftover_samples_ > 0) {
       pcm_buffer = leftover_buffer_.get();
       int samples_to_copy = samples_wanted - leftover_samples_;
       memcpy(leftover_buffer_.get() + leftover_samples_ * channels_,
              next_sample, samples_to_copy * kBytesPerSample * channels_);
     } else {
       pcm_buffer = next_sample;
     }
 
     // Resample data if necessary.
     int samples_consumed = 0;
     if (resampler_.get()) {
       resampling_data_ = reinterpret_cast<const char*>(pcm_buffer);
       resampling_data_pos_ = 0;
       resampling_data_size_ = samples_wanted * channels_ * kBytesPerSample;
       resampler_->Resample(kFrameSamples, resampler_bus_.get());
-      resampling_data_ = NULL;
+      resampling_data_ = nullptr;
       samples_consumed = resampling_data_pos_ / channels_ / kBytesPerSample;
 
       resampler_bus_->ToInterleaved(kFrameSamples, kBytesPerSample,
                                     resample_buffer_.get());
       pcm_buffer = reinterpret_cast<int16*>(resample_buffer_.get());
     } else {
       samples_consumed = frame_size_;
     }
 
     // Initialize output buffer.
@@ skipping 28 matching lines @@
   }
 
   // Store the leftover samples.
   if (samples_in_packet > 0) {
     DCHECK_LE(leftover_samples_ + samples_in_packet, leftover_buffer_size_);
     memmove(leftover_buffer_.get() + leftover_samples_ * channels_,
             next_sample, samples_in_packet * kBytesPerSample * channels_);
     leftover_samples_ += samples_in_packet;
   }
 
-  // Return NULL if there's nothing in the packet.
+  // Return nullptr if there's nothing in the packet.
   if (encoded_packet->data_size() == 0)
     return nullptr;
 
   return encoded_packet.Pass();
 }
 
 }  // namespace remoting