content/renderer/pepper/pepper_media_stream_audio_track_host.cc - Issue 156863005: [PPAPI][MediaStream] Rename AudioFrame to AudioBuffer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/pepper/pepper_media_stream_audio_track_host.cc

Issue 156863005: [PPAPI][MediaStream] Rename AudioFrame to AudioBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@frame_to_buffer

Patch Set: Fix build errors Created 6 years, 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/component_updater/ppapi_utils.cc ('k') | content/renderer/pepper/plugin_module.cc » ('j') | tools/metrics/histograms/histograms.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_media_stream_audio_track_host.cc

diff --git a/content/renderer/pepper/pepper_media_stream_audio_track_host.cc b/content/renderer/pepper/pepper_media_stream_audio_track_host.cc

index 7d0695b107a5c951a43bf563ee75a6bf9406753a..aace83d05ae6ce7492aa3bc1cc404f8c4b863f3c 100644

--- a/content/renderer/pepper/pepper_media_stream_audio_track_host.cc

+++ b/content/renderer/pepper/pepper_media_stream_audio_track_host.cc

@@ -10,7 +10,7 @@

#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;

@@ -93,7 +93,7 @@ void PepperMediaStreamAudioTrackHost::AudioSink::OnData(const int16* audio_data,

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_;

@@ -116,10 +116,10 @@ void PepperMediaStreamAudioTrackHost::AudioSink::OnSetFormat(

(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;

« no previous file with comments | « chrome/browser/component_updater/ppapi_utils.cc ('k') | content/renderer/pepper/plugin_module.cc » ('j') | tools/metrics/histograms/histograms.xml » ('J')