[PPAPI][MediaStream] Rename AudioFrame to AudioBuffer

content/renderer/pepper/pepper_media_stream_audio_track_host.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 "content/renderer/pepper/pepper_media_stream_audio_track_host.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "ppapi/c/pp_errors.h"
-#include "ppapi/c/ppb_audio_frame.h"
+#include "ppapi/c/ppb_audio_buffer.h"
 #include "ppapi/shared_impl/media_stream_buffer.h"
 
 using media::AudioParameters;
 
 namespace {
 
 // Max audio buffer duration in milliseconds.
 const uint32_t kMaxDuration = 10;
 
 // TODO(penghuang): make this configurable.
@@ skipping 62 matching lines @@
     }
   }
 
   if (index != -1) {
     // TODO(penghuang): support re-sampling, etc.
     ppapi::MediaStreamBuffer::Audio* buffer =
         &(host_->buffer_manager()->GetBufferPointer(index)->audio);
     buffer->header.size = host_->buffer_manager()->buffer_size();
     buffer->header.type = ppapi::MediaStreamBuffer::TYPE_AUDIO;
     buffer->timestamp = timestamp_.InMillisecondsF();
-    buffer->sample_rate = static_cast<PP_AudioFrame_SampleRate>(sample_rate);
+    buffer->sample_rate = static_cast<PP_AudioBuffer_SampleRate>(sample_rate);
     buffer->number_of_channels = number_of_channels;
     buffer->number_of_samples = number_of_channels * number_of_frames;
     buffer->data_size = buffer_data_size_;
     memcpy(buffer->data, audio_data, buffer_data_size_);
 
     main_message_loop_proxy_->PostTask(
         FROM_HERE,
         base::Bind(&AudioSink::SendEnqueueBufferMessageOnMainThread,
                    weak_factory_.GetWeakPtr(), index));
   }
   timestamp_ += buffer_duration_;
 }
 
 void PepperMediaStreamAudioTrackHost::AudioSink::OnSetFormat(
     const AudioParameters& params) {
   DCHECK(params.IsValid());
   DCHECK_LE(params.GetBufferDuration().InMilliseconds(), kMaxDuration);
   DCHECK_EQ(params.bits_per_sample(), 16);
   DCHECK((params.sample_rate() == AudioParameters::kTelephoneSampleRate) ||
          (params.sample_rate() == AudioParameters::kAudioCDSampleRate));
 
   COMPILE_ASSERT(AudioParameters::kTelephoneSampleRate ==
-                 static_cast<int32_t>(PP_AUDIOFRAME_SAMPLERATE_8000),
+                 static_cast<int32_t>(PP_AUDIOBUFFER_SAMPLERATE_8000),
                  audio_sample_rate_does_not_match);
   COMPILE_ASSERT(AudioParameters::kAudioCDSampleRate ==
-                 static_cast<int32_t>(PP_AUDIOFRAME_SAMPLERATE_44100),
+                 static_cast<int32_t>(PP_AUDIOBUFFER_SAMPLERATE_44100),
                  audio_sample_rate_does_not_match);
   audio_params_ = params;
 
   // TODO(penghuang): support setting format more than once.
   buffer_duration_ = params.GetBufferDuration();
   buffer_data_size_ = params.GetBytesPerBuffer();
 
   if (original_audio_params_.IsValid()) {
     DCHECK_EQ(params.sample_rate(), original_audio_params_.sample_rate());
     DCHECK_EQ(params.bits_per_sample(),
@@ skipping 48 matching lines @@
 }
 
 void PepperMediaStreamAudioTrackHost::DidConnectPendingHostToResource() {
   if (!connected_) {
     MediaStreamAudioSink::AddToAudioTrack(&audio_sink_, track_);
     connected_ = true;
   }
 }
 
 }  // namespace content