Merge remote-tracking branch 'tangocash/master'

Origin commit data
------------------
Branch: master
Commit: 1c9b3573a0
Author: max_10 <max_10@gmx.de>
Date: 2017-12-20 (Wed, 20 Dec 2017)


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

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

libarmbox/playback_libeplayer3.cpp

@@ -123,7 +123,6 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
 		}
 		else
 		{
-			/*
 			        //AUDIO
 			        if(player && player->manager && player->manager->audio) {
 			            char ** TrackList = NULL;
@@ -139,7 +138,6 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
 			                free(TrackList);
 			            }
 			        }
-
 			        //SUB
 			        if(player && player->manager && player->manager->subtitle) {
 			            char ** TrackList = NULL;
@@ -155,6 +153,7 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
 			                free(TrackList);
 			            }
 			        }
+			/*
 			        //Teletext
 			        if(player && player->manager && player->manager->teletext) {
 			            char ** TrackList = NULL;
@@ -170,6 +169,7 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
 			                free(TrackList);
 			            }
 			        }
+			*/
 			        //Chapters
 			        if(player && player->manager && player->manager->chapter) {
 			            char ** TrackList = NULL;
@@ -185,7 +185,6 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
 			                free(TrackList);
 			            }
 			        }
-			*/
 			playing = true;
 			player->output->Command(player, OUTPUT_OPEN, NULL);
 			ret = (player->playback->Command(player, PLAYBACK_PLAY, NULL) == 0);
@@ -591,7 +590,6 @@ void cPlayback::GetChapters(std::vector<int> &positions, std::vector<std::string
 {
 	positions.clear();
 	titles.clear();
-	/*
 	    if(player && player->manager && player->manager->chapter) {
 	        char ** TrackList = NULL;
 	        player->manager->chapter->Command(player, MANAGER_LIST, &TrackList);
@@ -610,7 +608,6 @@ void cPlayback::GetChapters(std::vector<int> &positions, std::vector<std::string
 	            free(TrackList);
 	        }
 	    }
-	*/
 }
 
 void cPlayback::GetMetadata(std::vector<std::string> &keys, std::vector<std::string> &values)

libeplayer3-arm/Makefile.am

@@ -15,6 +15,7 @@ libeplayer3_arm_la_SOURCES = \
 	manager/audio.c \
 	manager/video.c \
 	manager/subtitle.c \
+	manager/chapter.c \
 	output/linuxdvb_mipsel.c \
 	output/output_subtitle.c \
 	output/output.c \

libeplayer3-arm/include/manager.h

@@ -71,6 +71,8 @@ typedef struct Track_s
 	int                   inject_raw_pcm;
 
 	int                   pending;
+	long long int         chapter_start;
+	long long int         chapter_end;
 } Track_t;
 
 typedef struct TrackDescription_s
@@ -101,6 +103,7 @@ typedef struct ManagerHandler_s
 	Manager_t *audio;
 	Manager_t *video;
 	Manager_t *subtitle;
+    Manager_t *chapter;
 } ManagerHandler_t;
 
 void freeTrack(Track_t *track);

libeplayer3-arm/manager/chapter.c

