FCL/sf/mw/qtextensions: comparison qtmobility/src/multimedia/qmediaencodersettings.cpp

equal deleted inserted replaced

-:06b8e2af4411
+:6fbed849b4f4
 class QAudioEncoderSettingsPrivate  : public QSharedData
 {
 public:
 QAudioEncoderSettingsPrivate() :
 isNull(true),
-encodingMode(QtMediaServices::ConstantQualityEncoding),
+encodingMode(QtMultimedia::ConstantQualityEncoding),
 bitrate(-1),
 sampleRate(-1),
 channels(-1),
-quality(QtMediaServices::NormalQuality)
+quality(QtMultimedia::NormalQuality)
 {
 }
 QAudioEncoderSettingsPrivate(const QAudioEncoderSettingsPrivate &other):
 QSharedData(other),
 quality(other.quality)
 {
 }
 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);
 };
 \brief The QAudioEncoderSettings class provides a set of audio encoder settings.
 \ingroup multimedia
 A audio encoder settings object is used to specify the audio encoder
-settings used by QMediaRecorder.  Audio encoder settings are selected
+settings used by QMediaRecorder.  Audio encoder settings are selected by
-by constructing a QAudioEncoderSettings object, setting the desired
+constructing a QAudioEncoderSettings object, setting the desired properties
-properties and then passing it to a QMediaRecorder instance using
+and then passing it to a QMediaRecorder instance using the
-the QMediaRecorder::setEncodingSettings() function.
+QMediaRecorder::setEncodingSettings() function.
 \code
 QAudioEncoderSettings audioSettings;
 audioSettings.setCodec("audio/mpeg");
 audioSettings.setChannelCount(2);
 d = other.d;
 return *this;
 }
 /*!
-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
 {
 return (d == other.d) ||
 d->quality == other.d->quality &&
 d->codec == other.d->codec);
 }
 /*!
-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
 {
 return !(*this == other);
 }
 /*!
 Returns the audio encoding mode.
-\sa QtMediaServices::EncodingMode
+\sa QtMultimedia::EncodingMode
 */
