Merge branch 'master' of https://github.com/TangoCash/libstb-hal-cst-next

Origin commit data
------------------
Branch: master
Commit: c2628b7106
Author: vanhofen <vanhofen@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

@@ -427,7 +427,6 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu
 	lt_info("%s\n", __func__);
 	int max_numpida = *numpida;
 	*numpida = 0;
-	/*
 	if(player && player->manager && player->manager->audio) {
 	    char ** TrackList = NULL;
 	    player->manager->audio->Command(player, MANAGER_LIST, &TrackList);
@@ -471,7 +470,7 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu
 	        free(TrackList);
 	        *numpida=j;
 	    }
-	}*/
+	}
 }
 
 void cPlayback::FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language)
@@ -512,9 +511,9 @@ void cPlayback::FindAllSubtitlePids(int *pids, unsigned int *numpids, std::strin
 void cPlayback::FindAllTeletextsubtitlePids(int *pids, unsigned int *numpids, std::string *language, int *mags, int *pages)
 {
 	lt_info("%s\n", __func__);
-	/*
 	int max_numpids = *numpids;
 	*numpids = 0;
+	/*
 	if(player && player->manager && player->manager->teletext) {
 	    char ** TrackList = NULL;
 	    player->manager->teletext->Command(player, MANAGER_LIST, &TrackList);
@@ -592,7 +591,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);
@@ -611,7 +609,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)
@@ -621,7 +618,7 @@ void cPlayback::GetMetadata(std::vector<std::string> &keys, std::vector<std::str
 	char **metadata = NULL;
 	if (player && player->playback)
 	{
-		//player->playback->Command(player, PLAYBACK_METADATA, &metadata);
+		player->playback->Command(player, PLAYBACK_METADATA, &metadata);
 		if (metadata)
 		{
 			for (char **m = metadata; *m;)

libarmbox/video.cpp

@@ -361,7 +361,7 @@ void cVideo::closeDevice(void)
 int cVideo::setAspectRatio(int aspect, int mode)
 {
 	static const char *a[] = { "n/a", "4:3", "14:9", "16:9" };
-	static const char *m[] = { "panscan", "letterbox", "bestfit", "nonlinear", "(unset)" };
+	static const char *m[] = { "panscan", "bestfit", "letterbox", "nonlinear", "(unset)" };
 	int n;
 	lt_debug("%s: a:%d m:%d  %s\n", __func__, aspect, mode, m[(mode < 0||mode > 3) ? 4 : mode]);
 

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/container/container_ffmpeg.c

@@ -2580,6 +2580,67 @@ static int32_t container_ffmpeg_get_info(Context_t *context, char **infoString)
 	return cERR_CONTAINER_FFMPEG_NO_ERROR;
 }
 
+static int container_ffmpeg_get_metadata(Context_t * context, char ***p)
+{
+	Track_t *videoTrack = NULL;
+	Track_t *audioTrack = NULL;
+	AVDictionaryEntry *tag = NULL;
+	size_t psize = 1;
+	char **pp;
+
+	if (!context) {
+		fprintf(stderr, "BUG %s:%d\n", __func__, __LINE__);
+		return cERR_CONTAINER_FFMPEG_ERR;
+	}
+
+	if (!p || *p) {
+		fprintf(stderr, "BUG %s:%d\n", __func__, __LINE__);
+		return cERR_CONTAINER_FFMPEG_ERR;
+	}
+
+	context->manager->video->Command(context, MANAGER_GET_TRACK, &videoTrack);
+	context->manager->audio->Command(context, MANAGER_GET_TRACK, &audioTrack);
+
+	if (avContextTab[0]->metadata)
+		psize += av_dict_count(avContextTab[0]->metadata);
+	if (videoTrack)
+		psize += av_dict_count(((AVStream *)(videoTrack->stream))->metadata);
+	if (audioTrack)
+		psize += av_dict_count(((AVStream *)(audioTrack->stream))->metadata);
+
+	*p = malloc(sizeof(char *) * psize * 2);
+	if (!*p) {
+		fprintf(stderr, "MALLOC %s:%d\n", __func__, __LINE__);
+		return cERR_CONTAINER_FFMPEG_ERR;
+	}
+	pp = *p;
+
+	if (avContextTab[0]->metadata)
+		while ((tag = av_dict_get(avContextTab[0]->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
+			*pp++ = strdup(tag->key);
+			*pp++ = strdup(tag->value);
+		}
+
+	if (videoTrack) {
+		tag = NULL;
+		while ((tag = av_dict_get(((AVStream *)(videoTrack->stream))->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
+			*pp++ = strdup(tag->key);
+			*pp++ = strdup(tag->value);
+		}
+	}
+	if (audioTrack) {
+		tag = NULL;
+		while ((tag = av_dict_get(((AVStream *)(audioTrack->stream))->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
+			*pp++ = strdup(tag->key);
+			*pp++ = strdup(tag->value);
+		}
+	}
+	*pp++ = NULL;
+	*pp = NULL;
+
+	return cERR_CONTAINER_FFMPEG_NO_ERROR;
+}
+
 static int32_t Command(void  *_context, ContainerCmd_t command, void *argument)
 {
 	Context_t  *context = (Context_t *) _context;
@@ -2666,6 +2727,11 @@ static int32_t Command(void  *_context, ContainerCmd_t command, void *argument)
 			*((int32_t *)argument) = size;
 			break;
 		}
+		case CONTAINER_GET_METADATA:
+		{
+			ret = container_ffmpeg_get_metadata(context, (char ***) argument);
+			break;
+		}
 		default:
 			ffmpeg_err("ContainerCmd %d not supported!\n", command);
 			ret = cERR_CONTAINER_FFMPEG_ERR;

libeplayer3-arm/include/container.h

@@ -24,7 +24,8 @@ typedef enum
 	CONTAINER_SET_BUFFER_SIZE,
 	CONTAINER_GET_BUFFER_SIZE,
 	CONTAINER_GET_BUFFER_STATUS,
-	CONTAINER_STOP_BUFFER
+	CONTAINER_STOP_BUFFER,
+	CONTAINER_GET_METADATA
 } ContainerCmd_t;
 
 typedef struct Container_s

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/include/playback.h

@@ -3,7 +3,7 @@
 #include <sys/types.h>
 #include <stdint.h>
 
-typedef enum {PLAYBACK_OPEN, PLAYBACK_CLOSE, PLAYBACK_PLAY, PLAYBACK_STOP, PLAYBACK_PAUSE, PLAYBACK_CONTINUE, PLAYBACK_FLUSH, PLAYBACK_TERM, PLAYBACK_FASTFORWARD, PLAYBACK_SEEK, PLAYBACK_SEEK_ABS, PLAYBACK_PTS, PLAYBACK_LENGTH, PLAYBACK_SWITCH_AUDIO, PLAYBACK_SWITCH_SUBTITLE, PLAYBACK_INFO, PLAYBACK_SLOWMOTION, PLAYBACK_FASTBACKWARD, PLAYBACK_GET_FRAME_COUNT} PlaybackCmd_t;
+typedef enum {PLAYBACK_OPEN, PLAYBACK_CLOSE, PLAYBACK_PLAY, PLAYBACK_STOP, PLAYBACK_PAUSE, PLAYBACK_CONTINUE, PLAYBACK_FLUSH, PLAYBACK_TERM, PLAYBACK_FASTFORWARD, PLAYBACK_SEEK, PLAYBACK_SEEK_ABS, PLAYBACK_PTS, PLAYBACK_LENGTH, PLAYBACK_SWITCH_AUDIO, PLAYBACK_SWITCH_SUBTITLE, PLAYBACK_INFO, PLAYBACK_SLOWMOTION, PLAYBACK_FASTBACKWARD, PLAYBACK_GET_FRAME_COUNT, PLAYBACK_METADATA} PlaybackCmd_t;
 
 typedef struct PlaybackHandler_s
 {

libeplayer3-arm/manager/audio.c

@@ -126,6 +126,41 @@ static int ManagerAdd(Context_t  *context, Track_t track)
 	return cERR_AUDIO_MGR_NO_ERROR;
 }
 
+static char **ManagerList(Context_t * context __attribute__ ((unused)))
+{
+    int i = 0, j = 0;
+    char **tracklist = NULL;
+
+    audio_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
+
+    if (Tracks != NULL) {
+
+	tracklist = malloc(sizeof(char *) * ((TrackCount * 2) + 1));
+
+	if (tracklist == NULL) {
+	    audio_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;
+	    size_t len = strlen(Tracks[i].Name) + 20;
+	    char tmp[len];
+	    snprintf(tmp, len, "%d %s\n", Tracks[i].Id, Tracks[i].Name);
+	    tracklist[j] = strdup(tmp);
+	    tracklist[j + 1] = strdup(Tracks[i].Encoding);
+	}
+	tracklist[j] = NULL;
+    }
+
+    audio_mgr_printf(10, "%s::%s return %p (%d - %d)\n", FILENAME,
+		     __FUNCTION__, tracklist, j, TrackCount);
+
+    return tracklist;
+}
+
+#if 0
 static TrackDescription_t *ManagerList(Context_t  *context __attribute__((unused)))
 {
 	int i = 0;
@@ -156,6 +191,7 @@ static TrackDescription_t *ManagerList(Context_t  *context __attribute__((unused
 	//audio_mgr_printf(10, "%s::%s return %p (%d - %d)\n", FILENAME, __FUNCTION__, tracklist, j, TrackCount);
 	return tracklist;
 }
+#endif
 
 static int ManagerDel(Context_t *context)
 {

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
 };
 
 /* ***************************** */

libeplayer3-arm/manager/video.c

@@ -125,6 +125,41 @@ static int ManagerAdd(Context_t  *context, Track_t track)
 	return cERR_VIDEO_MGR_NO_ERROR;
 }
 
+static char **ManagerList(Context_t * context __attribute__ ((unused)))
+{
+    int i = 0, j = 0;
+    char **tracklist = NULL;
+
+    video_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
+
+    if (Tracks != NULL) {
+
+	tracklist = malloc(sizeof(char *) * ((TrackCount * 2) + 1));
+
+	if (tracklist == NULL) {
+	    video_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;
+	    size_t len = strlen(Tracks[i].Name) + 20;
+	    char tmp[len];
+	    snprintf(tmp, len, "%d %s\n", Tracks[i].Id, Tracks[i].Name);
+	    tracklist[j] = strdup(tmp);
+	    tracklist[j + 1] = strdup(Tracks[i].Encoding);
+	}
+	tracklist[j] = NULL;
+    }
+
+    video_mgr_printf(10, "%s::%s return %p (%d - %d)\n", FILENAME,
+		     __FUNCTION__, tracklist, j, TrackCount);
+
+    return tracklist;
+}
+
+#if 0
 static char **ManagerList(Context_t  *context __attribute__((unused)))
 {
 	int i = 0, j = 0;
@@ -155,6 +190,7 @@ static char **ManagerList(Context_t  *context __attribute__((unused)))
 	video_mgr_printf(10, "%s::%s return %p (%d - %d)\n", FILENAME, __FUNCTION__, tracklist, j, TrackCount);
 	return tracklist;
 }
+#endif
 
 static int ManagerDel(Context_t *context)
 {

libeplayer3-arm/playback/playback.c

@@ -75,10 +75,14 @@ static int32_t PlaybackTerminate(Context_t  *context);
 int8_t PlaybackDieNow(int8_t val)
 {
 	static int8_t dieNow = 0;
-	if (val)
+	if (val == 1)
 	{
 		dieNow = 1;
 	}
+	else if (val == 2)
+	{
+		dieNow = 0;
+	}
 	return dieNow;
 }
 
@@ -194,6 +198,7 @@ static int PlaybackClose(Context_t  *context)
 		free(context->playback->uri);
 		context->playback->uri = NULL;
 	}
+	PlaybackDieNow(2);
 	playback_printf(10, "exiting with value %d\n", ret);
 	return ret;
 }
@@ -578,6 +583,17 @@ static int32_t PlaybackInfo(Context_t  *context, char **infoString)
 	return ret;
 }
 
+static int PlaybackMetadata(Context_t * context, char ***metadata)
+{
+	int ret = cERR_PLAYBACK_NO_ERROR;
+
+	if (context->container && context->container->selectedContainer)
+	context->container->selectedContainer->Command(context,
+								CONTAINER_GET_METADATA,
+								metadata);
+    return ret;
+}
+
 static int32_t Command(void *_context, PlaybackCmd_t command, void *argument)
 {
 	Context_t *context = (Context_t *) _context; /* to satisfy compiler */
@@ -660,6 +676,11 @@ static int32_t Command(void *_context, PlaybackCmd_t command, void *argument)
 			ret = PlaybackGetFrameCount(context, (uint64_t *)argument);
 			break;
 		}
+		case PLAYBACK_METADATA:
+		{
+			ret = PlaybackMetadata(context, (char ***) argument);
+			break;
+		}
 		default:
 			playback_err("PlaybackCmd %d not supported!\n", command);
 			ret = cERR_PLAYBACK_ERROR;