libeplayer3: add hal_debug

Origin commit data
------------------
Commit: 43c00c43fa
Author: max_10 <max_10@gmx.de>
Date: 2024-03-24 (Sun, 24 Mar 2024)

Origin message was:
------------------
- libeplayer3: add hal_debug

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

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2024-03-24 22:23:52 +01:00
committed by Thilo Graf
parent cae06ac874
commit 25763a95d9
12 changed files with 298 additions and 130 deletions

View File

@@ -61,7 +61,7 @@ static int CurrentTrack = 0; //TRACK[0] as default.
static int ManagerAdd(Context_t *context, Track_t track)
{
audio_mgr_printf(10, "%s::%s name=\"%s\" encoding=\"%s\" id=%d\n", __FILE__, __FUNCTION__, track.Name, track.Encoding, track.Id);
audio_mgr_printf(10, "name=\"%s\" encoding=\"%s\" id=%d\n", track.Name, track.Encoding, track.Id);
if (Tracks == NULL)
{
@@ -75,7 +75,7 @@ static int ManagerAdd(Context_t *context, Track_t track)
if (Tracks == NULL)
{
audio_mgr_err("%s::%s malloc failed\n", __FILE__, __FUNCTION__);
audio_mgr_err("malloc failed\n");
return cERR_AUDIO_MGR_ERROR;
}
@@ -101,7 +101,7 @@ static int ManagerAdd(Context_t *context, Track_t track)
}
else
{
audio_mgr_err("%s::%s TrackCount out if range %d - %d\n", __FILE__, __FUNCTION__, TrackCount, TRACKWRAP);
audio_mgr_err("TrackCount out if range %d - %d\n", TrackCount, TRACKWRAP);
return cERR_AUDIO_MGR_ERROR;
}
@@ -110,7 +110,7 @@ static int ManagerAdd(Context_t *context, Track_t track)
context->playback->isAudio = 1;
}
audio_mgr_printf(10, "%s::%s\n", __FILE__, __FUNCTION__);
audio_mgr_printf(10, "\n");
return cERR_AUDIO_MGR_NO_ERROR;
}
@@ -120,7 +120,7 @@ static char **ManagerList(Context_t *context __attribute__((unused)))
int i = 0, j = 0;
char **tracklist = NULL;
audio_mgr_printf(10, "%s::%s\n", __FILE__, __FUNCTION__);
audio_mgr_printf(10, "\n");
if (Tracks != NULL)
{
@@ -128,7 +128,7 @@ static char **ManagerList(Context_t *context __attribute__((unused)))
if (tracklist == NULL)
{
audio_mgr_err("%s::%s malloc failed\n", __FILE__, __FUNCTION__);
audio_mgr_err("malloc failed\n");
return NULL;
}
@@ -148,7 +148,7 @@ static char **ManagerList(Context_t *context __attribute__((unused)))
tracklist[j] = NULL;
}
audio_mgr_printf(10, "%s::%s return %p (%d - %d)\n", __FILE__, __FUNCTION__, tracklist, j, TrackCount);
audio_mgr_printf(10, "return %p (%d - %d)\n", tracklist, j, TrackCount);
return tracklist;
}
@@ -157,7 +157,7 @@ static int ManagerDel(Context_t *context)
{
int i = 0;
audio_mgr_printf(10, "%s::%s\n", __FILE__, __FUNCTION__);
audio_mgr_printf(10, "\n");
if (Tracks != NULL)
{
@@ -171,7 +171,7 @@ static int ManagerDel(Context_t *context)
}
else
{
audio_mgr_err("%s::%s nothing to delete!\n", __FILE__, __FUNCTION__);
audio_mgr_err("nothing to delete!\n");
return cERR_AUDIO_MGR_ERROR;
}
@@ -179,7 +179,7 @@ static int ManagerDel(Context_t *context)
CurrentTrack = 0;
context->playback->isAudio = 0;
audio_mgr_printf(10, "%s::%s return no error\n", __FILE__, __FUNCTION__);
audio_mgr_printf(10, "return no error\n");
return cERR_AUDIO_MGR_NO_ERROR;
}
@@ -188,7 +188,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
{
int ret = cERR_AUDIO_MGR_NO_ERROR;
audio_mgr_printf(10, "%s::%s\n", __FILE__, __FUNCTION__);
audio_mgr_printf(10, "\n");
switch (command)
{
@@ -217,7 +217,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
}
case MANAGER_GET:
{
audio_mgr_printf(20, "%s::%s MANAGER_GET\n", __FILE__, __FUNCTION__);
audio_mgr_printf(20, "MANAGER_GET\n");
if ((TrackCount > 0) && (CurrentTrack >= 0))
{
@@ -251,7 +251,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
}
case MANAGER_GET_TRACK:
{
audio_mgr_printf(20, "%s::%s MANAGER_GET_TRACK\n", __FILE__, __FUNCTION__);
audio_mgr_printf(20, "MANAGER_GET_TRACK\n");
if ((TrackCount > 0) && (CurrentTrack >= 0))
{
@@ -265,7 +265,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
}
case MANAGER_GETENCODING:
{
if ((TrackCount > 0) && (CurrentTrack >= 0) && (Tracks[CurrentTrack].Encoding != NULL))
if ((TrackCount > 0) && (CurrentTrack >= 0))
{
*((char **)argument) = (char *)strdup(Tracks[CurrentTrack].Encoding);
}
@@ -277,7 +277,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
}
case MANAGER_GETNAME:
{
if ((TrackCount > 0) && (CurrentTrack >= 0) && (Tracks[CurrentTrack].Name != NULL))
if ((TrackCount > 0) && (CurrentTrack >= 0))
{
*((char **)argument) = (char *)strdup(Tracks[CurrentTrack].Name);
}
@@ -290,7 +290,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
case MANAGER_SET:
{
int i;
audio_mgr_printf(20, "%s::%s MANAGER_SET id=%d\n", __FILE__, __FUNCTION__, *((int *)argument));
audio_mgr_printf(20, "MANAGER_SET id=%d\n", *((int *)argument));
for (i = 0; i < TrackCount; i++)
{
@@ -303,7 +303,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
if (i == TrackCount)
{
audio_mgr_err("%s::%s track id %d unknown\n", __FILE__, __FUNCTION__, *((int *)argument));
audio_mgr_err("track id %d unknown\n", *((int *)argument));
ret = cERR_AUDIO_MGR_ERROR;
}
break;
@@ -323,12 +323,12 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
break;
}
default:
audio_mgr_err("%s::%s ContainerCmd %d not supported!\n", __FILE__, __FUNCTION__, command);
audio_mgr_err("ContainerCmd %d not supported!\n", command);
ret = cERR_AUDIO_MGR_ERROR;
break;
}
audio_mgr_printf(10, "%s::%s returning %d\n", __FILE__, __FUNCTION__, ret);
audio_mgr_printf(10, "returning %d\n", ret);
return ret;
}

View File

@@ -26,36 +26,18 @@
#include "manager.h"
#include "common.h"
#include "debug.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
#define TRACKWRAP 20
/* Error Constants */
#define cERR_CHAPTER_MGR_NO_ERROR 0
#define cERR_CHAPTER_MGR_ERROR -1
static const char FILENAME[] = __FILE__;
/* ***************************** */
/* Types */
/* ***************************** */
@@ -78,19 +60,21 @@ static int CurrentTrack = 0; //TRACK[0] as default.
static int ManagerAdd(Context_t *context __attribute__((unused)), Track_t track)
{
chapter_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
chapter_mgr_printf(10, "name=\"%s\" encoding=\"%s\" id=%d\n", track.Name, track.Encoding, track.Id);
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__);
chapter_mgr_err("malloc failed\n");
return cERR_CHAPTER_MGR_ERROR;
}
@@ -112,11 +96,11 @@ static int ManagerAdd(Context_t *context __attribute__((unused)), Track_t track)
}
else
{
chapter_mgr_err("%s:%s TrackCount out if range %d - %d\n", FILENAME, __FUNCTION__, TrackCount, TRACKWRAP);
chapter_mgr_err("TrackCount out if range %d - %d\n", TrackCount, TRACKWRAP);
return cERR_CHAPTER_MGR_ERROR;
}
chapter_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
chapter_mgr_printf(10, "\n");
return cERR_CHAPTER_MGR_NO_ERROR;
}
@@ -126,23 +110,25 @@ 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__);
chapter_mgr_printf(10, "\n");
if (Tracks != NULL)
{
tracklist = malloc(sizeof(char *) * ((TrackCount * 2) + 1));
if (tracklist == NULL)
{
chapter_mgr_err("%s:%s malloc failed\n", FILENAME, __FUNCTION__);
chapter_mgr_err("malloc failed\n");
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);
@@ -151,7 +137,7 @@ static char **ManagerList(Context_t *context __attribute__((unused)))
tracklist[j] = NULL;
}
chapter_mgr_printf(10, "%s::%s return %p (%d - %d)\n", FILENAME, __FUNCTION__, tracklist, j, TrackCount);
chapter_mgr_printf(10, "return %p (%d - %d)\n", tracklist, j, TrackCount);
return tracklist;
}
@@ -160,7 +146,7 @@ static int ManagerDel(Context_t *context __attribute__((unused)))
{
int i = 0;
chapter_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
chapter_mgr_printf(10, "\n");
if (Tracks != NULL)
{
@@ -173,14 +159,14 @@ static int ManagerDel(Context_t *context __attribute__((unused)))
}
else
{
chapter_mgr_err("%s::%s nothing to delete!\n", FILENAME, __FUNCTION__);
chapter_mgr_err("nothing to delete!\n");
return cERR_CHAPTER_MGR_ERROR;
}
TrackCount = 0;
CurrentTrack = 0;
chapter_mgr_printf(10, "%s::%s return no error\n", FILENAME, __FUNCTION__);
chapter_mgr_printf(10, "return no error\n");
return cERR_CHAPTER_MGR_NO_ERROR;
}
@@ -189,7 +175,7 @@ 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__);
chapter_mgr_printf(10, "\n");
switch (command)
{
@@ -214,16 +200,18 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
{
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);
chapter_mgr_err("ContainerCmd %d not supported!\n", command);
ret = cERR_CHAPTER_MGR_ERROR;
break;
}
chapter_mgr_printf(10, "%s:%s: returning %d\n", FILENAME, __FUNCTION__, ret);
chapter_mgr_printf(10, "returning %d\n", ret);
return ret;
}

