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

libeplayer3/container_ffmpeg: remove latestPts variable

Browse Source
This commit is contained in:
martii
2014-03-26 17:59:50 +01:00
parent 4f32aa4ea0
commit 794ced8b3d
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libeplayer3/container/container_ffmpeg.c
View File

@@ -103,7 +103,6 @@ static pthread_t PlayThread;
static int hasPlayThreadStarted = 0; static int hasPlayThreadStarted = 0;
static AVFormatContext *avContext = NULL; static AVFormatContext *avContext = NULL;
static unsigned char isContainerRunning = 0; static unsigned char isContainerRunning = 0;
static long long int latestPts = 0;
static float seek_sec_abs = -1.0, seek_sec_rel = 0.0; static float seek_sec_abs = -1.0, seek_sec_rel = 0.0;
/* ***************************** */ /* ***************************** */
@@ -333,7 +332,6 @@ static void FFMPEGThread(Context_t * context)
bofcount = 1; bofcount = 1;
seek_target = INT64_MIN; seek_target = INT64_MIN;
restart_audio_resampling = 1; restart_audio_resampling = 1;
latestPts = 0;
// flush streams // flush streams
unsigned int i; unsigned int i;
@@ -384,10 +382,6 @@ static void FFMPEGThread(Context_t * context)
if (videoTrack && (videoTrack->Id == pid)) { if (videoTrack && (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))
latestPts = currentVideoPts;
ffmpeg_printf(200, "VideoTrack index = %d %lld\n", pid, currentVideoPts); ffmpeg_printf(200, "VideoTrack index = %d %lld\n", pid, currentVideoPts);
avOut.data = packet_data; avOut.data = packet_data;
@@ -408,9 +402,6 @@ static void FFMPEGThread(Context_t * context)
if (!context->playback->BackWard) { if (!context->playback->BackWard) {
currentAudioPts = audioTrack->pts = pts = calcPts(audioTrack->stream, packet.pts); currentAudioPts = audioTrack->pts = pts = calcPts(audioTrack->stream, packet.pts);
if ((currentAudioPts > latestPts) && (!videoTrack))
latestPts = currentAudioPts;
ffmpeg_printf(200, "AudioTrack index = %d\n", pid); ffmpeg_printf(200, "AudioTrack index = %d\n", pid);
if (audioTrack->inject_raw_pcm == 1) { if (audioTrack->inject_raw_pcm == 1) {
ffmpeg_printf(200, "write audio raw pcm\n"); ffmpeg_printf(200, "write audio raw pcm\n");
@@ -601,9 +592,6 @@ static void FFMPEGThread(Context_t * context)
pts = calcPts(subtitleTrack->stream, packet.pts); pts = calcPts(subtitleTrack->stream, packet.pts);
if ((pts > latestPts) && (!videoTrack) && (!audioTrack))
latestPts = pts;
if (duration > 0.0) { if (duration > 0.0) {
/* is there a decoder ? */ /* is there a decoder ? */
if (((AVStream *) subtitleTrack->stream)->codec->codec) { if (((AVStream *) subtitleTrack->stream)->codec->codec) {
@@ -828,7 +816,6 @@ int container_ffmpeg_init(Context_t * context, char *filename)
} }
terminating = 0; terminating = 0;
latestPts = 0;
int res = container_ffmpeg_update_tracks(context, filename); int res = container_ffmpeg_update_tracks(context, filename);
unsigned int n, found_av = 0; unsigned int n, found_av = 0;