Some basic LAVC code implemented

Originally committed to SVN as r142.

core/video_provider_lavc.cpp

@@ -37,116 +37,191 @@
 ///////////
 // Headers
 #ifdef USE_LAVC
-#define EMULATE_INTTYPES
 #include <wx/wxprec.h>
-#include <lavc/avcodec.h>
-#include <lavc/avformat.h>
 #include "video_provider_lavc.h"
 
 
 ///////////////
 // Constructor
 LAVCVideoProvider::LAVCVideoProvider(wxString filename, wxString subfilename, double zoom) {
+	// Init variables
+	codecContext = NULL;
+	formatContext = NULL;
+	codec = NULL;
+	stream = NULL;
+	vidStream = -1;
+
 	// Register types
 	static bool avRegistered = false;
 	if (!avRegistered) {
 		av_register_all();
 		avRegistered = true;
 	}
+
+	// Load
+	LoadVideo(filename);
 }
 
 
 //////////////
 // Destructor
 LAVCVideoProvider::~LAVCVideoProvider() {
+	Close();
 }
 
 
-//
+//////////////
-//
+// Load video
+void LAVCVideoProvider::LoadVideo(wxString filename) {
+	// Close first
+	Close();
+
+	// Load
+	try {
+		// Open file
+		int result = 0;
+		result = av_open_input_file(&formatContext,filename.mb_str(wxConvLocal),NULL,0,NULL);
+		if (result != 0) throw _T("Failed opening file.");
+
+		// Get stream info
+		result = av_find_stream_info(formatContext);
+		if (result < 0) throw _T("Unable to read stream info");
+
+		// Find video stream
+		vidStream = -1;
+		codecContext = NULL;
+		for (int i=0;i<formatContext->nb_streams;i++) {
+			codecContext = formatContext->streams[i]->codec;
+			if (codecContext->codec_type == CODEC_TYPE_VIDEO) {
+				stream = formatContext->streams[i];
+				vidStream = i;
+				break;
+			}
+		}
+		if (vidStream == -1) throw _T("Could not find a video stream");
+
+		// Check length
+		if (stream->duration <= 0) throw _T("Returned invalid stream length");
+
+		// Find codec
+		codec = avcodec_find_decoder(codecContext->codec_id);
+		if (!codec) throw _T("Could not find suitable video decoder");
+
+		// Enable truncation
+		if (codec->capabilities & CODEC_CAP_TRUNCATED) codecContext->flags |= CODEC_FLAG_TRUNCATED;
+
+		// Open codec
+		result = avcodec_open(codecContext,codec);
+		if (result < 0) throw _T("Failed to open video decoder");
+	}
+
+	// Catch errors
+	catch (...) {
+		Close();
+		throw;
+	}
+}
+
+
+///////////////
+// Close video
+void LAVCVideoProvider::Close() {
+	// Close codec context
+	if (codec) avcodec_close(codecContext);
+	codecContext = NULL;
+	codec = NULL;
+
+	// Close format context
+	if (formatContext) av_close_input_file(formatContext);
+	formatContext = NULL;
+}
+
+
+////////////////
+// Refresh subs
 void LAVCVideoProvider::RefreshSubtitles() {
 }
 
 
-//
+/////////////
-//
+// Get frame
 wxBitmap LAVCVideoProvider::GetFrame(int n) {
-	wxBitmap frame;
+	wxBitmap frame(GetWidth(),GetHeight());
 	return frame;
 }
 
 
-//
+//////////////////////
-//
+// Get frame as float
 void LAVCVideoProvider::GetFloatFrame(float* Buffer, int n) {
 }
 
 
-//
+////////////////
-//
+// Get position
 int LAVCVideoProvider::GetPosition() {
 	return 0;
 }
 
 
-//
+////////////////////////
-//
+// Get number of frames
 int LAVCVideoProvider::GetFrameCount() {
-	return 0;
+	return stream->duration;
 }
 
 
-//
+//////////////////
-//
+// Get frame rate
 double LAVCVideoProvider::GetFPS() {
-	return 1;
+	return double(stream->r_frame_rate.num) / double(stream->r_frame_rate.den);
 }
 
 
-//
+////////////////////
-//
+// Set aspect ratio
 void LAVCVideoProvider::SetDAR(double dar) {
 }
 
 
-//
+////////////
-//
+// Set zoom
 void LAVCVideoProvider::SetZoom(double zoom) {
 }
 
 
-//
+////////////
-//
+// Get zoom
-int LAVCVideoProvider::GetWidth() {
-	return 640;
-}
-
-
-//
-//
-int LAVCVideoProvider::GetHeight() {
-	return 480;
-}
-
-
-//
-//
 double LAVCVideoProvider::GetZoom() {
 	return 1;
 }
 
 
-//
+/////////////
-//
+// Get width
-int LAVCVideoProvider::GetSourceWidth() {
+int LAVCVideoProvider::GetWidth() {
-	return 640;
+	return codecContext->coded_width;
 }
 
 
-//
+//////////////
-//
+// Get height
+int LAVCVideoProvider::GetHeight() {
+	return codecContext->coded_height;
+}
+
+
+//////////////////////
+// Get original width
+int LAVCVideoProvider::GetSourceWidth() {
+	return codecContext->coded_width;
+}
+
+
+///////////////////////
+// Get original height
 int LAVCVideoProvider::GetSourceHeight() {
-	return 480;
+	return codecContext->coded_height;
 }
 
 

core/video_provider_lavc.h

@@ -39,12 +39,25 @@
 ///////////
 // Headers
 #ifdef USE_LAVC
+#define EMULATE_INTTYPES
+#include <lavc/avcodec.h>
+#include <lavc/avformat.h>
 #include "video_provider.h"
 
 
 ///////////////////////
 // LibAVCodec provider
 class LAVCVideoProvider : public VideoProvider {
+private:
+	AVFormatContext *formatContext;
+	AVCodecContext *codecContext;
+	AVStream *stream;
+	AVCodec *codec;
+	int vidStream;
+
+	void LoadVideo(wxString filename);
+	void Close();
+
 public:
 	LAVCVideoProvider(wxString filename, wxString subfilename, double zoom);
 	~LAVCVideoProvider();