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: use actual pids instead of indexes

Browse Source 
Origin commit data
------------------
Branch: master
Commit: fb16fc2ffb
Author: martii <m4rtii@gmx.de>
Date: 2013-07-12 (Fri, 12 Jul 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-07-12 22:34:39 +02:00
parent 64c77c7832
commit 8d5a948692
8 changed files with 178 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
libeplayer3/container/container_ffmpeg.c
View File

@@ -492,7 +492,7 @@ static void FFMPEGThread(Context_t *context) {
Track_t * dvbsubtitleTrack = NULL;
Track_t * teletextTrack = NULL;
int ix = packet.stream_index;
int pid = avContext->streams[packet.stream_index]->id;
if (context->manager->video->Command(context, MANAGER_GET_TRACK, &videoTrack) < 0)
ffmpeg_err("error getting video track\n");
@@ -509,10 +509,10 @@ static void FFMPEGThread(Context_t *context) {
if (context->manager->teletext->Command(context, MANAGER_GET_TRACK, &teletextTrack) < 0)
ffmpeg_err("error getting teletext track\n");
ffmpeg_printf(200, "packet.size %d - index %d\n", packet.size, ix);
ffmpeg_printf(200, "packet.size %d - index %d\n", packet.size, pid);
if (videoTrack != NULL) {
if (videoTrack->Id == ix) {
if (videoTrack->Id == pid) {
currentVideoPts = videoTrack->pts = pts = calcPts(videoTrack->stream, &packet);
if ((currentVideoPts > latestPts) && (currentVideoPts != INVALID_PTS_VALUE))
@@ -526,7 +526,7 @@ static void FFMPEGThread(Context_t *context) {
}
#endif
ffmpeg_printf(200, "VideoTrack index = %d %lld\n",ix, currentVideoPts);
ffmpeg_printf(200, "VideoTrack index = %d %lld\n",pid, currentVideoPts);
avOut.data = packet.data;
avOut.len = packet.size;
@@ -546,7 +546,7 @@ static void FFMPEGThread(Context_t *context) {
}
if (audioTrack != NULL) {
if (audioTrack->Id == ix) {
if (audioTrack->Id == pid) {
currentAudioPts = audioTrack->pts = pts = calcPts(audioTrack->stream, &packet);
if ((currentAudioPts > latestPts) && (!videoTrack))
@@ -560,7 +560,7 @@ static void FFMPEGThread(Context_t *context) {
}
#endif
ffmpeg_printf(200, "AudioTrack index = %d\n",ix);
ffmpeg_printf(200, "AudioTrack index = %d\n",pid);
if (audioTrack->inject_raw_pcm == 1){
ffmpeg_printf(200,"write audio raw pcm\n");
@@ -780,7 +780,7 @@ static void FFMPEGThread(Context_t *context) {
}
if (subtitleTrack != NULL) {
if (subtitleTrack->Id == ix) {
if (subtitleTrack->Id == pid) {
float duration=3.0;
ffmpeg_printf(100, "subtitleTrack->stream %p \n", subtitleTrack->stream);
@@ -888,10 +888,10 @@ static void FFMPEGThread(Context_t *context) {
}
}
if (dvbsubtitleTrack != NULL) {
if (dvbsubtitleTrack->Id == ix) {
if (dvbsubtitleTrack->Id == pid) {
dvbsubtitleTrack->pts = pts = calcPts(dvbsubtitleTrack->stream, &packet);
ffmpeg_printf(200, "DvbSubTitle index = %d\n",ix);
ffmpeg_printf(200, "DvbSubTitle index = %d\n",pid);
avOut.data = packet.data;
avOut.len = packet.size;
@@ -911,10 +911,10 @@ static void FFMPEGThread(Context_t *context) {
}
}
if (teletextTrack != NULL) {
if (teletextTrack->Id == ix) {
if (teletextTrack->Id == pid) {
teletextTrack->pts = pts = calcPts(teletextTrack->stream, &packet);
ffmpeg_printf(200, "TeleText index = %d\n",ix);
ffmpeg_printf(200, "TeleText index = %d\n",pid);
avOut.data = packet.data;
avOut.len = packet.size;
@@ -1027,6 +1027,7 @@ int container_ffmpeg_init(Context_t *context, char * filename)
return cERR_CONTAINER_FFMPEG_OPEN;
}
avContext->iformat->flags |= AVFMT_SEEK_TO_PTS;
avContext->flags = AVFMT_FLAG_GENPTS;
if (context->playback->noprobe)
avContext->max_analyze_duration = 1;
@@ -1060,6 +1061,29 @@ int container_ffmpeg_update_tracks(Context_t *context, char *filename)
if (terminating)
return cERR_CONTAINER_FFMPEG_NO_ERROR;
Track_t * audioTrack = NULL;
Track_t * subtitleTrack = NULL;
Track_t * dvbsubtitleTrack = NULL;
Track_t * teletextTrack = NULL;
int audioId = -1;
int subtitleId = -1;
int dvbsubtitleId = -1;
int teletextId = -1;
context->manager->audio->Command(context, MANAGER_GET_TRACK, &audioTrack);
context->manager->subtitle->Command(context, MANAGER_GET_TRACK, &subtitleTrack);
context->manager->dvbsubtitle->Command(context, MANAGER_GET_TRACK, &dvbsubtitleTrack);
context->manager->teletext->Command(context, MANAGER_GET_TRACK, &teletextTrack);
if (audioTrack)
audioId = ((AVStream *) (audioTrack->stream))->id;
if (subtitleTrack)
subtitleId = ((AVStream *) (subtitleTrack->stream))->id;
if (dvbsubtitleTrack)
dvbsubtitleId = ((AVStream *) (dvbsubtitleTrack->stream))->id;
if (teletextTrack)
teletextId = ((AVStream *) (teletextTrack->stream))->id;
unsigned int n;
if (context->manager->audio)
@@ -1136,9 +1160,8 @@ int container_ffmpeg_update_tracks(Context_t *context, char *filename)
track.Name = "und";
track.Encoding = encoding;
track.Id = n;
track.stream = stream;
track.Id = ((AVStream *) (track.stream))->id;
if(stream->duration == AV_NOPTS_VALUE) {
ffmpeg_printf(10, "Stream has no duration so we take the duration from context\n");
@@ -1173,11 +1196,9 @@ int container_ffmpeg_update_tracks(Context_t *context, char *filename)
ffmpeg_printf(10, "Language %s\n", track.Name);
track.Encoding = encoding;
track.Id = n;
track.stream = stream;
track.Id = ((AVStream *) (track.stream))->id;
track.duration = (double)stream->duration * av_q2d(stream->time_base) * 1000.0;
track.aacbuf = 0;
track.have_aacheader = -1;
@@ -1373,9 +1394,8 @@ int container_ffmpeg_update_tracks(Context_t *context, char *filename)
ffmpeg_printf(10, "Language %s\n", track.Name);
track.Encoding = encoding;
track.Id = n;
track.stream = stream;
track.Id = ((AVStream *) (track.stream))->id;
track.duration = (double)stream->duration * av_q2d(stream->time_base) * 1000.0;
track.aacbuf = 0;
@@ -1442,6 +1462,15 @@ int container_ffmpeg_update_tracks(Context_t *context, char *filename)
} /* for */
if (audioId > -1 && context->playback)
context->playback->Command(context, PLAYBACK_SWITCH_AUDIO, &audioId);
if (subtitleId > -1 && context->playback)
context->playback->Command(context, PLAYBACK_SWITCH_SUBTITLE, &subtitleId);
if (dvbsubtitleId > -1 && context->playback)
context->playback->Command(context, PLAYBACK_SWITCH_DVBSUBTITLE, &dvbsubtitleId);
if (teletextId > -1 && context->playback)
context->playback->Command(context, PLAYBACK_SWITCH_TELETEXT, &teletextId);
releaseMutex(FILENAME, __FUNCTION__,__LINE__);
return cERR_CONTAINER_FFMPEG_NO_ERROR;