generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clang-format on mkvreader.[ch]pp

Browse Source 
Conformance of mkvreader.[ch]pp to Google C++ style guide.

Change-Id: I9928a1a7daf9afaa30355b17b3eeeb2966626031
This commit is contained in:
Vignesh Venkatasubramanian
2014-04-14 12:03:32 -07:00
parent fb6b6e6444
commit 9915b8408e
2 changed files with 91 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
mkvreader.cpp
View File

@@ -10,17 +10,11 @@
#include <cassert> #include <cassert>
namespace mkvparser namespace mkvparser {
{
MkvReader::MkvReader() : MkvReader::MkvReader() : m_file(NULL), reader_owns_file_(true) {}
m_file(NULL),
reader_owns_file_(true) {
}
MkvReader::MkvReader(FILE* fp) : MkvReader::MkvReader(FILE* fp) : m_file(fp), reader_owns_file_(false) {
m_file(fp),
reader_owns_file_(false) {
GetFileSize(); GetFileSize();
} }
@@ -30,114 +24,109 @@ MkvReader::~MkvReader() {
m_file = NULL; m_file = NULL;
} }
int MkvReader::Open(const char* fileName) int MkvReader::Open(const char* fileName) {
{ if (fileName == NULL)
if (fileName == NULL) return -1;
return -1;
if (m_file) if (m_file)
return -1; return -1;
#ifdef _MSC_VER #ifdef _MSC_VER
const errno_t e = fopen_s(&m_file, fileName, "rb"); const errno_t e = fopen_s(&m_file, fileName, "rb");
if (e) if (e)
return -1; //error return -1; // error
#else #else
m_file = fopen(fileName, "rb"); m_file = fopen(fileName, "rb");
if (m_file == NULL) if (m_file == NULL)
return -1; return -1;
#endif #endif
return !GetFileSize(); return !GetFileSize();
} }
bool MkvReader::GetFileSize() { bool MkvReader::GetFileSize() {
if (m_file == NULL) if (m_file == NULL)
return false; return false;
#ifdef _MSC_VER #ifdef _MSC_VER
int status = _fseeki64(m_file, 0L, SEEK_END); int status = _fseeki64(m_file, 0L, SEEK_END);
if (status) if (status)
return false; //error return false; // error
m_length = _ftelli64(m_file); m_length = _ftelli64(m_file);
#else #else
fseek(m_file, 0L, SEEK_END); fseek(m_file, 0L, SEEK_END);
m_length = ftell(m_file); m_length = ftell(m_file);
#endif #endif
assert(m_length >= 0); assert(m_length >= 0);
if (m_length < 0) if (m_length < 0)
return false; return false;
#ifdef _MSC_VER #ifdef _MSC_VER
status = _fseeki64(m_file, 0L, SEEK_SET); status = _fseeki64(m_file, 0L, SEEK_SET);
if (status) if (status)
return false; //error return false; // error
#else #else
fseek(m_file, 0L, SEEK_SET); fseek(m_file, 0L, SEEK_SET);
#endif #endif
return true; return true;
} }
void MkvReader::Close() void MkvReader::Close() {
{ if (m_file != NULL) {
if (m_file != NULL) fclose(m_file);
{ m_file = NULL;
fclose(m_file); }
m_file = NULL;
}
} }
int MkvReader::Length(long long* total, long long* available) int MkvReader::Length(long long* total, long long* available) {
{ if (m_file == NULL)
if (m_file == NULL) return -1;
return -1;
if (total) if (total)
*total = m_length; *total = m_length;
if (available) if (available)
*available = m_length; *available = m_length;
return 0;
}
int MkvReader::Read(long long offset, long len, unsigned char* buffer) {
if (m_file == NULL)
return -1;
if (offset < 0)
return -1;
if (len < 0)
return -1;
if (len == 0)
return 0; return 0;
}
int MkvReader::Read(long long offset, long len, unsigned char* buffer) if (offset >= m_length)
{ return -1;
if (m_file == NULL)
return -1;
if (offset < 0)
return -1;
if (len < 0)
return -1;
if (len == 0)
return 0;
if (offset >= m_length)
return -1;
#ifdef _MSC_VER #ifdef _MSC_VER
const int status = _fseeki64(m_file, offset, SEEK_SET); const int status = _fseeki64(m_file, offset, SEEK_SET);
if (status) if (status)
return -1; //error return -1; // error
#else #else
fseek(m_file, offset, SEEK_SET); fseek(m_file, offset, SEEK_SET);
#endif #endif
const size_t size = fread(buffer, 1, len, m_file); const size_t size = fread(buffer, 1, len, m_file);
if (size < size_t(len)) if (size < size_t(len))
return -1; //error return -1; // error
return 0; //success return 0; // success
} }
} //end namespace mkvparser } // end namespace mkvparser

47
mkvreader.hpp
View File

@@ -12,35 +12,34 @@
#include "mkvparser.hpp" #include "mkvparser.hpp"
#include <cstdio> #include <cstdio>
namespace mkvparser namespace mkvparser {
{
class MkvReader : public IMkvReader class MkvReader : public IMkvReader {
{ public:
MkvReader(const MkvReader&); MkvReader();
MkvReader& operator=(const MkvReader&); MkvReader(FILE* fp);
public: virtual ~MkvReader();
MkvReader();
MkvReader(FILE* fp);
virtual ~MkvReader();
int Open(const char*); int Open(const char*);
void Close(); void Close();
virtual int Read(long long position, long length, unsigned char* buffer); virtual int Read(long long position, long length, unsigned char* buffer);
virtual int Length(long long* total, long long* available); virtual int Length(long long* total, long long* available);
private:
// Determines the size of the file. This is called either by the constructor private:
// or by the Open function depending on file ownership. Returns true on MkvReader(const MkvReader&);
// success. MkvReader& operator=(const MkvReader&);
bool GetFileSize();
long long m_length; // Determines the size of the file. This is called either by the constructor
FILE* m_file; // or by the Open function depending on file ownership. Returns true on
bool reader_owns_file_; // success.
bool GetFileSize();
long long m_length;
FILE* m_file;
bool reader_owns_file_;
}; };
} //end namespace mkvparser } // end namespace mkvparser
#endif //MKVREADER_HPP #endif // MKVREADER_HPP