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

Merge "clang-format on mkvreader.[ch]pp"

Browse Source
This commit is contained in:
Vignesh Venkatasubramanian
2014-04-25 22:09:02 -07:00
committed by Gerrit Code Review
parent 2e80fedf8c 9915b8408e
commit 0cf7b1b7d3
2 changed files with 91 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mkvreader.cpp
View File

@@ -10,17 +10,11 @@
#include <cassert>
namespace mkvparser
{
namespace mkvparser {
MkvReader::MkvReader() :
m_file(NULL),
reader_owns_file_(true) {
}
MkvReader::MkvReader() : m_file(NULL), reader_owns_file_(true) {}
MkvReader::MkvReader(FILE* fp) :
m_file(fp),
reader_owns_file_(false) {
MkvReader::MkvReader(FILE* fp) : m_file(fp), reader_owns_file_(false) {
GetFileSize();
}
@@ -30,8 +24,7 @@ MkvReader::~MkvReader() {
m_file = NULL;
}
int MkvReader::Open(const char* fileName)
{
int MkvReader::Open(const char* fileName) {
if (fileName == NULL)
return -1;
@@ -83,17 +76,14 @@ bool MkvReader::GetFileSize() {
return true;
}
void MkvReader::Close()
{
if (m_file != NULL)
{
void MkvReader::Close() {
if (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)
return -1;
@@ -106,8 +96,7 @@ int MkvReader::Length(long long* total, long long* available)
return 0;
}
int MkvReader::Read(long long offset, long len, unsigned char* buffer)
{
int MkvReader::Read(long long offset, long len, unsigned char* buffer) {
if (m_file == NULL)
return -1;

11
mkvreader.hpp
View File

@@ -12,13 +12,9 @@
#include "mkvparser.hpp"
#include <cstdio>
namespace mkvparser
{
namespace mkvparser {
class MkvReader : public IMkvReader
{
MkvReader(const MkvReader&);
MkvReader& operator=(const MkvReader&);
class MkvReader : public IMkvReader {
public:
MkvReader();
MkvReader(FILE* fp);
@@ -29,7 +25,10 @@ public:
virtual int Read(long long position, long length, unsigned char* buffer);
virtual int Length(long long* total, long long* available);
private:
MkvReader(const MkvReader&);
MkvReader& operator=(const MkvReader&);
// Determines the size of the file. This is called either by the constructor
// or by the Open function depending on file ownership. Returns true on