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

Merge remote-tracking branch 'origin/stable' into dev

Browse Source 
Change-Id: If2b8ea3be8fdaee2469c5d1c6b29c19dba1eb192
This commit is contained in:
Frederik Gladhorn
2013-04-12 12:55:44 +02:00
parent a13b4dbb32 bf26ab71e0
commit f23a7f9da4
11 changed files with 64 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gsttools/qgstreamermessage.cpp
View File

@@ -56,6 +56,7 @@ static int wuchi = qRegisterMetaType<QGstreamerMessage>();
QGstreamerMessage::QGstreamerMessage():
m_message(0)
{
Q_UNUSED(wuchi);
}
QGstreamerMessage::QGstreamerMessage(GstMessage* message):

8
src/gsttools/qvideosurfacegstsink.cpp
View File

@@ -371,12 +371,12 @@ struct RgbFormat
static const RgbFormat qt_rgbColorLookup[] =
{
{ QVideoFrame::Format_RGB32 , 32, 24, 4321, 0x0000FF00, 0x00FF0000, 0xFF000000, 0x00000000 },
{ QVideoFrame::Format_RGB32 , 32, 24, 4321, 0x0000FF00, 0x00FF0000, int(0xFF000000), 0x00000000 },
{ QVideoFrame::Format_RGB32 , 32, 24, 1234, 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000 },
{ QVideoFrame::Format_BGR32 , 32, 24, 4321, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x00000000 },
{ QVideoFrame::Format_BGR32 , 32, 24, 4321, int(0xFF000000), 0x00FF0000, 0x0000FF00, 0x00000000 },
{ QVideoFrame::Format_BGR32 , 32, 24, 1234, 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 },
{ QVideoFrame::Format_ARGB32, 32, 24, 4321, 0x0000FF00, 0x00FF0000, 0xFF000000, 0x000000FF },
{ QVideoFrame::Format_ARGB32, 32, 24, 1234, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000 },
{ QVideoFrame::Format_ARGB32, 32, 24, 4321, 0x0000FF00, 0x00FF0000, int(0xFF000000), 0x000000FF },
{ QVideoFrame::Format_ARGB32, 32, 24, 1234, 0x00FF0000, 0x0000FF00, 0x000000FF, int(0xFF000000) },
{ QVideoFrame::Format_RGB24 , 24, 24, 4321, 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000 },
{ QVideoFrame::Format_BGR24 , 24, 24, 4321, 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 },
{ QVideoFrame::Format_RGB565, 16, 16, 1234, 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }

2
src/imports/audioengine/qdeclarative_soundinstance_p.cpp
View File

@@ -442,7 +442,7 @@ void QDeclarativeSoundInstance::setVelocity(const QVector3D& velocity)
/*!
\qmlproperty vector3d QtAudioEngine1::SoundInstance::gain
This property holds the gain adjustment which will be used to modulate the audio ouput level
This property holds the gain adjustment which will be used to modulate the audio output level
from this SoundInstance.
*/
qreal QDeclarativeSoundInstance::gain() const

4
src/imports/multimedia/Video.qml
View File

@@ -113,12 +113,12 @@ Item {
\li VideoOutput.Stretch - the video is scaled to fit
\li VideoOutput.PreserveAspectFit - the video is scaled uniformly to fit without
cropping
\li VideoOuput.PreserveAspectCrop - the video is scaled uniformly to fill, cropping
\li VideoOutput.PreserveAspectCrop - the video is scaled uniformly to fill, cropping
if necessary
\endlist
Because this type is for convenience in QML, it does not
support enumerations directly, so enumerations from \c VideoOuput are
support enumerations directly, so enumerations from \c VideoOutput are
used to access the available fill modes.
The default fill mode is preserveAspectFit.

2
src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
View File

@@ -447,7 +447,7 @@ void AVFMediaPlayerSession::setVideoOutput(AVFVideoOutput *output)
if (m_videoOutput == output)
return;
//Set the current ouput layer to null to stop rendering
//Set the current output layer to null to stop rendering
if (m_videoOutput) {
m_videoOutput->setLayer(0);
}

2
src/plugins/avfoundation/mediaplayer/avfvideooutput.h
View File

@@ -54,7 +54,7 @@ public:
};
#define AVFVideoOutput_iid \
"org.qt-project.qt.AVFVideoOuput/5.0"
"org.qt-project.qt.AVFVideoOutput/5.0"
Q_DECLARE_INTERFACE(AVFVideoOutput, AVFVideoOutput_iid)
QT_END_NAMESPACE

2
src/plugins/gstreamer/camerabin/camerabincontrol.cpp
View File

@@ -149,7 +149,7 @@ void CameraBinControl::setState(QCamera::State state)
return;
}
CamerabinResourcePolicy::ResourceSet resourceSet;
CamerabinResourcePolicy::ResourceSet resourceSet = CamerabinResourcePolicy::NoResources;
switch (state) {
case QCamera::UnloadedState:
resourceSet = CamerabinResourcePolicy::NoResources;

2
src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp
View File

@@ -162,6 +162,8 @@ void CamerabinResourcePolicy::setResourceSet(CamerabinResourcePolicy::ResourceSe
m_resource->release();
}
}
#else
Q_UNUSED(oldSet);
#endif
}

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

@@ -415,6 +415,7 @@ void QPulseAudioOutput::userFeed()
}
qint64 bytesWritten = write(m_audioBuffer, audioBytesPulled);
Q_ASSERT(bytesWritten == audioBytesPulled); //unfinished write should not happen since the data provided is less than writableSize
Q_UNUSED(bytesWritten);
if (chunks > 1) {
// PulseAudio needs more data. Ask for it immediately.