mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

ffms2 indexer: now with less OO

Browse source 
Originally committed to SVN as r2348.
This commit is contained in:
Karl Blomster 2008-09-12 16:50:21 +00:00
parent e13576a2e2
commit eb38d1820f
2 changed files with 22 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
FFmpegSource2/ffmsindex.cpp
View file

@ -22,10 +22,8 @@
#include "ffmsindex.h" #include "ffmsindex.h"
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
FFMSIndexApp *App;
try { try {
App = new FFMSIndexApp(argc, argv); ParseCMDLine(argc, argv);
} catch (const char *Error) { } catch (const char *Error) {
std::cout << std::endl << Error << std::endl; std::cout << std::endl << Error << std::endl;
return 1; return 1;
@ -40,23 +38,23 @@ int main(int argc, char *argv[]) {
FFMS_Init(); FFMS_Init();
try { try {
App->DoIndexing(); DoIndexing();
} catch (const char *Error) { } catch (const char *Error) {
std::cout << Error << std::endl; std::cout << Error << std::endl;
delete App; FFMS_DestroyFrameIndex(Index);
return 1; return 1;
} catch (...) { } catch (...) {
std::cout << std::endl << "Unknown error" << std::endl; std::cout << std::endl << "Unknown error" << std::endl;
delete App; FFMS_DestroyFrameIndex(Index);
return 1; return 1;
} }
delete App; FFMS_DestroyFrameIndex(Index);
return 0; return 0;
} }
FFMSIndexApp::FFMSIndexApp (int argc, char *argv[]) { void ParseCMDLine (int argc, char *argv[]) {
if (argc <= 1) { if (argc <= 1) {
PrintUsage(); PrintUsage();
throw ""; throw "";
@ -109,12 +107,9 @@ FFMSIndexApp::FFMSIndexApp (int argc, char *argv[]) {
} }
} }
FFMSIndexApp::~FFMSIndexApp () {
FFMS_DestroyFrameIndex(Index);
}
void FFMSIndexApp::PrintUsage () { void PrintUsage () {
using namespace std; using namespace std;
cout << "FFmpegSource2 indexing app" << endl cout << "FFmpegSource2 indexing app" << endl
<< "Usage: ffmsindex [options] inputfile [outputfile]" << endl << "Usage: ffmsindex [options] inputfile [outputfile]" << endl
@ -122,11 +117,11 @@ void FFMSIndexApp::PrintUsage () {
<< "Options:" << endl << "Options:" << endl
<< "-f Overwrite existing index file if it exists (default: no)" << endl << "-f Overwrite existing index file if it exists (default: no)" << endl
<< "-t N Set the audio trackmask to N (-1 means decode all tracks, 0 means decode none; default: 0)" << endl << "-t N Set the audio trackmask to N (-1 means decode all tracks, 0 means decode none; default: 0)" << endl
<< "-a NAME Set the audio output base filename to NAME (default: input filename)" << endl << endl; << "-a NAME Set the audio output base filename to NAME (default: input filename)";
} }
void FFMSIndexApp::DoIndexing () { void DoIndexing () {
char FFMSErrMsg[1024]; char FFMSErrMsg[1024];
int MsgSize = sizeof(FFMSErrMsg); int MsgSize = sizeof(FFMSErrMsg);
int Progress = 0; int Progress = 0;
@ -134,7 +129,7 @@ void FFMSIndexApp::DoIndexing () {
Index = FFMS_ReadIndex(CacheFile.c_str(), FFMSErrMsg, MsgSize); Index = FFMS_ReadIndex(CacheFile.c_str(), FFMSErrMsg, MsgSize);
if (Overwrite || Index == NULL) { if (Overwrite || Index == NULL) {
std::cout << "Indexing, please wait... 0%"; std::cout << "Indexing, please wait... 0%";
Index = FFMS_MakeIndex(InputFile.c_str(), TrackMask, AudioFile.c_str(), FFMSIndexApp::UpdateProgress, &Progress, FFMSErrMsg, MsgSize); Index = FFMS_MakeIndex(InputFile.c_str(), TrackMask, AudioFile.c_str(), UpdateProgress, &Progress, FFMSErrMsg, MsgSize);
if (Index == NULL) { if (Index == NULL) {
std::string Err = "Indexing error: "; std::string Err = "Indexing error: ";
Err.append(FFMSErrMsg); Err.append(FFMSErrMsg);
@ -158,7 +153,8 @@ void FFMSIndexApp::DoIndexing () {
} }
} }
int FFMSIndexApp::UpdateProgress(int State, int64_t Current, int64_t Total, void *Private) {
static int __stdcall UpdateProgress(int State, int64_t Current, int64_t Total, void *Private) {
using namespace std; using namespace std;
int *LastPercentage = (int *)Private; int *LastPercentage = (int *)Private;
int Percentage = int((double(Current)/double(Total)) * 100); int Percentage = int((double(Current)/double(Total)) * 100);

25
FFmpegSource2/ffmsindex.h
View file

@ -25,21 +25,16 @@
#include "ffms.h" #include "ffms.h"
class FFMSIndexApp { int TrackMask;
private: bool Overwrite;
int TrackMask; std::string InputFile;
bool Overwrite; std::string CacheFile;
std::string InputFile; std::string AudioFile;
std::string CacheFile;
std::string AudioFile;
FrameIndex *Index; FrameIndex *Index;
void PrintUsage(); void PrintUsage();
void ParseCMDLine(int argc, char *argv[]);
void DoIndexing();
public: static int __stdcall UpdateProgress(int State, int64_t Current, int64_t Total, void *Private);
FFMSIndexApp(int argc, char *argv[]);
~FFMSIndexApp();
void DoIndexing();
static int __stdcall UpdateProgress(int State, int64_t Current, int64_t Total, void *Private);
};