Skip to content

Commit

Permalink
Fixed lots of little bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnnylambada
johnnylambada committed Apr 13, 2012
1 parent 143c118 commit f79b3d6
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 31 deletions.
97 changes: 82 additions & 15 deletions src/com/sigseg/android/worldmap/Scene.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@

import java.io.IOException;
import java.io.InputStream;
import java.lang.ref.WeakReference;

import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.graphics.BitmapFactory;
import android.graphics.BitmapRegionDecoder;
import android.graphics.Canvas;
import android.graphics.Matrix;
import android.graphics.Point;
import android.graphics.Rect;
import android.util.Log;
Expand Down Expand Up @@ -110,19 +108,35 @@ void draw(Canvas c){
}
}

/**
* The CahceThread's job is to wait until the cahce.state is START_UPDATE and then
* update the cache given the current viewport origin. It does not want to hold
* the cache lock during the call to cache.decoder.decodeRegion because the call
* can take over 1 second. If we hold the lock, the user experience is very
* jumpy.
*/
class CacheThread extends Thread {
final Cache cache;
private boolean running = false;
public void setRunning(boolean value){
running = value;
}

CacheThread(Cache cache){
this.cache = cache;
}
@Override
public void run() {
running=true;
Rect viewportRect = new Rect(0,0,0,0);
while(true){
while(running){
while(cache.state!=CacheState.START_UPDATE)
try {
Thread.sleep(10);
Thread.sleep(5);
if (!running)
return;
} catch (InterruptedException e) {}
long start = System.currentTimeMillis();
boolean cont = false;
synchronized (cache) {
if (cache.state==CacheState.START_UPDATE){
Expand All @@ -136,25 +150,54 @@ public void run() {
viewportRect.set(viewport.origin);
}
cache.setOriginRect(viewportRect);
Bitmap bitmap = cache.decoder.decodeRegion( cache.origin, cache.options );
cache.bitmapRef = new WeakReference<Bitmap>(bitmap);
cache.state = CacheState.READY;
try{
Bitmap bitmap = cache.decoder.decodeRegion( cache.origin, cache.options );
cache.bitmapRef = new NotWeakReference<Bitmap>(bitmap);
cache.state = CacheState.READY;
long done = System.currentTimeMillis();
if (DEBUG) Log.d(TAG,String.format("decoderegion in %dms",done-start));
} catch (OutOfMemoryError e){
if (cache.percent>0)
cache.percent -= 1;
cache.state = CacheState.START_UPDATE;
Log.e(TAG,String.format("caught oom -- cache now at %d percent.",cache.percent));
}
}
}
}
}

/**
* Substitute for WeakReference<T> that is not weak.
* @param <T>
*/
class NotWeakReference<T> {
T referent;
public NotWeakReference(T referent) {
this.referent = referent;
}
public T get(){
return referent;
}
}

/**
* Keep track of the cached bitmap
*/
class Cache {
/** What percent of total memory should we use for the cache? */
final int percent = 25; // Above this and we get OOMs
/** What percent of total memory should we use for the cache? The bigger the cache,
* the longer it takes to read -- 1.2 secs for 25%, 600ms for 10%, 500ms for 5%.
* User experience seems to be best for smaller values.
*/
int percent = 5; // Above 25 and we get OOMs
/** What is the downsample size for the sample image? */
final int downShift = 3;
/** A Rect that defines where the Cache is within the scene */
/** A Rect that defines where the Cache is within the scene 1=1/2, 2=1/4 3=1/8, etc */
final Rect origin = new Rect(0,0,0,0);
/** Used to calculate the Rect within the cache to copy from for the Viewport */
final Rect srcRect = new Rect(0,0,0,0);
/** The bitmap of the current cache */
WeakReference<Bitmap> bitmapRef = null;
NotWeakReference<Bitmap> bitmapRef = null;
CacheState state = CacheState.UNINITIALIZED;

/** Our load from disk thread */
Expand Down Expand Up @@ -188,15 +231,31 @@ public Point setFile(Context context, String assetName) throws IOException {
tmpOptions.inSampleSize = (1<<downShift);
sampleBitmap = BitmapFactory.decodeStream(is, null, tmpOptions);

// Create and start the thread
cacheThread = new CacheThread(this);
cacheThread.start();

state = CacheState.INITIALIZED;
}
return sceneDimensions;
}

public void start(){
cacheThread = new CacheThread(this);
cacheThread.setName("cacheThread");
cacheThread.start();
}

public void stop(){
cacheThread.running = false;
boolean retry = true;
while (retry) {
try {
cacheThread.join();
retry = false;
} catch (InterruptedException e) {
// we will try it again and again...
}
}
cacheThread = null;
}

/** Fill the bitmap with the part of the scene referenced by the viewport Rect */
void update(Viewport viewport){
boolean loadSample = true;
Expand Down Expand Up @@ -381,6 +440,14 @@ public Point getOrigin(){
return p;
}

public void start(){
cache.start();
}

public void stop(){
cache.stop();
}

/** Set the Origin */
public void setOrigin(int x, int y){
viewport.setOrigin(x, y);
Expand Down
30 changes: 14 additions & 16 deletions src/com/sigseg/android/worldmap/WorldView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import java.io.IOException;

import com.sigseg.android.worldmap.Scene.Viewport;

import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Point;
Expand All @@ -17,7 +15,7 @@ public class WorldView extends SurfaceView implements SurfaceHolder.Callback{
private final static String TAG = "WorldView";
private final boolean DEBUG = true;

private long startTime=0;
// private long startTime=0;
private final Scene scene = new Scene();
private final Touch touch = new Touch();
private DrawThread drawThread;
Expand Down Expand Up @@ -103,14 +101,14 @@ protected void onDraw(Canvas canvas) {

// draw it
scene.draw(canvas);
if (DEBUG){
long now = System.currentTimeMillis();
double n = ((double)now)/1000L;
double s = ((double)startTime)/1000L;
double fps = 1L/(n-s);
// if (DEBUG){
// long now = System.currentTimeMillis();
// double n = ((double)now)/1000L;
// double s = ((double)startTime)/1000L;
// double fps = 1L/(n-s);
// Log.d(TAG,String.format("msec=%d FPS=%.2f",now-startTime,fps));
startTime = System.currentTimeMillis();
}
// startTime = System.currentTimeMillis();
// }
}

@Override
Expand Down Expand Up @@ -141,15 +139,17 @@ public void surfaceChanged(SurfaceHolder holder, int format, int width, int heig
@Override
public void surfaceCreated(SurfaceHolder holder) {
drawThread = new DrawThread(holder);
drawThread.setName("drawThread");
drawThread.setRunning(true);
drawThread.start();

scene.start();
}

@Override
public void surfaceDestroyed(SurfaceHolder holder) {
boolean retry = true;
scene.stop();
drawThread.setRunning(false);
boolean retry = true;
while (retry) {
try {
drawThread.join();
Expand All @@ -162,16 +162,14 @@ public void surfaceDestroyed(SurfaceHolder holder) {

class DrawThread extends Thread {
private SurfaceHolder surfaceHolder;

private boolean running = false;
public void setRunning(boolean value){ running = value; }

public DrawThread(SurfaceHolder surfaceHolder){
this.surfaceHolder = surfaceHolder;
}

public void setRunning(boolean value){
running = value;
}

@Override
public void run() {
Canvas c;
Expand Down

0 comments on commit f79b3d6

Please sign in to comment.