@@ -0,0 +1,243 @@
+/*
+ * chapter manager handling.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+/* ***************************** */
+/* Includes                      */
+/* ***************************** */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "manager.h"
+#include "common.h"
+
+/* ***************************** */
+/* Makros/Constants              */
+/* ***************************** */
+#define TRACKWRAP 64
+
+#define CHAPTER_MGR_DEBUG
+
+#ifdef CHAPTER_MGR_DEBUG
+
+static short debug_level = 0;
+
+#define chapter_mgr_printf(level, x...) do { \
+if (debug_level >= level) printf(x); } while (0)
+#else
+#define chapter_mgr_printf(level, x...)
+#endif
+
+#ifndef CHAPTER_MGR_SILENT
+#define chapter_mgr_err(x...) do { printf(x); } while (0)
+#else
+#define chapter_mgr_err(x...)
+#endif
+
+/* Error Constants */
+#define cERR_CHAPTER_MGR_NO_ERROR        0
+#define cERR_CHAPTER_MGR_ERROR          -1
+
+static const char FILENAME[] = __FILE__;
+
+/* ***************************** */
+/* Types                         */
+/* ***************************** */
+
+/* ***************************** */
+/* Varaibles                     */
+/* ***************************** */
+
+static Track_t *Tracks = NULL;
+static int TrackCount = 0;
+static int CurrentTrack = 0;	//TRACK[0] as default.
+
+/* ***************************** */
+/* Prototypes                    */
+/* ***************************** */
+
+/* ***************************** */
+/* Functions                     */
+/* ***************************** */
+
+static int ManagerAdd(Context_t * context __attribute__((unused)), Track_t track)
+{
+	chapter_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
+
+	if (Tracks == NULL)
+	{
+		Tracks = malloc(sizeof(Track_t) * TRACKWRAP);
+		int i;
+		for (i = 0; i < TRACKWRAP; i++)
+			Tracks[i].Id = -1;
+	}
+
+	if (Tracks == NULL)
+	{
+		chapter_mgr_err("%s:%s malloc failed\n", FILENAME, __FUNCTION__);
+		return cERR_CHAPTER_MGR_ERROR;
+	}
+
+	int i;
+	for (i = 0; i < TRACKWRAP; i++)
+	{
+		if (Tracks[i].Id == track.Id)
+		{
+			Tracks[i].pending = 0;
+			return cERR_CHAPTER_MGR_NO_ERROR;
+		}
+	}
+
+	if (TrackCount < TRACKWRAP)
+	{
+		copyTrack(&Tracks[TrackCount], &track);
+
+		TrackCount++;
+	}
+	else
+	{
+		chapter_mgr_err("%s:%s TrackCount out if range %d - %d\n", FILENAME,
+		                __FUNCTION__, TrackCount, TRACKWRAP);
+		return cERR_CHAPTER_MGR_ERROR;
+	}
+
+	chapter_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
+
+	return cERR_CHAPTER_MGR_NO_ERROR;
+}
+
+static char **ManagerList(Context_t * context __attribute__ ((unused)))
+{
+	int i = 0, j = 0;
+	char **tracklist = NULL;
+
+	chapter_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
+
+	if (Tracks != NULL)
+	{
+
+		tracklist = malloc(sizeof(char *) * ((TrackCount * 2) + 1));
+
+		if (tracklist == NULL)
+		{
+			chapter_mgr_err("%s:%s malloc failed\n", FILENAME, __FUNCTION__);
+			return NULL;
+		}
+
+		for (i = 0, j = 0; i < TrackCount; i++, j += 2)
+		{
+			if (Tracks[i].pending)
+				continue;
+			char tmp[20];
+			snprintf(tmp, sizeof(tmp), "%d", (int)Tracks[i].chapter_start);
+			tracklist[j] = strdup(tmp);
+			tracklist[j + 1] = strdup(Tracks[i].Name);
+		}
+		tracklist[j] = NULL;
+	}
+
+	chapter_mgr_printf(10, "%s::%s return %p (%d - %d)\n", FILENAME,
+	                   __FUNCTION__, tracklist, j, TrackCount);
+
+	return tracklist;
+}
+
+static int ManagerDel(Context_t * context __attribute__((unused)))
+{
+	int i = 0;
+
+	chapter_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
+
+	if (Tracks != NULL)
+	{
+		for (i = 0; i < TrackCount; i++)
+		{
+			freeTrack(&Tracks[i]);
+		}
+		free(Tracks);
+		Tracks = NULL;
+	}
+	else
+	{
+		chapter_mgr_err("%s::%s nothing to delete!\n", FILENAME,
+		                __FUNCTION__);
+		return cERR_CHAPTER_MGR_ERROR;
+	}
+
+	TrackCount = 0;
+	CurrentTrack = 0;
+
+	chapter_mgr_printf(10, "%s::%s return no error\n", FILENAME,
+	                   __FUNCTION__);
+
+	return cERR_CHAPTER_MGR_NO_ERROR;
+}
+
+static int Command(Context_t *context, ManagerCmd_t command, void *argument)
+{
+	int ret = cERR_CHAPTER_MGR_NO_ERROR;
+
+	chapter_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
+
+	switch (command)
+	{
+	case MANAGER_ADD:
+	{
+		Track_t *track = argument;
+		ret = ManagerAdd(context, *track);
+		break;
+	}
+	case MANAGER_LIST:
+	{
+		container_ffmpeg_update_tracks(context, context->playback->uri, 0);
+		*((char ***) argument) = (char **) ManagerList(context);
+		break;
+	}
+	case MANAGER_DEL:
+	{
+		ret = ManagerDel(context);
+		break;
+	}
+	case MANAGER_INIT_UPDATE:
+	{
+		int i;
+		for (i = 0; i < TrackCount; i++)
+			Tracks[i].pending = 1;
+		break;
+	}
+	default:
+		chapter_mgr_err("%s::%s ContainerCmd %d not supported!\n", FILENAME,
+		                __FUNCTION__, command);
+		ret = cERR_CHAPTER_MGR_ERROR;
+		break;
+	}
+
+	chapter_mgr_printf(10, "%s:%s: returning %d\n", FILENAME, __FUNCTION__,
+	                   ret);
+
+	return ret;
+}
+
+
+struct Manager_s ChapterManager =
+{
+	"Chapter",
+	&Command,
+	NULL
+};

libeplayer3-arm/manager/manager.c

@@ -40,13 +40,15 @@
 extern Manager_t AudioManager;
 extern Manager_t VideoManager;
 extern Manager_t SubtitleManager;
+extern Manager_t ChapterManager;
 
 ManagerHandler_t ManagerHandler =
 {
 	"ManagerHandler",
 	&AudioManager,
 	&VideoManager,
-	&SubtitleManager
+	&SubtitleManager,
+	&ChapterManager
 };
 
 /* ***************************** */