View File

@@ -60,7 +60,7 @@ static int CurrentTrack = -1; //no as default.
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 %d\n", track.Name, track.Encoding, track.Id);
if (Tracks == NULL)
{
@@ -74,7 +74,7 @@ static int ManagerAdd(Context_t *context __attribute__((unused)), Track_t track)
if (Tracks == NULL)
{
subtitle_mgr_err("%s:%s malloc failed\n", __FILE__, __FUNCTION__);
subtitle_mgr_err("malloc failed\n");
return cERR_SUBTITLE_MGR_ERROR;
}
@@ -95,16 +95,16 @@ static int ManagerAdd(Context_t *context __attribute__((unused)), Track_t track)
}
else
{
subtitle_mgr_err("%s::%s TrackCount out if range %d - %d\n", __FILE__, __FUNCTION__, TrackCount, TRACKWRAP);
subtitle_mgr_err("TrackCount out if range %d - %d\n", TrackCount, TRACKWRAP);
return cERR_SUBTITLE_MGR_ERROR;
}
if (TrackCount > 0)
{
// context->playback->isSubtitle = 1;
context->playback->isSubtitle = 1;
}
subtitle_mgr_printf(10, "%s::%s\n", __FILE__, __FUNCTION__);
subtitle_mgr_printf(10, "\n");
return cERR_SUBTITLE_MGR_NO_ERROR;
}
@@ -114,7 +114,7 @@ static char **ManagerList(Context_t *context __attribute__((unused)))
int i = 0, j = 0;
char **tracklist = NULL;
subtitle_mgr_printf(10, "%s::%s\n", __FILE__, __FUNCTION__);
subtitle_mgr_printf(10, "\n");
if (Tracks != NULL)
{
@@ -122,7 +122,7 @@ static char **ManagerList(Context_t *context __attribute__((unused)))
if (tracklist == NULL)
{
subtitle_mgr_err("%s::%s malloc failed\n", __FILE__, __FUNCTION__);
subtitle_mgr_err("malloc failed\n");
return NULL;
}
@@ -142,7 +142,7 @@ static char **ManagerList(Context_t *context __attribute__((unused)))
tracklist[j] = NULL;
}
subtitle_mgr_printf(10, "%s::%s return %p (%d - %d)\n", __FILE__, __FUNCTION__, tracklist, j, TrackCount);
subtitle_mgr_printf(10, "return %p (%d - %d)\n", tracklist, j, TrackCount);
return tracklist;
}
@@ -151,7 +151,7 @@ static int ManagerDel(Context_t *context __attribute__((unused)))
{
int i = 0;
subtitle_mgr_printf(10, "%s::%s\n", __FILE__, __FUNCTION__);
subtitle_mgr_printf(10, "\n");
if (Tracks != NULL)
{
@@ -165,7 +165,7 @@ static int ManagerDel(Context_t *context __attribute__((unused)))
}
else
{
subtitle_mgr_err("%s::%s nothing to delete!\n", __FILE__, __FUNCTION__);
subtitle_mgr_err("nothing to delete!\n");
return cERR_SUBTITLE_MGR_ERROR;
}
@@ -173,7 +173,7 @@ static int ManagerDel(Context_t *context __attribute__((unused)))
CurrentTrack = -1;
// context->playback->isSubtitle = 0;
subtitle_mgr_printf(10, "%s::%s return no error\n", __FILE__, __FUNCTION__);
subtitle_mgr_printf(10, "return no error\n");
return cERR_SUBTITLE_MGR_NO_ERROR;
}
@@ -182,7 +182,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
{
int ret = cERR_SUBTITLE_MGR_NO_ERROR;
subtitle_mgr_printf(50, "%s::%s %d\n", __FILE__, __FUNCTION__, command);
subtitle_mgr_printf(50, "%d\n", command);
switch (command)
{
@@ -200,7 +200,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
}
case MANAGER_GET:
{
subtitle_mgr_printf(20, "%s::%s MANAGER_GET\n", FILENAME, __FUNCTION__);
subtitle_mgr_printf(20, "MANAGER_GET\n");
if (TrackCount > 0 && CurrentTrack >= 0)
{
@@ -234,7 +234,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
}
case MANAGER_GET_TRACK:
{
subtitle_mgr_printf(20, "%s::%s MANAGER_GET_TRACK\n", FILENAME, __FUNCTION__);
subtitle_mgr_printf(20, "MANAGER_GET_TRACK\n");
if ((TrackCount > 0) && (CurrentTrack >= 0))
{
@@ -274,7 +274,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
{
int i;
subtitle_mgr_printf(20, "%s::%s MANAGER_SET id=%d\n", __FILE__, __FUNCTION__, *((int *)argument));
subtitle_mgr_printf(20, "MANAGER_SET id=%d\n", *((int *)argument));
if (*((int *)argument) < 0)
{
@@ -293,7 +293,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
if (i == TrackCount)
{
subtitle_mgr_err("%s::%s track id %d unknown\n", __FILE__, __FUNCTION__, *((int *)argument));
subtitle_mgr_err("track id %d unknown\n", *((int *)argument));
ret = cERR_SUBTITLE_MGR_ERROR;
}
break;
@@ -313,12 +313,12 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
break;
}
default:
subtitle_mgr_err("%s::%s ContainerCmd not supported!", __FILE__, __FUNCTION__);
subtitle_mgr_err("ContainerCmd not supported!");
ret = cERR_SUBTITLE_MGR_ERROR;
break;
}
subtitle_mgr_printf(50, "%s::%s returning %d\n", __FILE__, __FUNCTION__, ret);
subtitle_mgr_printf(50, "returning %d\n", ret);
return ret;
}

View File

@@ -144,7 +144,7 @@ static TrackDescription_t *ManagerList(Context_t *context __attribute__((unused)
tracklist[j].Id = -1;
}
video_mgr_printf(10, "return %p (%d - %d)\n", tracklist, j, TrackCount);
video_mgr_printf(10, "return %p %d\n", tracklist, TrackCount);
return tracklist;
}