Bump to ffmepg 2.8.6, fixed volume range, added duration changed signal.

carlonluca · Mar 18, 2016 · 1ee342a · 1ee342a
1 parent 6320659
commit 1ee342a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/piomxtextures_qt_driver/mediaplayer/openmaxilplayercontrol.cpp b/piomxtextures_qt_driver/mediaplayer/openmaxilplayercontrol.cpp
@@ -89,6 +89,8 @@ OpenMAXILPlayerControl::OpenMAXILPlayerControl(QObject *parent)
 			  this, SLOT(onMediaStatusChanged(OMX_MediaProcessor::OMX_MediaStatus)));
    connect(m_mediaProcessor, SIGNAL(metadataChanged(QVariantMap)),
 			  this, SIGNAL(metaDataChanged(QVariantMap)));
+	connect(m_mediaProcessor, SIGNAL(streamLengthChanged(qint64)),
+			  this, SIGNAL(durationChanged(qint64)));
 }
 
 /*------------------------------------------------------------------------------

diff --git a/piomxtextures_samples/video_simple.qml b/piomxtextures_samples/video_simple.qml
@@ -45,7 +45,7 @@ Rectangle {
 			Qt.quit();
 		}
 
-		uri = arguments[2];
+		uri = arguments[1];
 	}
 
 	Video {

diff --git a/piomxtextures_src/omx_mediaprocessor.cpp b/piomxtextures_src/omx_mediaprocessor.cpp
@@ -179,6 +179,7 @@ OMX_MediaProcessor::OMX_MediaProcessor(OMX_EGLBufferProviderSh provider) :
 	m_pendingPause(false),
 	m_subtitle_index(0),
 	m_audio_index(0),
+	m_streamLength(0),
 	m_incrMs(0),
 	m_audioConfig(new OMXAudioConfig()),
 	m_videoConfig(new OMXVideoConfig()),
@@ -449,6 +450,15 @@ bool OMX_MediaProcessor::setFilenameInt(const QString& filename)
 	}
 
 	setState(STATE_STOPPED);
+
+	const qint64 streamLength = this->streamLength();
+	log_debug("New stream length: %lld.", streamLength);
+
+	if (m_streamLength != streamLength) {
+		m_streamLength = streamLength;
+		emit streamLengthChanged(streamLength);
+	}
+
 	return true;
 }
 
@@ -654,7 +664,7 @@ void OMX_MediaProcessor::setVolume(long volume, bool linear)
 {
 	QMutexLocker locker(&m_sendCmd);
 
-#define VOL_MAX 2
+#define VOL_MAX 1
 #define VOL_MIN 0
 
 	m_volume = volume/100.0*(VOL_MAX - VOL_MIN);

diff --git a/piomxtextures_src/omx_mediaprocessor.h b/piomxtextures_src/omx_mediaprocessor.h
@@ -173,6 +173,7 @@ public slots:
     void errorOccurred(OMX_MediaProcessor::OMX_MediaProcessorError error);
     void stateChanged(OMX_MediaProcessor::OMX_MediaProcessorState state);
 	 void mediaStatusChanged(OMX_MediaProcessor::OMX_MediaStatus status);
+	 void streamLengthChanged(qint64 length);
 
 private slots:
     void init();
@@ -227,6 +228,7 @@ private slots:
 
     int m_subtitle_index;
     int m_audio_index;
+	 int m_streamLength;
 
     QMutex m_mutexPending;
     QWaitCondition m_waitPendingCommand;

diff --git a/piomxtextures_tools/compile_ffmpeg.sh b/piomxtextures_tools/compile_ffmpeg.sh
@@ -61,7 +61,7 @@ fi
 
 cd 3rdparty/ffmpeg
 rm -rf ffmpeg_src
-git clone git://source.ffmpeg.org/ffmpeg ffmpeg_src -bn2.8.5 --depth=1
+git clone git://source.ffmpeg.org/ffmpeg ffmpeg_src -bn2.8.6 --depth=1
 cd ffmpeg_src;
 
 export PATH="$COMPILER_PATH":$PATH
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,7 @@ Rectangle { @@
     			Qt.quit();
     		}
-    		uri = arguments[2];
+    		uri = arguments[1];
     	}
     	Video {
@@ Expand Down @@