start adding seek in file

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 939879589f6c · 2014-05-25T05:20:43.000-04:00
diff --git a/app/avplay/AvReader.hpp b/app/avplay/AvReader.hpp
@@ -90,8 +90,9 @@ class AvReader : public Reader
 
 	const char* readFrameAt( const size_t frame )
 	{
-		// TODO seek @ frame
-
+		// /std::cout << "seek at " << frame << std::endl;
+		m_inputFile.seekAtFrame( frame );
+		m_inputStreamVideo->flushDecoder();
 		m_inputStreamVideo->readNextFrame( *m_sourceImage );
 		m_colorTransform.convert( *m_sourceImage, *m_imageToDisplay );
 		return (const char*)m_imageToDisplay->getPtr();
diff --git a/app/avplay/Window.cpp b/app/avplay/Window.cpp
@@ -12,6 +12,7 @@
 
 #include <iostream>
 #include <iomanip>
+#include <cstring>
 
 Reader* Window::m_reader = NULL;
 
@@ -165,6 +166,7 @@ void Window::display()
 	glVertex2f  ( x2, y1 );
 
 	glEnd();
+
 	glutSwapBuffers();
 }
 
@@ -242,6 +244,7 @@ void Window::keyboard( unsigned char k, int x, int y )
 
 void Window::specialKeyboard( int k, int x, int y )
 {
+	//std::cout << "k=" << k << " x=" << x << " y=" << y << std::endl; 
 	switch (k)
 	{
 		case GLUT_KEY_UP:
@@ -252,11 +255,16 @@ void Window::specialKeyboard( int k, int x, int y )
 			break;
 		case GLUT_KEY_LEFT:
 			// cursor move
+			displayPrevFrame();
 			break;
 		case GLUT_KEY_RIGHT:
 			// cursor move
 			displayNextFrame();
 			break;
+		case GLUT_KEY_HOME:
+			displayFirstFrame();
+		case GLUT_KEY_END:
+			break;
 		case GLUT_KEY_F1:
 			displayHelp();
 			break;
@@ -528,6 +536,23 @@ void Window::displayNextFrame()
 	loadNewTexture( buffer, m_reader->getComponents(), m_reader->getWidth(), m_reader->getHeight(), GL_RGB, GL_UNSIGNED_BYTE );
 }
 
+void Window::displayPrevFrame()
+{
+	const char* buffer = m_reader->readPrevFrame();
+	loadNewTexture( buffer, m_reader->getComponents(), m_reader->getWidth(), m_reader->getHeight(), GL_RGB, GL_UNSIGNED_BYTE );
+}
+
+void Window::displayFirstFrame()
+{
+	displayAtFrame( 0 );
+}
+
+void Window::displayAtFrame( const size_t frame )
+{
+	const char* buffer = m_reader->readFrameAt( frame );
+	loadNewTexture( buffer, m_reader->getComponents(), m_reader->getWidth(), m_reader->getHeight(), GL_RGB, GL_UNSIGNED_BYTE );
+}
+
 void Window::loopPlaying( int value )
 {
 	if( m_play )
diff --git a/app/avplay/Window.hpp b/app/avplay/Window.hpp
@@ -37,6 +37,9 @@ class Window
 	static void showAlphaChannelTexture();
 
 	static void displayNextFrame();
+	static void displayPrevFrame();
+	static void displayFirstFrame();
+	static void displayAtFrame( const size_t frame );
 
 	static void loopPlaying( int value );
 
diff --git a/src/AvTranscoder/InputFile.cpp b/src/AvTranscoder/InputFile.cpp
@@ -167,6 +167,24 @@ bool InputFile::readNextPacket( const size_t streamIndex )
 	}
 }
 
+void InputFile::seekAtFrame( const size_t frame )
+{
+	uint64_t pos = frame / 25 * AV_TIME_BASE; 
+
+	if( (int)m_formatContext->start_time != AV_NOPTS_VALUE )
+        pos += m_formatContext->start_time;
+
+	if( av_seek_frame( m_formatContext, -1, pos, AVSEEK_FLAG_BACKWARD ) < 0 )
+	{
+		std::cerr << "Error during seek in file" << std::endl;
+	}
+
+	for( std::vector<InputStream>::iterator it = m_inputStreams.begin(); it != m_inputStreams.end(); ++it )
+	{
+		(*it).clearBuffering();
+	}
+}
+
 void InputFile::readStream( const size_t streamIndex, bool readStream )
 {
 	m_inputStreams.at( streamIndex ).setBufferred( readStream );	
diff --git a/src/AvTranscoder/InputFile.hpp b/src/AvTranscoder/InputFile.hpp
@@ -40,6 +40,8 @@ class AvExport InputFile
 
 	bool readNextPacket( const size_t streamIndex );
 
+	void seekAtFrame( const size_t frame );
+
 	void readStream( const size_t streamIndex, const bool readStream = true );
 
 protected:
diff --git a/src/AvTranscoder/InputStream.cpp b/src/AvTranscoder/InputStream.cpp
@@ -121,4 +121,9 @@ double InputStream::getPacketDuration() const
 	return m_packetDuration * av_q2d( m_inputFile->getFormatContext()->streams[m_streamIndex]->time_base );
 }
 
+void InputStream::clearBuffering()
+{
+	m_streamCache.clear();
+}
+
 }
diff --git a/src/AvTranscoder/InputStream.hpp b/src/AvTranscoder/InputStream.hpp
@@ -49,6 +49,8 @@ class AvExport InputStream
 
 	void setBufferred( const bool bufferized ){ m_bufferized = bufferized; }
 
+	void clearBuffering();
+
 private:
 	InputFile*       m_inputFile;
 	std::vector<DataStream> m_streamCache;
diff --git a/src/AvTranscoder/InputStreamVideo.cpp b/src/AvTranscoder/InputStreamVideo.cpp
@@ -121,4 +121,9 @@ bool InputStreamVideo::readNextFrame( Image& frameBuffer )
 	return true;
 }
 
+void InputStreamVideo::flushDecoder()
+{
+	avcodec_flush_buffers( m_codecContext );
+}
+
 }
diff --git a/src/AvTranscoder/InputStreamVideo.hpp b/src/AvTranscoder/InputStreamVideo.hpp
@@ -22,6 +22,8 @@ class AvExport InputStreamVideo
 
 	bool readNextFrame( Image& frameBuffer );
 
+	void flushDecoder();
+
 private:
 	InputStream&       m_inputStream;
 	AVCodec*           m_codec;

Original file line number	Diff line number	Diff line change
`@@ -121,4 +121,9 @@ double InputStream::getPacketDuration() const`
`121`	`121`	`return m_packetDuration * av_q2d( m_inputFile->getFormatContext()->streams[m_streamIndex]->time_base );`
`122`	`122`	`}`
`123`	`123`
	`124`	`+void InputStream::clearBuffering()`
	`125`	`+{`
	`126`	`+ m_streamCache.clear();`
	`127`	`+}`
	`128`	`+`
`124`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,4 +121,9 @@ bool InputStreamVideo::readNextFrame( Image& frameBuffer )`
`121`	`121`	`return true;`
`122`	`122`	`}`
`123`	`123`
	`124`	`+void InputStreamVideo::flushDecoder()`
	`125`	`+{`
	`126`	`+ avcodec_flush_buffers( m_codecContext );`
	`127`	`+}`
	`128`	`+`
`124`	`129`	`}`