slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Delete obsolete class methods and update related code

Browse Source 
Delete obsolete methods from QAudioFormat and QAudioDeviceInfo
and update code that relied on the obsolete methods.

Change-Id: I007e36375a45399b1d5a289341bc5d5a05dc68cc
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Mithra Pattison
2012-07-10 13:26:48 +10:00
committed by Qt by Nokia
parent 952bd004be
commit 53fdcca366
47 changed files with 301 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/audiocapture/audiocapturesession.cpp
View File

@@ -56,8 +56,8 @@ AudioCaptureSession::AudioCaptureSession(QObject *parent):
m_position = 0;
m_state = QMediaRecorder::StoppedState;
m_format.setFrequency(8000);
m_format.setChannels(1);
m_format.setSampleRate(8000);
m_format.setChannelCount(1);
m_format.setSampleSize(8);
m_format.setSampleType(QAudioFormat::UnSignedInt);
m_format.setCodec("audio/pcm");
@@ -264,10 +264,10 @@ void AudioCaptureSession::record()
memcpy(header.wave.descriptor.id,"fmt ",4);
header.wave.descriptor.size = 16;
header.wave.audioFormat = 1; // for PCM data
header.wave.numChannels = m_format.channels();
header.wave.sampleRate = m_format.frequency();
header.wave.byteRate = m_format.frequency()*m_format.channels()*m_format.sampleSize()/8;
header.wave.blockAlign = m_format.channels()*m_format.sampleSize()/8;
header.wave.numChannels = m_format.channelCount();
header.wave.sampleRate = m_format.sampleRate();
header.wave.byteRate = m_format.sampleRate()*m_format.channelCount()*m_format.sampleSize()/8;
header.wave.blockAlign = m_format.channelCount()*m_format.sampleSize()/8;
header.wave.bitsPerSample = m_format.sampleSize();
memcpy(header.data.descriptor.id,"data",4);
header.data.descriptor.size = 0xFFFFFFFF; // This should be updated on stop(),samples*channels*sampleSize/8

22
src/plugins/audiocapture/audioencodercontrol.cpp
View File

@@ -53,8 +53,8 @@ AudioEncoderControl::AudioEncoderControl(QObject *parent)
QT_PREPEND_NAMESPACE(QAudioFormat) fmt;
fmt.setSampleSize(8);
fmt.setChannels(1);
fmt.setFrequency(8000);
fmt.setChannelCount(1);
fmt.setSampleRate(8000);
fmt.setSampleType(QT_PREPEND_NAMESPACE(QAudioFormat)::SignedInt);
fmt.setCodec("audio/pcm");
fmt.setByteOrder(QAudioFormat::LittleEndian);
@@ -94,7 +94,7 @@ QList<int> AudioEncoderControl::supportedSampleRates(const QAudioEncoderSettings
if (continuous)
*continuous = false;
return m_session->deviceInfo()->supportedFrequencies();
return m_session->deviceInfo()->supportedSampleRates();
}
QAudioEncoderSettings AudioEncoderControl::audioSettings() const
@@ -109,26 +109,26 @@ void AudioEncoderControl::setAudioSettings(const QAudioEncoderSettings &settings
if (settings.encodingMode() == QtMultimedia::ConstantQualityEncoding) {
if (settings.quality() == QtMultimedia::LowQuality) {
fmt.setSampleSize(8);
fmt.setChannels(1);
fmt.setFrequency(8000);
fmt.setChannelCount(1);
fmt.setSampleRate(8000);
fmt.setSampleType(QAudioFormat::UnSignedInt);
} else if (settings.quality() == QtMultimedia::NormalQuality) {
fmt.setSampleSize(16);
fmt.setChannels(1);
fmt.setFrequency(22050);
fmt.setChannelCount(1);
fmt.setSampleRate(22050);
fmt.setSampleType(QAudioFormat::SignedInt);
} else {
fmt.setSampleSize(16);
fmt.setChannels(1);
fmt.setFrequency(44100);
fmt.setChannelCount(1);
fmt.setSampleRate(44100);
fmt.setSampleType(QAudioFormat::SignedInt);
}
} else {
fmt.setChannels(settings.channelCount());
fmt.setFrequency(settings.sampleRate());
fmt.setChannelCount(settings.channelCount());
fmt.setSampleRate(settings.sampleRate());
if (settings.sampleRate() == 8000 && settings.bitRate() == 8000) {
fmt.setSampleType(QAudioFormat::UnSignedInt);
fmt.setSampleSize(8);

6
src/plugins/pulseaudio/qaudiooutput_pulse.cpp
View File

@@ -274,7 +274,7 @@ bool QPulseAudioOutput::open()
QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance();
pa_threaded_mainloop_lock(pulseEngine->mainloop());
qint64 bytesPerSecond = m_format.sampleRate() * m_format.channels() * m_format.sampleSize() / 8;
qint64 bytesPerSecond = m_format.sampleRate() * m_format.channelCount() * m_format.sampleSize() / 8;
pa_proplist *propList = pa_proplist_new();
if (m_category.isNull()) {
@@ -503,8 +503,8 @@ int QPulseAudioOutput::notifyInterval() const
qint64 QPulseAudioOutput::processedUSecs() const
{
qint64 result = qint64(1000000) * m_totalTimeValue /
(m_format.channels() * (m_format.sampleSize() / 8)) /
m_format.frequency();
(m_format.channelCount() * (m_format.sampleSize() / 8)) /
m_format.sampleRate();
return result;
}

6
src/plugins/pulseaudio/qpulsehelpers.cpp
View File

@@ -49,8 +49,8 @@ pa_sample_spec audioFormatToSampleSpec(const QAudioFormat &format)
{
pa_sample_spec spec;
spec.rate = format.frequency();
spec.channels = format.channels();
spec.rate = format.sampleRate();
spec.channels = format.channelCount();
if (format.sampleSize() == 8) {
spec.format = PA_SAMPLE_U8;
@@ -139,7 +139,7 @@ QString stateToQString(pa_context_state_t state)
QAudioFormat sampleSpecToAudioFormat(pa_sample_spec spec)
{
QAudioFormat format;
format.setFrequency(spec.rate);
format.setSampleRate(spec.rate);
format.setChannelCount(spec.channels);
format.setCodec("audio/pcm");