X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia%2Faudio%2Fpulse%2Faudio_manager_pulse.cc;h=03ff17dac7be4c6074ee22a2a090a0037e6e4aea;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=412f2a421b0f46dd6375bf7ab3d7d17d051484fe;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/media/audio/pulse/audio_manager_pulse.cc b/src/media/audio/pulse/audio_manager_pulse.cc index 412f2a4..03ff17d 100644 --- a/src/media/audio/pulse/audio_manager_pulse.cc +++ b/src/media/audio/pulse/audio_manager_pulse.cc @@ -42,8 +42,10 @@ static const int kMaximumOutputBufferSize = 8192; // Default input buffer size. static const int kDefaultInputBufferSize = 1024; +#if defined(DLOPEN_PULSEAUDIO) static const base::FilePath::CharType kPulseLib[] = FILE_PATH_LITERAL("libpulse.so.0"); +#endif // static AudioManager* AudioManagerPulse::Create(AudioLogFactory* audio_log_factory) { @@ -175,7 +177,7 @@ AudioParameters AudioManagerPulse::GetPreferredOutputStreamParameters( int buffer_size = kMinimumOutputBufferSize; int bits_per_sample = 16; int input_channels = 0; - int sample_rate; + int sample_rate = GetNativeSampleRate(); if (input_params.IsValid()) { bits_per_sample = input_params.bits_per_sample(); channel_layout = input_params.channel_layout(); @@ -183,9 +185,6 @@ AudioParameters AudioManagerPulse::GetPreferredOutputStreamParameters( buffer_size = std::min(kMaximumOutputBufferSize, std::max(buffer_size, input_params.frames_per_buffer())); - sample_rate = input_params.sample_rate(); - } else { - sample_rate = GetNativeSampleRate(); } int user_buffer_size = GetUserBufferSize();