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

libeplayer3: minor adjustments

Browse Source
This commit is contained in:
martii
2014-04-16 17:26:53 +02:00
parent a3eb634030
commit 12845ab18c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libeplayer3/include/manager.h
View File

@@ -42,7 +42,7 @@ class Player;
struct Track struct Track
{ {
std::string Name; std::string title;
int pid; int pid;
int64_t duration; int64_t duration;
AVFormatContext *avfc; AVFormatContext *avfc;

6
libeplayer3/input.cpp
View File

@@ -328,7 +328,7 @@ bool Input::ReadSubtitle(const char *filename, const char *format, int pid)
avformat_free_context(subavfc); avformat_free_context(subavfc);
Track track; Track track;
track.Name = format; track.title = format;
track.is_static = 1; track.is_static = 1;
track.pid = pid; track.pid = pid;
player->manager.addSubtitleTrack(track); player->manager.addSubtitleTrack(track);
@@ -434,7 +434,7 @@ bool Input::UpdateTracks()
track.avfc = avfc; track.avfc = avfc;
track.stream = stream; track.stream = stream;
AVDictionaryEntry *lang = av_dict_get(stream->metadata, "language", NULL, 0); AVDictionaryEntry *lang = av_dict_get(stream->metadata, "language", NULL, 0);
track.Name = lang ? lang->value : ""; track.title = lang ? lang->value : "";
track.pid = stream->id; track.pid = stream->id;
if (stream->duration == AV_NOPTS_VALUE) if (stream->duration == AV_NOPTS_VALUE)
track.duration = avfc->duration; track.duration = avfc->duration;
@@ -483,7 +483,7 @@ bool Input::UpdateTracks()
int size = stream->codec->extradata_size; int size = stream->codec->extradata_size;
if (size > 0 && 2 * size - 1 == (int) l.length()) if (size > 0 && 2 * size - 1 == (int) l.length())
for (int i = 0; i < size; i += 2) { for (int i = 0; i < size; i += 2) {
track.Name = l.substr(i * 2, 3); track.title = l.substr(i * 2, 3);
track.type = data[i] >> 3; track.type = data[i] >> 3;
track.mag = data[i] & 7; track.mag = data[i] & 7;
track.page = data[i + 1]; track.page = data[i + 1];

2
libeplayer3/player.cpp
View File

@@ -52,7 +52,7 @@ void *Player::playthread(void *arg)
char threadname[17]; char threadname[17];
strncpy(threadname, __func__, sizeof(threadname)); strncpy(threadname, __func__, sizeof(threadname));
threadname[16] = 0; threadname[16] = 0;
prctl(PR_SET_NAME, (unsigned long) &threadname); prctl(PR_SET_NAME, (unsigned long) threadname);
Player *player = (Player *) arg; Player *player = (Player *) arg;
player->hasThreadStarted = true; player->hasThreadStarted = true;