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: I6b92013d9fb14b11141d1a15c183776b2b3309fa
This commit is contained in:
Frederik Gladhorn
2013-03-27 14:31:37 +01:00
parent 18dbfc2538 570f05c2d3
commit f3d8b68555
7 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.qmake.conf
View File

@@ -1,4 +1,4 @@
load(qt_build_config)
CONFIG += qt_example_installs
MODULE_VERSION = 5.0.2
MODULE_VERSION = 5.1.0

8
src/multimedia/audio/qwavedecoder_p.cpp
View File

@@ -153,13 +153,15 @@ void QWaveDecoder::handleData()
chunk descriptor;
peekChunk(&descriptor);
if (source->bytesAvailable() < qint64(descriptor.size + sizeof(chunk)))
quint32 rawChunkSize = descriptor.size + sizeof(chunk);
if (source->bytesAvailable() < qint64(rawChunkSize))
return;
WAVEHeader wave;
source->read(reinterpret_cast<char *>(&wave), sizeof(WAVEHeader));
if (descriptor.size > sizeof(WAVEHeader))
discardBytes(descriptor.size - sizeof(WAVEHeader));
if (rawChunkSize > sizeof(WAVEHeader))
discardBytes(rawChunkSize - sizeof(WAVEHeader));
// Swizzle this
if (bigEndian) {

10
src/plugins/m3u/qm3uhandler.cpp
View File

@@ -190,7 +190,7 @@ QM3uPlaylistPlugin::~QM3uPlaylistPlugin()
bool QM3uPlaylistPlugin::canRead(QIODevice *device, const QByteArray &format) const
{
return device->isReadable() && (format == "m3u" || format.isEmpty());
return device->isReadable() && (format == "m3u" || format == "m3u8" || format.isEmpty());
}
bool QM3uPlaylistPlugin::canRead(const QUrl& location, const QByteArray &format) const
@@ -198,18 +198,18 @@ bool QM3uPlaylistPlugin::canRead(const QUrl& location, const QByteArray &format)
if (!QFileInfo(location.toLocalFile()).isReadable())
return false;
if (format == "m3u")
if (format == "m3u" || format == "m3u8")
return true;
if (!format.isEmpty())
return false;
else
return location.toLocalFile().toLower().endsWith(QLatin1String("m3u"));
QString localFile = location.toLocalFile().toLower();
return localFile.endsWith(QLatin1String("m3u")) || localFile.endsWith(QLatin1String("m3u8"));
}
bool QM3uPlaylistPlugin::canWrite(QIODevice *device, const QByteArray &format) const
{
return device->isOpen() && device->isWritable() && format == "m3u";
return device->isOpen() && device->isWritable() && (format == "m3u" || format == "m3u8");
}
QMediaPlaylistReader *QM3uPlaylistPlugin::createReader(QIODevice *device, const QByteArray &format)

13
tests/auto/cmake/CMakeLists.txt
View File

@@ -9,7 +9,16 @@ find_package(Qt5Core REQUIRED)
include("${_Qt5CTestMacros}")
test_module_includes(
set(qt_module_includes
Multimedia QCamera
MultimediaWidgets QVideoWidget
)
if (NOT NO_WIDGETS)
list(APPEND qt_module_includes
MultimediaWidgets QVideoWidget
)
endif()
test_module_includes(
${qt_module_includes}
)

4
tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
View File

@@ -631,7 +631,7 @@ void tst_QAudioInput::push()
QVERIFY(wavHeader.write(*audioFile));
// Set a large buffer to avoid underruns during QTest::qWaits
audioInput.setBufferSize(128*1024);
audioInput.setBufferSize(audioFormat.bytesForDuration(1000000));
QIODevice* feed = audioInput.start();
@@ -699,7 +699,7 @@ void tst_QAudioInput::pushSuspendResume()
QAudioInput audioInput(audioFormat, this);
audioInput.setNotifyInterval(100);
audioInput.setBufferSize(128*1024);
audioInput.setBufferSize(audioFormat.bytesForDuration(1000000));
QSignalSpy notifySignal(&audioInput, SIGNAL(notify()));
QSignalSpy stateSignal(&audioInput, SIGNAL(stateChanged(QAudio::State)));

BIN
tests/auto/unit/qwavedecoder/data/isawav_1_16_44100_le_2.wav Normal file
View File

Binary file not shown.

2
tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp
View File

@@ -130,6 +130,8 @@ void tst_QWaveDecoder::file_data()
QTest::newRow("File isawav_1_16_44100_le.wav") << testFilePath("isawav_1_16_44100_le.wav") << tst_QWaveDecoder::None << 1 << 16 << 44100 << QAudioFormat::LittleEndian;
QTest::newRow("File isawav_2_16_8000_be.wav") << testFilePath("isawav_2_16_8000_be.wav") << tst_QWaveDecoder::None << 2 << 16 << 8000 << QAudioFormat::BigEndian;
QTest::newRow("File isawav_2_16_44100_be.wav") << testFilePath("isawav_2_16_44100_be.wav") << tst_QWaveDecoder::None << 2 << 16 << 44100 << QAudioFormat::BigEndian;
// The next file has extra data in the wave header.
QTest::newRow("File isawav_1_16_44100_le_2.wav") << testFilePath("isawav_1_16_44100_le_2.wav") << tst_QWaveDecoder::None << 1 << 16 << 44100 << QAudioFormat::LittleEndian;
// 32 bit waves are not supported
QTest::newRow("File isawav_1_32_8000_le.wav") << testFilePath("isawav_1_32_8000_le.wav") << tst_QWaveDecoder::FormatDescriptor << 1 << 32 << 8000 << QAudioFormat::LittleEndian;