LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am a0045f20: Merge "opengles emulator: dynamicaly grow ReadBuffer"

Browse Source 
* commit 'a0045f207807928ff6fa0a66d9e0ecf4de635782':
  opengles emulator: dynamicaly grow ReadBuffer
This commit is contained in:
David Turner
2011-08-09 08:35:40 -07:00
committed by Android Git Automerger
parent ecb7c06ff4 a0045f2078
commit 8cfde07c61
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tools/emulator/opengl/host/libs/libOpenglRender/ReadBuffer.cpp
View File

@@ -16,29 +16,48 @@
#include "ReadBuffer.h" #include "ReadBuffer.h"
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <limits.h>
#include "ErrorLog.h"
ReadBuffer::ReadBuffer(IOStream *stream, size_t bufsize) ReadBuffer::ReadBuffer(IOStream *stream, size_t bufsize)
{ {
m_size = bufsize; m_size = bufsize;
m_stream = stream; m_stream = stream;
m_buf = new unsigned char[m_size]; m_buf = (unsigned char*)malloc(m_size*sizeof(unsigned char));
m_validData = 0; m_validData = 0;
m_readPtr = m_buf; m_readPtr = m_buf;
} }
ReadBuffer::~ReadBuffer() ReadBuffer::~ReadBuffer()
{ {
delete m_buf; free(m_buf);
} }
int ReadBuffer::getData() int ReadBuffer::getData()
{ {
if (m_validData > 0) { if ((m_validData > 0) && (m_readPtr > m_buf)) {
memcpy(m_buf, m_readPtr, m_validData); memcpy(m_buf, m_readPtr, m_validData);
} }
m_readPtr = m_buf;
// get fresh data into the buffer; // get fresh data into the buffer;
size_t len = m_size - m_validData; size_t len = m_size - m_validData;
if (len==0) {
//we need to inc our buffer
size_t new_size = m_size*2;
unsigned char* new_buf;
if (new_size < m_size) { // overflow check
new_size = INT_MAX;
}
new_buf = (unsigned char*)realloc(m_buf, new_size);
if (!new_buf) {
ERR("Failed to alloc %d bytes for ReadBuffer\n", new_size);
return -1;
}
m_size = new_size;
m_buf = new_buf;
len = m_size - m_validData;
}
m_readPtr = m_buf;
if (NULL != m_stream->read(m_buf + m_validData, &len)) { if (NULL != m_stream->read(m_buf + m_validData, &len)) {
m_validData += len; m_validData += len;
return len; return len;