Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1019)

Side by Side Diff: ppapi/shared_impl/ppb_audio_config_shared.cc

Issue 9129007: Work on improving PpbAudioConfig:RecommendSampleFrameCount (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ppapi/shared_impl/ppb_audio_config_shared.h" 5 #include "ppapi/shared_impl/ppb_audio_config_shared.h"
6 6
7 #include "content/renderer/media/audio_hardware.h"
8
7 namespace ppapi { 9 namespace ppapi {
8 10
9 PPB_AudioConfig_Shared::PPB_AudioConfig_Shared(PP_Instance instance) 11 PPB_AudioConfig_Shared::PPB_AudioConfig_Shared(PP_Instance instance)
10 : Resource(instance), 12 : Resource(instance),
11 sample_rate_(PP_AUDIOSAMPLERATE_NONE), 13 sample_rate_(PP_AUDIOSAMPLERATE_NONE),
12 sample_frame_count_(0) { 14 sample_frame_count_(0) {
13 } 15 }
14 16
15 PPB_AudioConfig_Shared::PPB_AudioConfig_Shared( 17 PPB_AudioConfig_Shared::PPB_AudioConfig_Shared(
16 const HostResource& host_resource) 18 const HostResource& host_resource)
(...skipping 22 matching lines...) Expand all
39 PP_Instance instance, 41 PP_Instance instance,
40 PP_AudioSampleRate sample_rate, 42 PP_AudioSampleRate sample_rate,
41 uint32_t sample_frame_count) { 43 uint32_t sample_frame_count) {
42 scoped_refptr<PPB_AudioConfig_Shared> object(new PPB_AudioConfig_Shared( 44 scoped_refptr<PPB_AudioConfig_Shared> object(new PPB_AudioConfig_Shared(
43 HostResource::MakeInstanceOnly(instance))); 45 HostResource::MakeInstanceOnly(instance)));
44 if (!object->Init(sample_rate, sample_frame_count)) 46 if (!object->Init(sample_rate, sample_frame_count))
45 return 0; 47 return 0;
46 return object->GetReference(); 48 return object->GetReference();
47 } 49 }
48 50
51 // static
52 PP_AudioSampleRate PPB_AudioConfig_Shared::RecommendSampleRate(
53 PP_Instance instance) {
54 uint32_t output_sample_rate(audio_hardware::GetOutputSampleRate());
55 switch(output_sample_rate) {
56 case 44100:
57 return PP_AUDIOSAMPLERATE_44100;
58 case 48000:
59 return PP_AUDIOSAMPLERATE_48000;
60 }
61 // Default to 48kHz if there isn't a match.
62 return PP_AUDIOSAMPLERATE_48000;
63 }
64
65 // static
66 uint32_t PPB_AudioConfig_Shared::RecommendSampleFrameCount(
67 PP_Instance instance,
68 PP_AudioSampleRate sample_rate,
69 uint32_t sample_frame_count) {
70 uint32_t output_sample_frame_count(audio_hardware::GetOutputBufferSize());
71 uint32_t output_sample_rate(audio_hardware::GetOutputSampleRate());
72 if (sample_frame_count < PP_AUDIOMINSAMPLEFRAMECOUNT)
73 sample_frame_count = PP_AUDIOMINSAMPLEFRAMECOUNT;
74 // If client is using same sample rate as audio hardware, then recommend a
75 // multiple of the audio hardware's sample frame count.
76 if ((output_sample_rate == static_cast<uint32_t>(sample_rate)) &&
77 (output_sample_frame_count > 0)) {
78 // Round up input sample_frame_count to nearest multiple.
79 uint32_t multiple = (sample_frame_count + output_sample_frame_count - 1) /
80 output_sample_frame_count;
81 uint32_t recommendation = output_sample_frame_count * multiple;
82 if (recommendation > PP_AUDIOMAXSAMPLEFRAMECOUNT)
83 recommendation = PP_AUDIOMAXSAMPLEFRAMECOUNT;
84 return recommendation;
85 }
86 // Otherwise, recommend a conservative 30ms buffer based on sample rate.
87 const uint32_t kDefault30msAt44100kHz = 1323;
88 const uint32_t kDefault30msAt48000kHz = 1440;
89 switch (sample_rate) {
90 case PP_AUDIOSAMPLERATE_44100:
91 return kDefault30msAt44100kHz;
92 case PP_AUDIOSAMPLERATE_48000:
93 return kDefault30msAt48000kHz;
94 case PP_AUDIOSAMPLERATE_NONE:
95 return 0;
96 }
97 // Unable to make a recommendation.
98 return 0;
99 }
100
49 thunk::PPB_AudioConfig_API* PPB_AudioConfig_Shared::AsPPB_AudioConfig_API() { 101 thunk::PPB_AudioConfig_API* PPB_AudioConfig_Shared::AsPPB_AudioConfig_API() {
50 return this; 102 return this;
51 } 103 }
52 104
53 PP_AudioSampleRate PPB_AudioConfig_Shared::GetSampleRate() { 105 PP_AudioSampleRate PPB_AudioConfig_Shared::GetSampleRate() {
54 return sample_rate_; 106 return sample_rate_;
55 } 107 }
56 108
57 uint32_t PPB_AudioConfig_Shared::GetSampleFrameCount() { 109 uint32_t PPB_AudioConfig_Shared::GetSampleFrameCount() {
58 return sample_frame_count_; 110 return sample_frame_count_;
(...skipping 12 matching lines...) Expand all
71 if (sample_frame_count > PP_AUDIOMAXSAMPLEFRAMECOUNT || 123 if (sample_frame_count > PP_AUDIOMAXSAMPLEFRAMECOUNT ||
72 sample_frame_count < PP_AUDIOMINSAMPLEFRAMECOUNT) 124 sample_frame_count < PP_AUDIOMINSAMPLEFRAMECOUNT)
73 return false; 125 return false;
74 126
75 sample_rate_ = sample_rate; 127 sample_rate_ = sample_rate;
76 sample_frame_count_ = sample_frame_count; 128 sample_frame_count_ = sample_frame_count;
77 return true; 129 return true;
78 } 130 }
79 131
80 } // namespace ppapi 132 } // namespace ppapi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698