From 5bddc3f8c700d8930bed65d1bed41b954ed13756 Mon Sep 17 00:00:00 2001 From: martii Date: Wed, 26 Mar 2014 17:59:50 +0100 Subject: [PATCH] libeplayer3/container_ffmpeg: remove latestPts variable Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/d2c6b63cc2d16643624c4fca510247693ec5b9b0 Author: martii Date: 2014-03-26 (Wed, 26 Mar 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/container/container_ffmpeg.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c index 08d0c2e..bcba86a 100644 --- a/libeplayer3/container/container_ffmpeg.c +++ b/libeplayer3/container/container_ffmpeg.c @@ -103,7 +103,6 @@ static pthread_t PlayThread; static int hasPlayThreadStarted = 0; static AVFormatContext *avContext = NULL; static unsigned char isContainerRunning = 0; -static long long int latestPts = 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; seek_target = INT64_MIN; restart_audio_resampling = 1; - latestPts = 0; // flush streams unsigned int i; @@ -384,10 +382,6 @@ static void FFMPEGThread(Context_t * context) if (videoTrack && (videoTrack->Id == pid)) { 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); avOut.data = packet_data; @@ -408,9 +402,6 @@ static void FFMPEGThread(Context_t * context) if (!context->playback->BackWard) { currentAudioPts = audioTrack->pts = pts = calcPts(audioTrack->stream, packet.pts); - if ((currentAudioPts > latestPts) && (!videoTrack)) - latestPts = currentAudioPts; - ffmpeg_printf(200, "AudioTrack index = %d\n", pid); if (audioTrack->inject_raw_pcm == 1) { ffmpeg_printf(200, "write audio raw pcm\n"); @@ -601,9 +592,6 @@ static void FFMPEGThread(Context_t * context) pts = calcPts(subtitleTrack->stream, packet.pts); - if ((pts > latestPts) && (!videoTrack) && (!audioTrack)) - latestPts = pts; - if (duration > 0.0) { /* is there a decoder ? */ if (((AVStream *) subtitleTrack->stream)->codec->codec) { @@ -828,7 +816,6 @@ int container_ffmpeg_init(Context_t * context, char *filename) } terminating = 0; - latestPts = 0; int res = container_ffmpeg_update_tracks(context, filename); unsigned int n, found_av = 0;