mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 23:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

armbox eplayer: fix playing files with subtitles

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>

Conflicts:
	libeplayer3-arm/manager/subtitle.c

additional format fixes, solved conflicts and clean up
This commit is contained in:
max_10
2017-12-30 13:41:06 +01:00
committed by Thilo Graf
parent 5930dca63f
commit 15b4162b58
1 changed files with 147 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

273
libeplayer3-arm/manager/subtitle.c
View File

@@ -33,7 +33,6 @@
#define TRACKWRAP 20 #define TRACKWRAP 20
//#define SAM_WITH_DEBUG
#ifdef SAM_WITH_DEBUG #ifdef SAM_WITH_DEBUG
#define SUBTITLE_MGR_DEBUG #define SUBTITLE_MGR_DEBUG
#else #else
@@ -60,19 +59,17 @@ if (debug_level >= level) printf(x); } while (0)
#define cERR_SUBTITLE_MGR_NO_ERROR 0 #define cERR_SUBTITLE_MGR_NO_ERROR 0
#define cERR_SUBTITLE_MGR_ERROR -1 #define cERR_SUBTITLE_MGR_ERROR -1
static const char FILENAME[] = __FILE__;
/* ***************************** */ /* ***************************** */
/* Types */ /* Types */
/* ***************************** */ /* ***************************** */
/* ***************************** */ /* ***************************** */
/* Varaibles */ /* Variables */
/* ***************************** */ /* ***************************** */
static Track_t *Tracks = NULL; static Track_t *Tracks = NULL;
static int TrackCount = 0; static int TrackCount = 0;
static int CurrentTrack = -1; //no as default. static int CurrentTrack = -1; //no as default.
/* ***************************** */ /* ***************************** */
/* Prototypes */ /* Prototypes */
@@ -82,23 +79,23 @@ static int CurrentTrack = -1; //no as default.
/* Functions */ /* Functions */
/* ***************************** */ /* ***************************** */
static int ManagerAdd(Context_t * context __attribute__((unused)), Track_t track) static int ManagerAdd(Context_t *context __attribute__((unused)), Track_t track)
{ {
subtitle_mgr_printf(10, "%s::%s %s %s %d\n", __FILE__, __FUNCTION__, track.Name, track.Encoding, track.Id);
subtitle_mgr_printf(10, "%s::%s %s %s %d\n", FILENAME, __FUNCTION__,
track.Name, track.Encoding, track.Id);
if (Tracks == NULL) if (Tracks == NULL)
{ {
Tracks = malloc(sizeof(Track_t) * TRACKWRAP); Tracks = malloc(sizeof(Track_t) * TRACKWRAP);
int i; int i;
for (i = 0; i < TRACKWRAP; i++) for (i = 0; i < TRACKWRAP; i++)
{
Tracks[i].Id = -1; Tracks[i].Id = -1;
}
} }
if (Tracks == NULL) if (Tracks == NULL)
{ {
subtitle_mgr_err("%s:%s malloc failed\n", FILENAME, __FUNCTION__); subtitle_mgr_err("%s:%s malloc failed\n", __FILE__, __FUNCTION__);
return cERR_SUBTITLE_MGR_ERROR; return cERR_SUBTITLE_MGR_ERROR;
} }
@@ -119,23 +116,26 @@ static int ManagerAdd(Context_t * context __attribute__((unused)), Track_t track
} }
else else
{ {
subtitle_mgr_err("%s:%s TrackCount out if range %d - %d\n", __FILE__, __FUNCTION__, TrackCount, TRACKWRAP);
subtitle_mgr_err("%s:%s TrackCount out if range %d - %d\n",
FILENAME, __FUNCTION__, TrackCount, TRACKWRAP);
return cERR_SUBTITLE_MGR_ERROR; return cERR_SUBTITLE_MGR_ERROR;
} }
subtitle_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__); if (TrackCount > 0)
{
// context->playback->isSubtitle = 1;
}
subtitle_mgr_printf(10, "%s::%s\n", __FILE__, __FUNCTION__);
return cERR_SUBTITLE_MGR_NO_ERROR; return cERR_SUBTITLE_MGR_NO_ERROR;
} }
static char **ManagerList(Context_t * context __attribute__ ((unused))) static char **ManagerList(Context_t *context __attribute__((unused)))
{ {
char **tracklist = NULL; char **tracklist = NULL;
int i = 0, j = 0; int i = 0, j = 0;
subtitle_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__); subtitle_mgr_printf(10, "%s::%s\n", __FILE__, __FUNCTION__);
if (Tracks != NULL) if (Tracks != NULL)
{ {
@@ -143,18 +143,20 @@ static char **ManagerList(Context_t * context __attribute__ ((unused)))
if (tracklist == NULL) if (tracklist == NULL)
{ {
subtitle_mgr_err("%s:%s malloc failed\n", FILENAME, subtitle_mgr_err("%s:%s malloc failed\n", __FILE__, __FUNCTION__);
__FUNCTION__);
return NULL; return NULL;
} }
for (i = 0, j = 0; i < TrackCount; i++, j += 2) for (i = 0, j = 0; i < TrackCount; i++, j += 2)
{ {
if (Tracks[i].pending) if (Tracks[i].pending)
{
continue; continue;
}
size_t len = strlen(Tracks[i].Name) + 20; size_t len = strlen(Tracks[i].Name) + 20;
char tmp[len]; char tmp[len];
snprintf(tmp, len, "%d %s\n", Tracks[i].Id, Tracks[i].Name); snprintf(tmp, len, "%d %s", Tracks[i].Id, Tracks[i].Name);
tracklist[j] = strdup(tmp); tracklist[j] = strdup(tmp);
tracklist[j + 1] = strdup(Tracks[i].Encoding); tracklist[j + 1] = strdup(Tracks[i].Encoding);
} }
@@ -162,18 +164,16 @@ static char **ManagerList(Context_t * context __attribute__ ((unused)))
tracklist[j] = NULL; tracklist[j] = NULL;
} }
subtitle_mgr_printf(10, "%s::%s return %p (%d - %d)\n", FILENAME, subtitle_mgr_printf(10, "%s::%s return %p (%d - %d)\n", __FILE__, __FUNCTION__, tracklist, j, TrackCount);
__FUNCTION__, tracklist, j, TrackCount);
return tracklist; return tracklist;
} }
static int ManagerDel(Context_t * context __attribute__((unused))) static int ManagerDel(Context_t *context __attribute__((unused)))
{ {
int i = 0; int i = 0;
subtitle_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__); subtitle_mgr_printf(10, "%s::%s\n", __FILE__, __FUNCTION__);
if (Tracks != NULL) if (Tracks != NULL)
{ {
@@ -187,16 +187,15 @@ static int ManagerDel(Context_t * context __attribute__((unused)))
} }
else else
{ {
subtitle_mgr_err("%s::%s nothing to delete!\n", FILENAME, subtitle_mgr_err("%s::%s nothing to delete!\n", __FILE__, __FUNCTION__);
__FUNCTION__);
return cERR_SUBTITLE_MGR_ERROR; return cERR_SUBTITLE_MGR_ERROR;
} }
TrackCount = 0; TrackCount = 0;
CurrentTrack = -1; CurrentTrack = -1;
// context->playback->isSubtitle = 0;
subtitle_mgr_printf(10, "%s::%s return no error\n", FILENAME, subtitle_mgr_printf(10, "%s::%s return no error\n", __FILE__, __FUNCTION__);
__FUNCTION__);
return cERR_SUBTITLE_MGR_NO_ERROR; return cERR_SUBTITLE_MGR_NO_ERROR;
} }
@@ -205,120 +204,142 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
{ {
int ret = cERR_SUBTITLE_MGR_NO_ERROR; int ret = cERR_SUBTITLE_MGR_NO_ERROR;
subtitle_mgr_printf(50, "%s::%s %d\n", FILENAME, __FUNCTION__, subtitle_mgr_printf(50, "%s::%s %d\n", __FILE__, __FUNCTION__, command);
command);
switch (command) switch (command)
{ {
case MANAGER_ADD: 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_GET:
{
if (TrackCount > 0 && CurrentTrack >= 0)
*((int *) argument) = (int) Tracks[CurrentTrack].Id;
else
*((int *) argument) = (int) -1;
break;
}
case MANAGER_GET_TRACK:
{
//subtitle_mgr_printf(20, "%s::%s MANAGER_GET_TRACK\n", FILENAME, __FUNCTION__);
if ((TrackCount > 0) && (CurrentTrack >= 0))
{ {
subtitle_mgr_printf(120, "return %d, %p\n", CurrentTrack, Track_t *track = argument;
&Tracks[CurrentTrack]); ret = ManagerAdd(context, *track);
*((Track_t **) argument) =
(Track_t *) & Tracks[CurrentTrack];
}
else
{
subtitle_mgr_printf(20, "return NULL\n");
*((Track_t **) argument) = NULL;
}
break;
}
case MANAGER_GETENCODING:
{
if (TrackCount > 0 && CurrentTrack >= 0)
*((char **) argument) =
(char *) strdup(Tracks[CurrentTrack].Encoding);
else
*((char **) argument) = (char *) strdup("");
break;
}
case MANAGER_GETNAME:
{
if (TrackCount > 0 && CurrentTrack >= 0)
*((char **) argument) =
(char *) strdup(Tracks[CurrentTrack].Name);
else
*((char **) argument) = (char *) strdup("");
break;
}
case MANAGER_SET:
{
int i;
subtitle_mgr_printf(20, "%s::%s MANAGER_SET id=%d\n", FILENAME,
__FUNCTION__, *((int *) argument));
if (*((int *) argument) < 0)
{
CurrentTrack = -1;
break; break;
} }
case MANAGER_LIST:
for (i = 0; i < TrackCount; i++) {
if (Tracks[i].Id == *((int *) argument)) container_ffmpeg_update_tracks(context, context->playback->uri, 0);
*((char ** *)argument) = (char **)ManagerList(context);
break;
}
case MANAGER_GET:
{
if (TrackCount > 0 && CurrentTrack >= 0)
{ {
CurrentTrack = i; *((int *)argument) = (int)Tracks[CurrentTrack].Id;
}
else
{
*((int *)argument) = (int) - 1;
}
break;
}
case MANAGER_GET_TRACK_DESC:
{
if ((TrackCount > 0) && (CurrentTrack >= 0))
{
TrackDescription_t *track = malloc(sizeof(TrackDescription_t));
*((TrackDescription_t **)argument) = track;
if (track)
{
memset(track, 0, sizeof(TrackDescription_t));
track->Id = Tracks[CurrentTrack].Id;
track->Name = strdup(Tracks[CurrentTrack].Name);
track->Encoding = strdup(Tracks[CurrentTrack].Encoding);
}
}
else
{
*((TrackDescription_t **)argument) = NULL;
}
break;
}
case MANAGER_GET_TRACK:
{
if ((TrackCount > 0) && (CurrentTrack >= 0))
{
*((Track_t **)argument) = (Track_t *) &Tracks[CurrentTrack];
}
else
{
*((Track_t **)argument) = NULL;
}
break;
}
case MANAGER_GETENCODING:
{
if (TrackCount > 0 && CurrentTrack >= 0)
{
*((char **)argument) = (char *)strdup(Tracks[CurrentTrack].Encoding);
}
else
{
*((char **)argument) = (char *)strdup("");
}
break;
}
case MANAGER_GETNAME:
{
if (TrackCount > 0 && CurrentTrack >= 0)
{
*((char **)argument) = (char *)strdup(Tracks[CurrentTrack].Name);
}
else
{
*((char **)argument) = (char *)strdup("");
}
break;
}
case MANAGER_SET:
{
int i;
subtitle_mgr_printf(20, "%s::%s MANAGER_SET id=%d\n", __FILE__, __FUNCTION__, *((int *)argument));
if (*((int *)argument) < 0)
{
CurrentTrack = -1;
break; break;
} }
if (i == TrackCount)
{ for (i = 0; i < TrackCount; i++)
subtitle_mgr_err("%s::%s track id %d unknown\n", FILENAME, {
__FUNCTION__, *((int *) argument)); if (Tracks[i].Id == *((int *)argument))
ret = cERR_SUBTITLE_MGR_ERROR; {
CurrentTrack = i;
break;
}
}
if (i == TrackCount)
{
subtitle_mgr_err("%s::%s track id %d unknown\n", __FILE__, __FUNCTION__, *((int *)argument));
ret = cERR_SUBTITLE_MGR_ERROR;
}
break;
} }
break; case MANAGER_DEL:
} {
case MANAGER_DEL: ret = ManagerDel(context);
{ break;
ret = ManagerDel(context); }
break; case MANAGER_INIT_UPDATE:
} {
case MANAGER_INIT_UPDATE: int i;
{ for (i = 0; i < TrackCount; i++)
int i; {
for (i = 0; i < TrackCount; i++) Tracks[i].pending = 1;
//if (!Tracks[i].is_static) }
Tracks[i].pending = 1; break;
break; }
} default:
default: subtitle_mgr_err("%s:%s: ContainerCmd not supported!", __FILE__, __FUNCTION__);
subtitle_mgr_err("%s:%s: ConatinerCmd not supported!", FILENAME, ret = cERR_SUBTITLE_MGR_ERROR;
__FUNCTION__); break;
ret = cERR_SUBTITLE_MGR_ERROR;
break;
} }
subtitle_mgr_printf(50, "%s:%s: returning %d\n", FILENAME, subtitle_mgr_printf(50, "%s:%s: returning %d\n", __FILE__, __FUNCTION__, ret);
__FUNCTION__, ret);
return ret; return ret;
} }
struct Manager_s SubtitleManager = struct Manager_s SubtitleManager =
{ {
"Subtitle", "Subtitle",