media/audio/audio_output_device.cc - Issue 10837350: Revert 152406 - Introduce shared_memory_support media target for PPAPI.

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: media/audio/audio_output_device.cc

Issue 10837350: Revert 152406 - Introduce shared_memory_support media target for PPAPI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 4 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

Index: media/audio/audio_output_device.cc

===================================================================

--- media/audio/audio_output_device.cc (revision 152430)

+++ media/audio/audio_output_device.cc (working copy)

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

#include "base/time.h"

#include "media/audio/audio_output_controller.h"

#include "media/audio/audio_util.h"

-#include "media/audio/shared_memory_util.h"

namespace media {

@@ -254,7 +253,7 @@

// Called whenever we receive notifications about pending data.

void AudioOutputDevice::AudioThreadCallback::Process(int pending_data) {

- if (pending_data == kPauseMark) {

+ if (pending_data == AudioOutputController::kPauseMark) {

memset(shared_memory_.memory(), 0, memory_length_);

SetActualDataSizeInBytes(&shared_memory_, memory_length_, 0);

return;

Property changes on: media/audio/audio_output_device.cc

___________________________________________________________________

Added: svn:mergeinfo

« no previous file with comments | « media/audio/audio_output_controller.cc ('k') | media/audio/audio_output_device_unittest.cc » ('j') | no next file with comments »