Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-08 11:11:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Moritz Bunkus 2013-05-09 12:55:55 +02:00
parent 0415419bea
commit 636ec5e197
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/input/r_mpeg_es.cpp
View File

@ -201,39 +201,33 @@ bool
mpeg_es_reader_c::read_frame(M2VParser &parser,
mm_io_c &in,
int64_t max_size) {
int bytes_probed;
auto af_buffer = memory_c::alloc(READ_SIZE);
auto buffer = af_buffer->get_buffer();
int bytes_probed = 0;
bytes_probed = 0;
while (true) {
int state;
auto state = parser.GetState();
state = parser.GetState();
if (MPV_PARSER_STATE_NEED_DATA == state) {
if ((max_size != -1) && (bytes_probed > max_size))
return false;
int bytes_to_read = (parser.GetFreeBufferSpace() < READ_SIZE) ? parser.GetFreeBufferSpace() : READ_SIZE;
unsigned char *buffer = new unsigned char[bytes_to_read];
int bytes_read = in.read(buffer, bytes_to_read);
if (0 == bytes_read) {
delete [] buffer;
break;
}
bytes_probed += bytes_read;
parser.WriteData(buffer, bytes_read);
parser.SetEOS();
delete [] buffer;
} else if (MPV_PARSER_STATE_FRAME == state)
if (MPV_PARSER_STATE_FRAME == state)
return true;
else if ((MPV_PARSER_STATE_EOS == state) || (MPV_PARSER_STATE_ERROR == state))
if ((MPV_PARSER_STATE_EOS == state) || (MPV_PARSER_STATE_ERROR == state))
return false;
}
return false;
assert(MPV_PARSER_STATE_NEED_DATA == state);
if ((max_size != -1) && (bytes_probed > max_size))
return false;
int bytes_read = in.read(buffer, std::min<int>(parser.GetFreeBufferSpace(), READ_SIZE));
if (!bytes_read)
return false;
bytes_probed += bytes_read;
parser.WriteData(buffer, bytes_read);
parser.SetEOS();
}
}
void