summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2012-03-22 23:00:53 +0100
committerThomas Martitz <kugel@rockbox.org>2012-03-22 23:26:50 +0100
commit901521d6de795fe12a6f720cb158950c0d3d51d4 (patch)
treeac7c7f0753e3ea2b6ae12a5fc150cbf2c921f1a1
parent6e6f0c6ef35cebc2ca199ca01f12598ad0209c1c (diff)
downloadrockbox-901521d6de795fe12a6f720cb158950c0d3d51d4.tar.gz
rockbox-901521d6de795fe12a6f720cb158950c0d3d51d4.tar.bz2
rockbox-901521d6de795fe12a6f720cb158950c0d3d51d4.zip
android: lcd_update/_rect() changes
* rename some java methods (to update(), initialize()) * re-create the ByteBuffer object from the framebuffer on every update. This is needed now since 2c71aa9 added the possiblity for lcd_framebuffer to change. * do so, along with the creation of the dirty Rect object, in native code. Change-Id: Id39ea8e4b6148987c5f216a87e0ff3c8e7babe92
-rw-r--r--android/src/org/rockbox/RockboxFramebuffer.java19
-rw-r--r--firmware/target/hosted/android/lcd-android.c52
2 files changed, 42 insertions, 29 deletions
diff --git a/android/src/org/rockbox/RockboxFramebuffer.java b/android/src/org/rockbox/RockboxFramebuffer.java
index 66e5991a3e..e1fb99f2a1 100644
--- a/android/src/org/rockbox/RockboxFramebuffer.java
+++ b/android/src/org/rockbox/RockboxFramebuffer.java
@@ -39,7 +39,6 @@ public class RockboxFramebuffer extends SurfaceView
{
private final DisplayMetrics metrics;
private final ViewConfiguration view_config;
- private ByteBuffer native_buf;
private Bitmap btm;
/* first stage init; needs to run from a thread that has a Looper
@@ -47,7 +46,6 @@ public class RockboxFramebuffer extends SurfaceView
public RockboxFramebuffer(Context c)
{
super(c);
-
metrics = c.getResources().getDisplayMetrics();
view_config = ViewConfiguration.get(c);
getHolder().addCallback(this);
@@ -61,18 +59,17 @@ public class RockboxFramebuffer extends SurfaceView
/* second stage init; called from Rockbox with information about the
* display framebuffer */
- private void java_lcd_init(int lcd_width, int lcd_height, ByteBuffer native_fb)
+ private void initialize(int lcd_width, int lcd_height)
{
btm = Bitmap.createBitmap(lcd_width, lcd_height, Bitmap.Config.RGB_565);
- native_buf = native_fb;
setEnabled(true);
}
- private void java_lcd_update()
+ private void update(ByteBuffer framebuffer)
{
SurfaceHolder holder = getHolder();
- Canvas c = holder.lockCanvas(null);
- btm.copyPixelsFromBuffer(native_buf);
+ Canvas c = holder.lockCanvas();
+ btm.copyPixelsFromBuffer(framebuffer);
synchronized (holder)
{ /* draw */
c.drawBitmap(btm, 0.0f, 0.0f, null);
@@ -80,14 +77,12 @@ public class RockboxFramebuffer extends SurfaceView
holder.unlockCanvasAndPost(c);
}
- private void java_lcd_update_rect(int x, int y, int width, int height)
+ private void update(ByteBuffer framebuffer, Rect dirty)
{
SurfaceHolder holder = getHolder();
- Rect dirty = new Rect(x, y, x+width, y+height);
Canvas c = holder.lockCanvas(dirty);
- /* can't copy a partial buffer,
- * but it doesn't make a noticeable difference anyway */
- btm.copyPixelsFromBuffer(native_buf);
+ /* can't copy a partial buffer, but it doesn't make a noticeable difference anyway */
+ btm.copyPixelsFromBuffer(framebuffer);
synchronized (holder)
{ /* draw */
c.drawBitmap(btm, dirty, dirty, null);
diff --git a/firmware/target/hosted/android/lcd-android.c b/firmware/target/hosted/android/lcd-android.c
index 15c844bbd6..bb0331db69 100644
--- a/firmware/target/hosted/android/lcd-android.c
+++ b/firmware/target/hosted/android/lcd-android.c
@@ -36,6 +36,9 @@ static jmethodID java_lcd_update;
static jmethodID java_lcd_update_rect;
static jmethodID java_lcd_init;
+static jclass AndroidRect_class;
+static jmethodID AndroidRect_constructor;
+
static int dpi;
static int scroll_threshold;
static bool display_on;
@@ -43,7 +46,7 @@ static bool display_on;
/* this might actually be called before lcd_init_device() or even main(), so
* be sure to only access static storage initalized at library loading,
* and not more */
-void connect_with_java(JNIEnv* env, jobject fb_instance)
+static void connect_with_java(JNIEnv* env, jobject fb_instance)
{
JNIEnv e = *env;
static bool have_class;
@@ -53,11 +56,12 @@ void connect_with_java(JNIEnv* env, jobject fb_instance)
jclass fb_class = e->GetObjectClass(env, fb_instance);
/* cache update functions */
java_lcd_update = e->GetMethodID(env, fb_class,
- "java_lcd_update",
- "()V");
+ "update",
+ "(Ljava/nio/ByteBuffer;)V");
java_lcd_update_rect = e->GetMethodID(env, fb_class,
- "java_lcd_update_rect",
- "(IIII)V");
+ "update",
+ "(Ljava/nio/ByteBuffer;"
+ "Landroid/graphics/Rect;)V");
jmethodID get_dpi = e->GetMethodID(env, fb_class,
"getDpi", "()I");
jmethodID thresh = e->GetMethodID(env, fb_class,
@@ -67,19 +71,16 @@ void connect_with_java(JNIEnv* env, jobject fb_instance)
scroll_threshold = e->CallIntMethod(env, fb_instance, thresh);
java_lcd_init = e->GetMethodID(env, fb_class,
- "java_lcd_init",
- "(IILjava/nio/ByteBuffer;)V");
-
+ "initialize", "(II)V");
+ AndroidRect_class = e->FindClass(env, "android/graphics/Rect");
+ AndroidRect_constructor = e->GetMethodID(env, AndroidRect_class,
+ "<init>", "(IIII)V");
have_class = true;
}
- /* Create native_buffer */
- jobject buffer = (*env)->NewDirectByteBuffer(env, lcd_framebuffer,
- (jlong) FRAMEBUFFER_SIZE);
-
/* we need to setup parts for the java object every time */
(*env)->CallVoidMethod(env, fb_instance, java_lcd_init,
- (jint)LCD_WIDTH, (jint)LCD_HEIGHT, buffer);
+ (jint)LCD_WIDTH, (jint)LCD_HEIGHT);
}
/*
@@ -92,15 +93,32 @@ void lcd_init_device(void)
void lcd_update(void)
{
if (display_on)
- (*env_ptr)->CallVoidMethod(env_ptr, RockboxFramebuffer_instance,
- java_lcd_update);
+ {
+ JNIEnv e = *env_ptr;
+ jobject buffer = e->NewDirectByteBuffer(env_ptr, lcd_framebuffer,
+ (jlong) FRAMEBUFFER_SIZE);
+
+ e->CallVoidMethod(env_ptr, RockboxFramebuffer_instance,
+ java_lcd_update, buffer);
+ e->DeleteLocalRef(env_ptr, buffer);
+ }
}
void lcd_update_rect(int x, int y, int width, int height)
{
if (display_on)
- (*env_ptr)->CallVoidMethod(env_ptr, RockboxFramebuffer_instance,
- java_lcd_update_rect, x, y, width, height);
+ {
+ JNIEnv e = *env_ptr;
+ jobject buffer = e->NewDirectByteBuffer(env_ptr, lcd_framebuffer,
+ (jlong) FRAMEBUFFER_SIZE);
+ jobject rect = e->NewObject(env_ptr, AndroidRect_class, AndroidRect_constructor,
+ x, y, x + width, y + height);
+ e->CallVoidMethod(env_ptr, RockboxFramebuffer_instance,
+ java_lcd_update_rect, buffer, rect);
+
+ e->DeleteLocalRef(env_ptr, buffer);
+ e->DeleteLocalRef(env_ptr, rect);
+ }
}
/*