From 6688b4a98a4766dca66070e63f1f1b94ba7cf927 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 2 Sep 2003 08:38:48 +0000
Subject: [PATCH] Further simplify.

---
 .../arch/MovieTexture/MovieTexture_FFMpeg.cpp | 19 ++++++++-----------
 .../arch/MovieTexture/MovieTexture_FFMpeg.h   |  1 -
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index 1c81921aac..d5f47ed439 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -137,7 +137,6 @@ MovieTexture_FFMpeg::MovieTexture_FFMpeg( RageTextureID ID ):
 
 	CreateDecoder();
 
-	LOG->Trace("Codec: %s", m_codec->name );
 	LOG->Trace("Resolution: %ix%i (%ix%i, %ix%i)",
 			m_iSourceWidth, m_iSourceHeight,
 			m_iImageWidth, m_iImageHeight, m_iTextureWidth, m_iTextureHeight);
@@ -207,13 +206,14 @@ void MovieTexture_FFMpeg::CreateDecoder()
 	if ( m_stream == NULL )
 		RageException::Throw( averr_ssprintf(ret, "AVCodec: Couldn't find video stream") );
 
-	m_codec = avcodec::avcodec_find_decoder( m_stream->codec.codec_id );
-	if( m_codec == NULL )
+	avcodec::AVCodec *codec = avcodec::avcodec_find_decoder( m_stream->codec.codec_id );
+	if( codec == NULL )
 		RageException::Throw( averr_ssprintf(ret, "AVCodec: Couldn't find decoder") );
 
-	ret = avcodec::avcodec_open( &m_stream->codec, m_codec );
+	LOG->Trace("Opening codec %s", codec->name );
+	ret = avcodec::avcodec_open( &m_stream->codec, codec );
 	if ( ret < 0 )
-		RageException::Throw( averr_ssprintf(ret, "AVCodec: Couldn't open decoder (%i)") );
+		RageException::Throw( averr_ssprintf(ret, "AVCodec: Couldn't open decoder") );
 
 	/* Cap the max texture size to the hardware max. */
 	actualID.iMaxSize = min( actualID.iMaxSize, DISPLAY->GetMaxTextureSize() );
@@ -339,7 +339,6 @@ void MovieTexture_FFMpeg::DecoderThread()
 	float CurrentTimestamp = 0, Last_IP_Timestamp = 0;
 
 	bool FrameSkipMode = false;
-	unsigned Frame = 0;
 	float LastFrameDelay = 0;
 	float Clock = 0;
 	RageTimer Timer;
@@ -381,7 +380,6 @@ void MovieTexture_FFMpeg::DecoderThread()
 				CurrentTimestamp = Last_IP_Timestamp = 0;
 				GetNextTimestamp = true;
 				FrameSkipMode = false;
-				Frame = 0;
 				LastFrameDelay = 0;
 				Clock = 0;
 				continue;
@@ -404,7 +402,6 @@ void MovieTexture_FFMpeg::DecoderThread()
 
 			break;
 		}
-		CHECKPOINT;
 
 		/* Decode the packet. */
 		int current_packet_offset = 0;
@@ -426,11 +423,13 @@ void MovieTexture_FFMpeg::DecoderThread()
 
 			avcodec::AVFrame frame;
 			int got_frame;
+			CHECKPOINT;
 			int len = avcodec::avcodec_decode_video(
 					&m_stream->codec, 
 					&frame, &got_frame,
 					pkt.data + current_packet_offset,
 					pkt.size - current_packet_offset );
+			CHECKPOINT;
 
 			if (len < 0)
 			{
@@ -443,8 +442,6 @@ void MovieTexture_FFMpeg::DecoderThread()
 			if (!got_frame)
 				continue;
 
-			++Frame;
-
 			/* Length of this frame: */
 			LastFrameDelay = (float)m_stream->codec.frame_rate_base / m_stream->codec.frame_rate;
 			LastFrameDelay += frame.repeat_pict * (LastFrameDelay * 0.5f);
@@ -506,7 +503,7 @@ void MovieTexture_FFMpeg::DecoderThread()
 			}
 
 			if( FrameSkipMode )
-				if( Frame % 2 )
+				if( m_stream->codec.frame_number % 2 )
 					SkipThisTextureUpdate = true;
 			
 			if( m_State == PLAYING_ONE )
diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h
index f1401a0d9e..2d39fa3676 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h
@@ -43,7 +43,6 @@ public:
 private:
 	avcodec::AVFormatContext *m_fctx;
 	avcodec::AVStream *m_stream;
-	avcodec::AVCodec *m_codec;
 
 	/* The time the movie is actually at: */
 	float m_Position;