-QtMediaServices::EncodingMode QAudioEncoderSettings::encodingMode() const
+QtMultimedia::EncodingMode QAudioEncoderSettings::encodingMode() const
 {
 return d->encodingMode;
 }
 /*!
 Sets the audio encoding \a mode setting.
-If QtMediaServices::ConstantQualityEncoding is set,
+If QtMultimedia::ConstantQualityEncoding is set, the quality
-the quality encoding parameter is used and bit rate is ignored,
+encoding parameter is used and bit rate is ignored,
 otherwise the bitrate is used.
-The audio codec, channels count and sample rate settings
+The audio codec, channels count and sample rate settings are used in all
-are used in all the encoding modes.
+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;
 }
 /*!
 }
 /*!
 Sets the number of audio \a channels.
-A value of -1 indicates the encoder should make an optimal choice based on what is available
+A value of -1 indicates the encoder should make an optimal choice based on
-from the audio source and the limitations of the codec.
+what is available from the audio source and the limitations of the codec.
 */
 void QAudioEncoderSettings::setChannelCount(int channels)
 {
 d->isNull = false;
 d->channels = channels;
 /*!
 Returns the audio encoding quality.
 */
-QtMediaServices::EncodingQuality QAudioEncoderSettings::quality() const
+QtMultimedia::EncodingQuality QAudioEncoderSettings::quality() const
 {
 return d->quality;
 }
 /*!
 Setting the audio quality parameter allows backend to choose the balanced
 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;
 }
 class QVideoEncoderSettingsPrivate  : public QSharedData
 {
 public:
 QVideoEncoderSettingsPrivate() :
 isNull(true),
-encodingMode(QtMediaServices::ConstantQualityEncoding),
+encodingMode(QtMultimedia::ConstantQualityEncoding),
 bitrate(-1),
 frameRate(0),
-quality(QtMediaServices::NormalQuality)
+quality(QtMultimedia::NormalQuality)
 {
 }
 QVideoEncoderSettingsPrivate(const QVideoEncoderSettingsPrivate &other):
 QSharedData(other),
 quality(other.quality)
 {
 }
 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);
 };
 /*!
 \class QVideoEncoderSettings
 \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
+A video encoder settings object is used to specify the video encoder
-QMediaRecorder.  Video encoder settings are selected by constructing a QVideoEncoderSettings
+settings used by QMediaRecorder.  Video encoder settings are selected by
-object, setting the desired properties and then passing it to a QMediaRecorder instance using
+constructing a QVideoEncoderSettings object, setting the desired properties
-the QMediaRecorder::setEncodingSettings() function.
+and then passing it to a QMediaRecorder instance using the
+QMediaRecorder::setEncodingSettings() function.
 \code
 QVideoEncoderSettings videoSettings;
 videoSettings.setCodec("video/mpeg2");
 videoSettings.setResolution(640, 480);
 }
 /*!
 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
+Returns true if the settings objects are of equal value, and false if they
-value.
+are not of equal value.
 */
 bool QVideoEncoderSettings::operator==(const QVideoEncoderSettings &other) const
 {
 return (d == other.d) ||
 (d->isNull == other.d->isNull &&
 }
 /*!
 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
+Returns true if the settings objects are not of equal value, and false if
-value.
+they are of equal value.
 */
 bool QVideoEncoderSettings::operator!=(const QVideoEncoderSettings &other) const
 {
 return !(*this == other);
 }
 }
 /*!
 Returns the video encoding mode.
-\sa QtMediaServices::EncodingMode
+\sa QtMultimedia::EncodingMode
 */
-QtMediaServices::EncodingMode QVideoEncoderSettings::encodingMode() const
+QtMultimedia::EncodingMode QVideoEncoderSettings::encodingMode() const
 {
 return d->encodingMode;
 }
 /*!
 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;
 }
 }
 /*!
 Sets the \a resolution of the encoded video.
-An empty QSize indicates the encoder should make an optimal choice based on what is available
+An empty QSize indicates the encoder should make an optimal choice based on
-from the video source and the limitations of the codec.
+what is available from the video source and the limitations of the codec.
 */
 void QVideoEncoderSettings::setResolution(const QSize &resolution)
 {
 d->isNull = false;
 /*!
 Returns the video encoding quality.
 */
-QtMediaServices::EncodingQuality QVideoEncoderSettings::quality() const
+QtMultimedia::EncodingQuality QVideoEncoderSettings::quality() const
 {
 return d->quality;
 }
 /*!
 Setting the video quality parameter allows backend to choose the balanced
 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}
-void QVideoEncoderSettings::setQuality(QtMediaServices::EncodingQuality quality)
+\l{encodingMode()}{encoding mode}.
+*/
+void QVideoEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality)
 {
 d->isNull = false;
 d->quality = quality;
 }
 class QImageEncoderSettingsPrivate  : public QSharedData
 {
 public:
 QImageEncoderSettingsPrivate() :
 isNull(true),
-quality(QtMediaServices::NormalQuality)
+quality(QtMultimedia::NormalQuality)
 {
 }
 QImageEncoderSettingsPrivate(const QImageEncoderSettingsPrivate &other):
 QSharedData(other),
 }
 bool isNull;
 QString codec;
 QSize resolution;
-QtMediaServices::EncodingQuality quality;
+QtMultimedia::EncodingQuality quality;
 private:
 QImageEncoderSettingsPrivate& operator=(const QImageEncoderSettingsPrivate &other);
 };
 /*!
 \class QImageEncoderSettings
 \preliminary
-\brief The QImageEncoderSettings class provides a set of image
+\brief The QImageEncoderSettings class provides a set of image encoder
-encoder settings.
+settings.
-A image encoder settings object is used to specify the image
+A image encoder settings object is used to specify the image encoder
-encoder settings used by QStillImageCapture.  Image encoder
+settings used by QStillImageCapture.  Image encoder settings are selected
-settings are selected by constructing a QImageEncoderSettings
+by constructing a QImageEncoderSettings object, setting the desired
-object, setting the desired properties and then passing it to a
+properties and then passing it to a QStillImageCapture instance using the
-QStillImageCapture instance using the
 QStillImageCapture::setImageSettings() function.
 \code
 QImageEncoderSettings imageSettings;
 imageSettings.setCodec("image/jpeg");
 d = other.d;
 return *this;
 }
 /*!
-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
 {
 return (d == other.d) ||
 (d->isNull == other.d->isNull &&
 d->resolution == other.d->resolution);
 }
 /*!
-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
 {
 return !(*this == other);
 }
 }
 /*!
 Sets the \a resolution of the encoded image.
-An empty QSize indicates the encoder should make an optimal choice based on what is available
+An empty QSize indicates the encoder should make an optimal choice based on
-from the image source and the limitations of the codec.
+what is available from the image source and the limitations of the codec.
 */
 void QImageEncoderSettings::setResolution(const QSize &resolution)
 {
 d->isNull = false;
 /*!
 Returns the image encoding quality.
 */
-QtMediaServices::EncodingQuality QImageEncoderSettings::quality() const
+QtMultimedia::EncodingQuality QImageEncoderSettings::quality() const
 {
 return d->quality;
 }
 /*!
 Sets the image encoding \a quality.
 */
-void QImageEncoderSettings::setQuality(QtMediaServices::EncodingQuality quality)
+void QImageEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality)
 {
 d->isNull = false;
 d->quality = quality;
 }
 QT_END_NAMESPACE

changeset 14	6fbed849b4f4
parent 11	06b8e2af4411
child 15	1f895d8a5b2b