Merge remote-tracking branch 'martiis-libstb-hal/master'

Origin commit data
------------------
Branch: master
Commit: ad87948717
Author: max_10 <max_10@gmx.de>
Date: 2014-05-29 (Thu, 29 May 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

libeplayer3/include/input.h

@@ -47,6 +47,8 @@ class Input
 	friend int interrupt_cb(void *arg);
 
 	private:
+		OpenThreads::Mutex mutex;
+
 		Track *videoTrack;
 		Track *audioTrack;
 		Track *subtitleTrack;
@@ -81,6 +83,8 @@ class Input
 		bool SwitchVideo(Track *track);
 		bool GetMetadata(std::vector<std::string> &keys, std::vector<std::string> &values);
 		bool GetReadCount(uint64_t &readcount);
+		AVFormatContext *GetAVFormatContext();
+		void ReleaseAVFormatContext();
 };
 
 #endif

libeplayer3/include/player.h

@@ -114,6 +114,9 @@ class Player {
 		void RequestAbort();
 		bool GetChapters(std::vector<int> &positions, std::vector<std::string> &titles);
 
+		AVFormatContext *GetAVFormatContext() { return input.GetAVFormatContext(); }
+		void ReleaseAVFormatContext() { input.ReleaseAVFormatContext(); }
+
 		Player();
 };
 #endif

libeplayer3/input.cpp

@@ -532,6 +532,7 @@ bool Input::Stop()
 		usleep(100000);
 
 	if (avfc) {
+		OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mutex);
 		for (unsigned int i = 0; i < avfc->nb_streams; i++)
 			avcodec_close(avfc->streams[i]->codec);
 		avformat_close_input(&avfc);
@@ -542,6 +543,21 @@ bool Input::Stop()
 	return true;
 }
 
+AVFormatContext *Input::GetAVFormatContext()
+{
+	mutex.lock();
+	if (avfc)
+		return avfc;
+	mutex.unlock();
+	return NULL;
+}
+
+void Input::ReleaseAVFormatContext()
+{
+	if (avfc)
+		mutex.unlock();
+}
+
 bool Input::Seek(int64_t avts, bool absolute)
 {
 	if (absolute)

libeplayer3/output.cpp

@@ -36,10 +36,6 @@
 #include <pthread.h>
 #include <errno.h>
 
-#include <OpenThreads/ScopedLock>
-#include <OpenThreads/Thread>
-#include <OpenThreads/Condition>
-
 #include "player.h"
 #include "output.h"
 #include "writer.h"

libspark/playback_libeplayer3.cpp

@@ -384,3 +384,12 @@ int cPlayback::GetTeletextPid(void)
 {
 	return player->GetTeletextPid();
 }
+
+AVFormatContext *cPlayback::GetAVFormatContext()
+{
+	return player ? player->GetAVFormatContext() : NULL;
+}
+
+void cPlayback::ReleaseAVFormatContext() { if (player)
+	player->ReleaseAVFormatContext();
+}

libspark/playback_libeplayer3.h

@@ -10,9 +10,12 @@ typedef enum {
 } playmode_t;
 
 class Player;
+struct AVFormatContext;
 
 class cPlayback
 {
+	friend class CStreamInfo2;
+
 	private:
 		bool enabled;
 		bool playing;
@@ -58,6 +61,9 @@ class cPlayback
 		void SetTitle(int title);
 		void GetChapters(std::vector<int> &positions, std::vector<std::string> &titles);
 		void GetMetadata(std::vector<std::string> &keys, std::vector<std::string> &values);
+
+		AVFormatContext *GetAVFormatContext();
+		void ReleaseAVFormatContext();
 #if 0
 		// Functions that are not used by movieplayer.cpp:
 		bool GetOffset(off64_t &offset);