--- a/qtmobility/src/multimedia/qmediaencodersettings.cpp Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaencodersettings.cpp Wed Jun 23 19:08:38 2010 +0300
@@ -48,11 +48,11 @@
public:
QAudioEncoderSettingsPrivate() :
isNull(true),
- encodingMode(QtMediaServices::ConstantQualityEncoding),
+ encodingMode(QtMultimedia::ConstantQualityEncoding),
bitrate(-1),
sampleRate(-1),
channels(-1),
- quality(QtMediaServices::NormalQuality)
+ quality(QtMultimedia::NormalQuality)
{
}
@@ -69,12 +69,12 @@
}
bool isNull;
- QtMediaServices::EncodingMode encodingMode;
+ QtMultimedia::EncodingMode encodingMode;
QString codec;
int bitrate;
int sampleRate;
int channels;
- QtMediaServices::EncodingQuality quality;
+ QtMultimedia::EncodingQuality quality;
private:
QAudioEncoderSettingsPrivate& operator=(const QAudioEncoderSettingsPrivate &other);
@@ -88,10 +88,10 @@
\ingroup multimedia
A audio encoder settings object is used to specify the audio encoder
- settings used by QMediaRecorder. Audio encoder settings are selected
- by constructing a QAudioEncoderSettings object, setting the desired
- properties and then passing it to a QMediaRecorder instance using
- the QMediaRecorder::setEncodingSettings() function.
+ settings used by QMediaRecorder. Audio encoder settings are selected by
+ constructing a QAudioEncoderSettings object, setting the desired properties
+ and then passing it to a QMediaRecorder instance using the
+ QMediaRecorder::setEncodingSettings() function.
\code
QAudioEncoderSettings audioSettings;
@@ -140,10 +140,11 @@
}
/*!
- Determines if \a other is of equal value to an audio encoder settings object.
+ Determines if \a other is of equal value to an audio encoder settings
+ object.
- Returns true if the settings objects are of equal value, and true if they are not of equal
- value.
+ Returns true if the settings objects are of equal value, and false if they
+ are not of equal value.
*/
bool QAudioEncoderSettings::operator==(const QAudioEncoderSettings &other) const
@@ -159,10 +160,11 @@
}
/*!
- Determines if \a other is of equal value to an audio encoder settings object.
+ Determines if \a other is of equal value to an audio encoder settings
+ object.
- Returns true if the settings objects are not of equal value, and true if they are of equal
- value.
+ Returns true if the settings objects are not of equal value, and true if
+ they are of equal value.
*/
bool QAudioEncoderSettings::operator!=(const QAudioEncoderSettings &other) const
@@ -184,9 +186,9 @@
/*!
Returns the audio encoding mode.
- \sa QtMediaServices::EncodingMode
+ \sa QtMultimedia::EncodingMode
*/
-QtMediaServices::EncodingMode QAudioEncoderSettings::encodingMode() const
+QtMultimedia::EncodingMode QAudioEncoderSettings::encodingMode() const
{
return d->encodingMode;
}
@@ -194,16 +196,16 @@
/*!
Sets the audio encoding \a mode setting.
- If QtMediaServices::ConstantQualityEncoding is set,
- the quality encoding parameter is used and bit rate is ignored,
+ If QtMultimedia::ConstantQualityEncoding is set, the quality
+ encoding parameter is used and bit rate is ignored,
otherwise the bitrate is used.
- The audio codec, channels count and sample rate settings
- are used in all the encoding modes.
+ The audio codec, channels count and sample rate settings are used in all
+ the encoding modes.
- \sa encodingMode(), QtMediaServices::EncodingMode
+ \sa encodingMode(), QtMultimedia::EncodingMode
*/
-void QAudioEncoderSettings::setEncodingMode(QtMediaServices::EncodingMode mode)
+void QAudioEncoderSettings::setEncodingMode(QtMultimedia::EncodingMode mode)
{
d->encodingMode = mode;
}
@@ -244,8 +246,8 @@
/*!
Sets the number of audio \a channels.
- A value of -1 indicates the encoder should make an optimal choice based on what is available
- from the audio source and the limitations of the codec.
+ A value of -1 indicates the encoder should make an optimal choice based on
+ what is available from the audio source and the limitations of the codec.
*/
void QAudioEncoderSettings::setChannelCount(int channels)
{
@@ -286,7 +288,7 @@
Returns the audio encoding quality.
*/
-QtMediaServices::EncodingQuality QAudioEncoderSettings::quality() const
+QtMultimedia::EncodingQuality QAudioEncoderSettings::quality() const
{
return d->quality;
}
@@ -298,9 +300,9 @@
set of encoding parameters to achieve the desired quality level.
The \a quality settings parameter is only used in the
- \l {QtMediaServices::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
+ \l {QtMultimedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
*/
-void QAudioEncoderSettings::setQuality(QtMediaServices::EncodingQuality quality)
+void QAudioEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality)
{
d->isNull = false;
d->quality = quality;
@@ -311,10 +313,10 @@
public:
QVideoEncoderSettingsPrivate() :
isNull(true),
- encodingMode(QtMediaServices::ConstantQualityEncoding),
+ encodingMode(QtMultimedia::ConstantQualityEncoding),
bitrate(-1),
frameRate(0),
- quality(QtMediaServices::NormalQuality)
+ quality(QtMultimedia::NormalQuality)
{
}
@@ -331,12 +333,12 @@
}
bool isNull;
- QtMediaServices::EncodingMode encodingMode;
+ QtMultimedia::EncodingMode encodingMode;
QString codec;
int bitrate;
QSize resolution;
qreal frameRate;
- QtMediaServices::EncodingQuality quality;
+ QtMultimedia::EncodingQuality quality;
private:
QVideoEncoderSettingsPrivate& operator=(const QVideoEncoderSettingsPrivate &other);
@@ -347,10 +349,11 @@
\preliminary
\brief The QVideoEncoderSettings class provides a set of video encoder settings.
- A video encoder settings object is used to specify the video encoder settings used by
- QMediaRecorder. Video encoder settings are selected by constructing a QVideoEncoderSettings
- object, setting the desired properties and then passing it to a QMediaRecorder instance using
- the QMediaRecorder::setEncodingSettings() function.
+ A video encoder settings object is used to specify the video encoder
+ settings used by QMediaRecorder. Video encoder settings are selected by
+ constructing a QVideoEncoderSettings object, setting the desired properties
+ and then passing it to a QMediaRecorder instance using the
+ QMediaRecorder::setEncodingSettings() function.
\code
QVideoEncoderSettings videoSettings;
@@ -401,8 +404,8 @@
/*!
Determines if \a other is of equal value to a video encoder settings object.
- Returns true if the settings objects are of equal value, and true if they are not of equal
- value.
+ Returns true if the settings objects are of equal value, and false if they
+ are not of equal value.
*/
bool QVideoEncoderSettings::operator==(const QVideoEncoderSettings &other) const
{
@@ -419,8 +422,8 @@
/*!
Determines if \a other is of equal value to a video encoder settings object.
- Returns true if the settings objects are not of equal value, and true if they are of equal
- value.
+ Returns true if the settings objects are not of equal value, and false if
+ they are of equal value.
*/
bool QVideoEncoderSettings::operator!=(const QVideoEncoderSettings &other) const
{
@@ -440,9 +443,9 @@
/*!
Returns the video encoding mode.
- \sa QtMediaServices::EncodingMode
+ \sa QtMultimedia::EncodingMode
*/
-QtMediaServices::EncodingMode QVideoEncoderSettings::encodingMode() const
+QtMultimedia::EncodingMode QVideoEncoderSettings::encodingMode() const
{
return d->encodingMode;
}
@@ -450,15 +453,15 @@
/*!
Sets the video encoding \a mode.
- If QtMediaServices::ConstantQualityEncoding is set,
+ If QtMultimedia::ConstantQualityEncoding is set,
the quality encoding parameter is used and bit rate is ignored,
otherwise the bitrate is used.
The rest of encoding settings are respected regardless of encoding mode.
- \sa QtMediaServices::EncodingMode
+ \sa QtMultimedia::EncodingMode
*/
-void QVideoEncoderSettings::setEncodingMode(QtMediaServices::EncodingMode mode)
+void QVideoEncoderSettings::setEncodingMode(QtMultimedia::EncodingMode mode)
{
d->isNull = false;
d->encodingMode = mode;
@@ -535,8 +538,8 @@
/*!
Sets the \a resolution of the encoded video.
- An empty QSize indicates the encoder should make an optimal choice based on what is available
- from the video source and the limitations of the codec.
+ An empty QSize indicates the encoder should make an optimal choice based on
+ what is available from the video source and the limitations of the codec.
*/
void QVideoEncoderSettings::setResolution(const QSize &resolution)
@@ -561,7 +564,7 @@
Returns the video encoding quality.
*/
-QtMediaServices::EncodingQuality QVideoEncoderSettings::quality() const
+QtMultimedia::EncodingQuality QVideoEncoderSettings::quality() const
{
return d->quality;
}
@@ -573,10 +576,13 @@
set of encoding parameters to achieve the desired quality level.
The \a quality settings parameter is only used in the
- \l {QtMediaServices::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
+ \l {QtMultimedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
+ The \a quality settings parameter is only used in the \l
+ {QtMultimedia::ConstantQualityEncoding}{constant quality}
+ \l{encodingMode()}{encoding mode}.
*/
-void QVideoEncoderSettings::setQuality(QtMediaServices::EncodingQuality quality)
+void QVideoEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality)
{
d->isNull = false;
d->quality = quality;
@@ -589,7 +595,7 @@
public:
QImageEncoderSettingsPrivate() :
isNull(true),
- quality(QtMediaServices::NormalQuality)
+ quality(QtMultimedia::NormalQuality)
{
}
@@ -605,7 +611,7 @@
bool isNull;
QString codec;
QSize resolution;
- QtMediaServices::EncodingQuality quality;
+ QtMultimedia::EncodingQuality quality;
private:
QImageEncoderSettingsPrivate& operator=(const QImageEncoderSettingsPrivate &other);
@@ -615,14 +621,13 @@
\class QImageEncoderSettings
\preliminary
- \brief The QImageEncoderSettings class provides a set of image
- encoder settings.
+ \brief The QImageEncoderSettings class provides a set of image encoder
+ settings.
- A image encoder settings object is used to specify the image
- encoder settings used by QStillImageCapture. Image encoder
- settings are selected by constructing a QImageEncoderSettings
- object, setting the desired properties and then passing it to a
- QStillImageCapture instance using the
+ A image encoder settings object is used to specify the image encoder
+ settings used by QStillImageCapture. Image encoder settings are selected
+ by constructing a QImageEncoderSettings object, setting the desired
+ properties and then passing it to a QStillImageCapture instance using the
QStillImageCapture::setImageSettings() function.
\code
@@ -672,10 +677,11 @@
}
/*!
- Determines if \a other is of equal value to a image encoder settings object.
+ Determines if \a other is of equal value to a image encoder settings
+ object.
- Returns true if the settings objects are of equal value, and true if they are not of equal
- value.
+ Returns true if the settings objects are of equal value, and false if they
+ are not of equal value.
*/
bool QImageEncoderSettings::operator==(const QImageEncoderSettings &other) const
{
@@ -688,10 +694,11 @@
}
/*!
- Determines if \a other is of equal value to a image encoder settings object.
+ Determines if \a other is of equal value to a image encoder settings
+ object.
- Returns true if the settings objects are not of equal value, and true if they are of equal
- value.
+ Returns true if the settings objects are not of equal value, and false if
+ they are of equal value.
*/
bool QImageEncoderSettings::operator!=(const QImageEncoderSettings &other) const
{
@@ -738,8 +745,8 @@
/*!
Sets the \a resolution of the encoded image.
- An empty QSize indicates the encoder should make an optimal choice based on what is available
- from the image source and the limitations of the codec.
+ An empty QSize indicates the encoder should make an optimal choice based on
+ what is available from the image source and the limitations of the codec.
*/
void QImageEncoderSettings::setResolution(const QSize &resolution)
@@ -764,7 +771,7 @@
Returns the image encoding quality.
*/
-QtMediaServices::EncodingQuality QImageEncoderSettings::quality() const
+QtMultimedia::EncodingQuality QImageEncoderSettings::quality() const
{
return d->quality;
}
@@ -773,7 +780,7 @@
Sets the image encoding \a quality.
*/
-void QImageEncoderSettings::setQuality(QtMediaServices::EncodingQuality quality)
+void QImageEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality)
{
d->isNull = false;
d->quality = quality;