08d7778f08
Movie class doesn't have finalize method. So memory leak of SkMovie class of native Skia occurs when Movie class is released. I add finalize method to Movie class (Movie.java) and jni destructor method to SkMovie class (Movie.cpp). Change-Id: I4dae9dd95f128cbfade50bef978b219ba99321dd
86 lines
2.4 KiB
Java
86 lines
2.4 KiB
Java
/*
|
|
* Copyright (C) 2006 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package android.graphics;
|
|
|
|
import java.io.InputStream;
|
|
import java.io.FileInputStream;
|
|
|
|
public class Movie {
|
|
private final int mNativeMovie;
|
|
|
|
private Movie(int nativeMovie) {
|
|
if (nativeMovie == 0) {
|
|
throw new RuntimeException("native movie creation failed");
|
|
}
|
|
mNativeMovie = nativeMovie;
|
|
}
|
|
|
|
public native int width();
|
|
public native int height();
|
|
public native boolean isOpaque();
|
|
public native int duration();
|
|
|
|
public native boolean setTime(int relativeMilliseconds);
|
|
|
|
public native void draw(Canvas canvas, float x, float y, Paint paint);
|
|
|
|
public void draw(Canvas canvas, float x, float y) {
|
|
draw(canvas, x, y, null);
|
|
}
|
|
|
|
public static native Movie decodeStream(InputStream is);
|
|
public static native Movie decodeByteArray(byte[] data, int offset,
|
|
int length);
|
|
|
|
private static native void nativeDestructor(int nativeMovie);
|
|
|
|
public static Movie decodeFile(String pathName) {
|
|
InputStream is;
|
|
try {
|
|
is = new FileInputStream(pathName);
|
|
}
|
|
catch (java.io.FileNotFoundException e) {
|
|
return null;
|
|
}
|
|
return decodeTempStream(is);
|
|
}
|
|
|
|
@Override
|
|
protected void finalize() throws Throwable {
|
|
try {
|
|
nativeDestructor(mNativeMovie);
|
|
} finally {
|
|
super.finalize();
|
|
}
|
|
}
|
|
|
|
private static Movie decodeTempStream(InputStream is) {
|
|
Movie moov = null;
|
|
try {
|
|
moov = decodeStream(is);
|
|
is.close();
|
|
}
|
|
catch (java.io.IOException e) {
|
|
/* do nothing.
|
|
If the exception happened on open, moov will be null.
|
|
If it happened on close, moov is still valid.
|
|
*/
|
|
}
|
|
return moov;
|
|
}
|
|
}
|