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-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3: cleanup AVFormatContext propagation to writers

Browse Source 
Origin commit data
------------------
Branch: master
Commit: e2e5582c64
Author: martii <m4rtii@gmx.de>
Date: 2014-05-01 (Thu, 01 May 2014)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-05-01 10:15:14 +02:00
parent 07072ac366
commit dbcd640fca
16 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libeplayer3/input.cpp
View File

@@ -149,7 +149,7 @@ bool Input::Play()
seek_target = INT64_MIN;
restart_audio_resampling = true;
// flush streams
// clear streams
unsigned int i;
for (i = 0; i < avfc->nb_streams; i++)
if (avfc->streams[i]->codec && avfc->streams[i]->codec->codec)
@@ -179,7 +179,7 @@ bool Input::Play()
if (_videoTrack && (_videoTrack->stream == stream)) {
int64_t pts = calcPts(stream, packet.pts);
if (!player->output.Write(avfc, stream, &packet, pts)) {
if (!player->output.Write(stream, &packet, pts)) {
if (warnVideoWrite)
warnVideoWrite--;
else {
@@ -190,11 +190,11 @@ bool Input::Play()
} else if (_audioTrack && (_audioTrack->stream == stream)) {
if (restart_audio_resampling) {
restart_audio_resampling = false;
player->output.Write(avfc, stream, NULL, 0);
player->output.Write(stream, NULL, 0);
}
if (!player->isBackWard) {
int64_t pts = calcPts(stream, packet.pts);
if (!player->output.Write(avfc, stream, &packet, _videoTrack ? pts : 0)) {
if (!player->output.Write(stream, &packet, _videoTrack ? pts : 0)) {
if (warnAudioWrite)
warnAudioWrite--;
else {
@@ -246,7 +246,7 @@ bool Input::Play()
AVPacket packet;
packet.data = NULL;
packet.size = 0;
player->output.Write(avfc, _audioTrack->stream, &packet, 0);
player->output.Write(_audioTrack->stream, &packet, 0);
}
player->output.Flush();
}
@@ -314,9 +314,6 @@ bool Input::ReadSubtitle(const char *filename, const char *format, int pid)
AVPacket packet;
av_init_packet(&packet);
if (c->subtitle_header)
fprintf(stderr, "%s\n", c->subtitle_header);
while (av_read_frame(subavfc, &packet) > -1) {
AVSubtitle sub;
memset(&sub, 0, sizeof(sub));
@@ -441,7 +438,6 @@ bool Input::UpdateTracks()
stream->id = n + 1;
Track track;
track.avfc = avfc;
track.stream = stream;
AVDictionaryEntry *lang = av_dict_get(stream->metadata, "language", NULL, 0);
track.title = lang ? lang->value : "";