#include <GLES2/gl2ext.h>
#include <stdlib.h>
+#include <assert.h>
#include "screenrecord.h"
#include "Overlay.h"
mStartMonotonicNsecs = systemTime(CLOCK_MONOTONIC);
mStartRealtimeNsecs = systemTime(CLOCK_REALTIME);
+ Mutex::Autolock _l(mMutex);
+
// Start the thread. Traffic begins immediately.
run("overlay");
- Mutex::Autolock _l(mMutex);
mState = INIT;
while (mState == INIT) {
mStartCond.wait(mMutex);
ALOGE("Failed to start overlay thread: err=%d", mThreadResult);
return mThreadResult;
}
- assert(mState == READY);
+ assert(mState == RUNNING);
ALOGV("Overlay::start successful");
*pBufferProducer = mBufferQueue;
}
uint32_t potHeight = powerOfTwoCeil(FontBitmap::height);
- uint32_t* rgbaPixels = new uint32_t[FontBitmap::width * potHeight];
+ uint8_t* rgbaPixels = new uint8_t[FontBitmap::width * potHeight * 4];
memset(rgbaPixels, 0, FontBitmap::width * potHeight * 4);
+ uint8_t* pix = rgbaPixels;
for (unsigned int i = 0; i < FontBitmap::width * FontBitmap::height; i++) {
uint8_t alpha, color;
color = FontBitmap::pixels[i] & ~1;
alpha = 0xff;
}
- rgbaPixels[i] = (alpha << 24) | (color << 16) | (color << 8) | color;
+ *pix++ = color;
+ *pix++ = color;
+ *pix++ = color;
+ *pix++ = alpha;
}
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, FontBitmap::width, potHeight, 0,
return computeScaledStringWidth(str, strlen(str));
}
+size_t TextRenderer::glyphIndex(char ch) const {
+ size_t chi = ch - FontBitmap::firstGlyphChar;
+ if (chi >= FontBitmap::numGlyphs) {
+ chi = '?' - FontBitmap::firstGlyphChar;
+ }
+ assert(chi < FontBitmap::numGlyphs);
+ return chi;
+}
+
float TextRenderer::computeScaledStringWidth(const char* str,
size_t len) const {
float width = 0.0f;
for (size_t i = 0; i < len; i++) {
- size_t chi = str[i] - FontBitmap::firstGlyphChar;
+ size_t chi = glyphIndex(str[i]);
float glyphWidth = FontBitmap::glyphWidth[chi];
width += (glyphWidth - 1 - FontBitmap::outlineWidth) * mScale;
}
float fullTexWidth = FontBitmap::width;
float fullTexHeight = powerOfTwoCeil(FontBitmap::height);
for (size_t i = 0; i < len; i++) {
- size_t chi = str[i] - FontBitmap::firstGlyphChar;
- if (chi >= FontBitmap::numGlyphs) {
- chi = '?' - FontBitmap::firstGlyphChar;
- assert(chi < FontBitmap::numGlyphs);
- }
+ size_t chi = glyphIndex(str[i]);
float glyphWidth = FontBitmap::glyphWidth[chi];
float glyphHeight = FontBitmap::maxGlyphHeight;
#include <signal.h>
#include <getopt.h>
#include <sys/wait.h>
+#include <assert.h>
#include "screenrecord.h"
#include "Overlay.h"
// Configure optional overlay.
sp<IGraphicBufferProducer> bufferProducer;
- sp<Overlay> overlay = new Overlay();
+ sp<Overlay> overlay;
if (gWantFrameTime) {
// Send virtual display frames to an external texture.
+ overlay = new Overlay();
err = overlay->start(encoderInputSurface, &bufferProducer);
if (err != NO_ERROR) {
encoder->release();
// Shut everything down, starting with the producer side.
encoderInputSurface = NULL;
SurfaceComposerClient::destroyDisplay(dpy);
- overlay->stop();
+ if (overlay != NULL) {
+ overlay->stop();
+ }
encoder->stop();
// If we don't stop muxer explicitly, i.e. let the destructor run,
// it may hang (b/11050628).