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/container_ffmpeg: initialize stream ids, if unset

Browse Source
This commit is contained in:
martii
2013-07-21 19:02:58 +02:00
committed by Stefan Seyfried
parent e30ad7d035
commit 8ba924c471
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libeplayer3/container/container_ffmpeg.c
View File

@@ -455,8 +455,7 @@ static void FFMPEGThread(Context_t *context) {
ffmpeg_printf(200, "packet.size %d - index %d\n", packet.size, pid); ffmpeg_printf(200, "packet.size %d - index %d\n", packet.size, pid);
if (videoTrack != NULL) { if (videoTrack && (videoTrack->Id == pid)) {
if (videoTrack->Id == pid) {
currentVideoPts = videoTrack->pts = pts = calcPts(videoTrack->stream, packet.pts); currentVideoPts = videoTrack->pts = pts = calcPts(videoTrack->stream, packet.pts);
if ((currentVideoPts > latestPts) && (currentVideoPts != INVALID_PTS_VALUE)) if ((currentVideoPts > latestPts) && (currentVideoPts != INVALID_PTS_VALUE))
@@ -478,11 +477,7 @@ static void FFMPEGThread(Context_t *context) {
if (context->output->video->Write(context, &avOut) < 0) { if (context->output->video->Write(context, &avOut) < 0) {
ffmpeg_err("writing data to video device failed\n"); ffmpeg_err("writing data to video device failed\n");
} }
} } else if (audioTrack && (audioTrack->Id == pid)) {
}
if (audioTrack != NULL) {
if (audioTrack->Id == pid) {
currentAudioPts = audioTrack->pts = pts = calcPts(audioTrack->stream, packet.pts); currentAudioPts = audioTrack->pts = pts = calcPts(audioTrack->stream, packet.pts);
if ((currentAudioPts > latestPts) && (!videoTrack)) if ((currentAudioPts > latestPts) && (!videoTrack))
@@ -536,7 +531,6 @@ static void FFMPEGThread(Context_t *context) {
while(avpkt.size > 0) while(avpkt.size > 0)
{ {
int got_frame = 0; int got_frame = 0;
if (!decoded_frame) { if (!decoded_frame) {
if (!(decoded_frame = avcodec_alloc_frame())) { if (!(decoded_frame = avcodec_alloc_frame())) {
@@ -661,7 +655,6 @@ static void FFMPEGThread(Context_t *context) {
} }
else else
{ {
avOut.data = packet.data; avOut.data = packet.data;
avOut.len = packet.size; avOut.len = packet.size;
avOut.pts = pts; avOut.pts = pts;
@@ -678,11 +671,9 @@ static void FFMPEGThread(Context_t *context) {
ffmpeg_err("writing data to audio device failed\n"); ffmpeg_err("writing data to audio device failed\n");
} }
} }
}
} }
if (subtitleTrack != NULL) { if (subtitleTrack && (subtitleTrack->Id == pid)) {
if (subtitleTrack->Id == pid) {
float duration=3.0; float duration=3.0;
ffmpeg_printf(100, "subtitleTrack->stream %p \n", subtitleTrack->stream); ffmpeg_printf(100, "subtitleTrack->stream %p \n", subtitleTrack->stream);
@@ -787,10 +778,8 @@ static void FFMPEGThread(Context_t *context) {
free(line); free(line);
} }
} /* duration */ } /* duration */
}
} }
if (dvbsubtitleTrack != NULL) { else if (dvbsubtitleTrack && (dvbsubtitleTrack->Id == pid)) {
if (dvbsubtitleTrack->Id == pid) {
dvbsubtitleTrack->pts = pts = calcPts(dvbsubtitleTrack->stream, packet.pts); dvbsubtitleTrack->pts = pts = calcPts(dvbsubtitleTrack->stream, packet.pts);
ffmpeg_printf(200, "DvbSubTitle index = %d\n",pid); ffmpeg_printf(200, "DvbSubTitle index = %d\n",pid);
@@ -810,10 +799,7 @@ static void FFMPEGThread(Context_t *context) {
{ {
//ffmpeg_err("writing data to dvbsubtitle fifo failed\n"); //ffmpeg_err("writing data to dvbsubtitle fifo failed\n");
} }
} } else if (teletextTrack && (teletextTrack->Id == pid)) {
}
if (teletextTrack != NULL) {
if (teletextTrack->Id == pid) {
teletextTrack->pts = pts = calcPts(teletextTrack->stream, packet.pts); teletextTrack->pts = pts = calcPts(teletextTrack->stream, packet.pts);
ffmpeg_printf(200, "TeleText index = %d\n",pid); ffmpeg_printf(200, "TeleText index = %d\n",pid);
@@ -833,7 +819,6 @@ static void FFMPEGThread(Context_t *context) {
{ {
//ffmpeg_err("writing data to teletext fifo failed\n"); //ffmpeg_err("writing data to teletext fifo failed\n");
} }
}
} }
if (packet.data) if (packet.data)
@@ -1004,6 +989,9 @@ int container_ffmpeg_update_tracks(Context_t *context, char *filename)
if (encoding != NULL) if (encoding != NULL)
ffmpeg_printf(1, "%d. encoding = %s - version %d\n", n, encoding, version); ffmpeg_printf(1, "%d. encoding = %s - version %d\n", n, encoding, version);
if (!stream->id)
stream->id = n;
/* some values in track are unset and therefor copyTrack segfaults. /* some values in track are unset and therefor copyTrack segfaults.
* so set it by default to NULL! * so set it by default to NULL!
*/ */