mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-27 07:22:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3: extend API

Browse Source 
Origin commit data
------------------
Branch: master
Commit: b6a2310df6
Author: martii <m4rtii@gmx.de>
Date: 2014-04-09 (Wed, 09 Apr 2014)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-04-09 22:06:41 +02:00
parent b72941dd8b
commit 63db6558ef
8 changed files with 122 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libeplayer3/input.cpp
View File

@@ -49,7 +49,7 @@ Input::Input()
hasPlayThreadStarted = 0;
seek_sec_abs = -1.0;
seek_sec_rel = 0.0;
terminating = false;
abortPlayback = false;
}
Input::~Input()
@@ -377,8 +377,6 @@ bool Input::Init(const char *filename)
return false;
}
terminating = false;
bool res = UpdateTracks();
if (!videoTrack && !audioTrack) {
@@ -398,19 +396,15 @@ bool Input::Init(const char *filename)
bool Input::UpdateTracks()
{
if (terminating)
if (abortPlayback)
return true;
std::vector<Chapter> chapters;
for (unsigned int i = 0; i < avfc->nb_chapters; i++) {
AVDictionaryEntry *title = av_dict_get(avfc->metadata, "title", NULL, 0);
if (!title)
continue;
AVChapter *ch = avfc->chapters[i];
if (!ch)
continue;
AVDictionaryEntry* title = av_dict_get(ch->metadata, "title", NULL, 0);
Chapter chapter;
chapter.title = title ? title->value : "?";
chapter.title = title ? title->value : "";
chapter.start = (double) ch->start * av_q2d(ch->time_base) * 1000.0;
chapter.end = (double) ch->end * av_q2d(ch->time_base) * 1000.0;
chapters.push_back(chapter);
@@ -496,11 +490,12 @@ bool Input::UpdateTracks()
stream->codec->codec = avcodec_find_decoder(stream->codec->codec_id);
if (!stream->codec->codec)
fprintf(stderr, "avcodec_find_decoder failed for subtitle track %d\n", n);
else if (avcodec_open2(stream->codec, stream->codec->codec, NULL)) {
fprintf(stderr, "avcodec_open2 failed for subtitle track %d\n", n);
stream->codec->codec = NULL;
else {
int err = avcodec_open2(stream->codec, stream->codec->codec, NULL);
if (averror(err, avcodec_open2))
stream->codec->codec = NULL;
}
}
}
if (stream->codec->codec)
player->manager.addSubtitleTrack(track);
}
@@ -522,8 +517,6 @@ bool Input::Stop()
while (hasPlayThreadStarted != 0)
usleep(100000);
terminating = true;
if (avfc)
avformat_close_input(&avfc);