Merge "Adding APIs to render PDF documents." (dbef65f1) · Commits · e / os / android_frameworks_base

api/current.txt

+19 −0

Original line number	Diff line number	Diff line
		@@ -10117,6 +10117,7 @@ package android.graphics {
		ctor public Matrix(android.graphics.Matrix);
		method public void getValues(float[]);
		method public boolean invert(android.graphics.Matrix);
		method public boolean isAffine();
		method public boolean isIdentity();
		method public void mapPoints(float[], int, float[], int, int);
		method public void mapPoints(float[], float[]);
		@@ -11356,6 +11357,24 @@ package android.graphics.pdf {
		method public android.graphics.pdf.PdfDocument.PageInfo.Builder setContentRect(android.graphics.Rect);
		}

		public final class PdfRenderer implements java.lang.AutoCloseable {
		ctor public PdfRenderer(android.os.ParcelFileDescriptor) throws java.io.IOException;
		method public void close();
		method public void closePage(android.graphics.pdf.PdfRenderer.Page);
		method public int getPageCount();
		method public android.graphics.pdf.PdfRenderer.Page openPage(int);
		method public boolean shouldScaleForPrinting();
		}

		public final class PdfRenderer.Page {
		method public int getHeight();
		method public int getIndex();
		method public int getWidth();
		method public void render(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Matrix, int);
		field public static final int RENDER_MODE_FOR_DISPLAY = 1; // 0x1
		field public static final int RENDER_MODE_FOR_PRINT = 2; // 0x2
		}

		}

		package android.hardware {

core/jni/Android.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ LOCAL_CFLAGS += -DHAVE_CONFIG_H -DKHTML_NO_EXCEPTIONS -DGKWQ_NO_JAVA
		LOCAL_CFLAGS += -DNO_SUPPORT_JS_BINDING -DQT_NO_WHEELEVENT -DKHTML_NO_XBL
		LOCAL_CFLAGS += -U__APPLE__
		LOCAL_CFLAGS += -Wno-unused-parameter -Wno-int-to-pointer-cast
		LOCAL_CFLAGS += -Wno-non-virtual-dtor
		LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses
		LOCAL_CPPFLAGS += -Wno-conversion-null

		@@ -125,6 +126,7 @@ LOCAL_SRC_FILES:= \
		android/graphics/Xfermode.cpp \
		android/graphics/YuvToJpegEncoder.cpp \
		android/graphics/pdf/PdfDocument.cpp \
		android/graphics/pdf/PdfRenderer.cpp \
		android_media_AudioRecord.cpp \
		android_media_AudioSystem.cpp \
		android_media_AudioTrack.cpp \
		@@ -169,6 +171,9 @@ LOCAL_C_INCLUDES += \
		$(call include-path-for, libhardware_legacy)/hardware_legacy \
		$(TOP)/frameworks/av/include \
		$(TOP)/system/media/camera/include \
		external/pdfrenderer/core/include/fpdfapi \
		external/pdfrenderer/core/include/fpdfdoc \
		external/pdfrenderer/fpdfsdk/include \
		external/skia/src/core \
		external/skia/src/effects \
		external/skia/src/images \
		@@ -222,6 +227,7 @@ LOCAL_SHARED_LIBRARIES := \
		libharfbuzz_ng \
		libz \
		libaudioutils \
		libpdfrenderer \

		ifeq ($(USE_OPENGL_RENDERER),true)
		LOCAL_SHARED_LIBRARIES += libhwui

core/jni/AndroidRuntime.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,7 @@ extern int register_android_graphics_Region(JNIEnv* env);
		extern int register_android_graphics_SurfaceTexture(JNIEnv* env);
		extern int register_android_graphics_Xfermode(JNIEnv* env);
		extern int register_android_graphics_pdf_PdfDocument(JNIEnv* env);
		extern int register_android_graphics_pdf_PdfRenderer(JNIEnv* env);
		extern int register_android_view_DisplayEventReceiver(JNIEnv* env);
		extern int register_android_view_RenderNode(JNIEnv* env);
		extern int register_android_view_RenderNodeAnimator(JNIEnv* env);
		@@ -1258,6 +1259,7 @@ static const RegJNIRec gRegJNI[] = {
		REG_JNI(register_android_graphics_Xfermode),
		REG_JNI(register_android_graphics_YuvImage),
		REG_JNI(register_android_graphics_pdf_PdfDocument),
		REG_JNI(register_android_graphics_pdf_PdfRenderer),

		REG_JNI(register_android_database_CursorWindow),
		REG_JNI(register_android_database_SQLiteConnection),

core/jni/android/graphics/Matrix.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -50,10 +50,17 @@ public:
		SkMatrix* obj = reinterpret_cast<SkMatrix*>(objHandle);
		return obj->isIdentity() ? JNI_TRUE : JNI_FALSE;
		}

		static jboolean isAffine(JNIEnv* env, jobject clazz, jlong objHandle) {
		SkMatrix* obj = reinterpret_cast<SkMatrix*>(objHandle);
		return obj->asAffine(NULL) ? JNI_TRUE : JNI_FALSE;
		}

		static jboolean rectStaysRect(JNIEnv* env, jobject clazz, jlong objHandle) {
		SkMatrix* obj = reinterpret_cast<SkMatrix*>(objHandle);
		return obj->rectStaysRect() ? JNI_TRUE : JNI_FALSE;
		}

		static void reset(JNIEnv* env, jobject clazz, jlong objHandle) {
		SkMatrix* obj = reinterpret_cast<SkMatrix*>(objHandle);
		obj->reset();
		@@ -302,6 +309,7 @@ static JNINativeMethod methods[] = {
		{"finalizer", "(J)V", (void*) SkMatrixGlue::finalizer},
		{"native_create","(J)J", (void*) SkMatrixGlue::create},
		{"native_isIdentity","(J)Z", (void*) SkMatrixGlue::isIdentity},
		{"native_isAffine","(J)Z", (void*) SkMatrixGlue::isAffine},
		{"native_rectStaysRect","(J)Z", (void*) SkMatrixGlue::rectStaysRect},
		{"native_reset","(J)V", (void*) SkMatrixGlue::reset},
		{"native_set","(JJ)V", (void*) SkMatrixGlue::set},

core/jni/android/graphics/pdf/PdfRenderer.cpp

0 → 100644

+279 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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.
		*/

		#include "jni.h"
		#include "JNIHelp.h"
		#include "GraphicsJNI.h"
		#include "SkBitmap.h"
		#include "SkMatrix.h"
		#include "fpdfview.h"
		#include "fsdk_rendercontext.h"

		#include <android_runtime/AndroidRuntime.h>
		#include <vector>
		#include <utils/Log.h>
		#include <unistd.h>
		#include <sys/types.h>
		#include <unistd.h>

		namespace android {

		static const int RENDER_MODE_FOR_DISPLAY = 1;
		static const int RENDER_MODE_FOR_PRINT = 2;

		static struct {
		jfieldID x;
		jfieldID y;
		} gPointClassInfo;

		static Mutex sLock;

		static int sUnmatchedInitRequestCount = 0;

		static void initializeLibraryIfNeeded() {
		Mutex::Autolock _l(sLock);
		if (sUnmatchedInitRequestCount == 0) {
		FPDF_InitLibrary(NULL);
		}
		sUnmatchedInitRequestCount++;
		}

		static void destroyLibraryIfNeeded() {
		Mutex::Autolock _l(sLock);
		sUnmatchedInitRequestCount--;
		if (sUnmatchedInitRequestCount == 0) {
		FPDF_DestroyLibrary();
		}
		}

		static int getBlock(void* param, unsigned long position, unsigned char* outBuffer,
		unsigned long size) {
		const int fd = reinterpret_cast<intptr_t>(param);
		const int readCount = pread(fd, outBuffer, size, position);
		if (readCount < 0) {
		ALOGE("Cannot read from file descriptor. Error:%d", errno);
		return 0;
		}
		return 1;
		}

		static jlong nativeCreate(JNIEnv* env, jclass thiz, jint fd, jlong size) {
		initializeLibraryIfNeeded();

		FPDF_FILEACCESS loader;
		loader.m_FileLen = size;
		loader.m_Param = reinterpret_cast<void*>(intptr_t(fd));
		loader.m_GetBlock = &getBlock;

		FPDF_DOCUMENT document = FPDF_LoadCustomDocument(&loader, NULL);

		if (!document) {
		const long error = FPDF_GetLastError();
		jniThrowException(env, "java/io/IOException",
		"cannot create document. Error:" + error);
		destroyLibraryIfNeeded();
		return -1;
		}

		return reinterpret_cast<jlong>(document);
		}

		static jlong nativeOpenPageAndGetSize(JNIEnv* env, jclass thiz, jlong documentPtr,
		jint pageIndex, jobject outSize) {
		FPDF_DOCUMENT document = reinterpret_cast<FPDF_DOCUMENT>(documentPtr);

		FPDF_PAGE page = FPDF_LoadPage(document, pageIndex);

		if (!page) {
		jniThrowException(env, "java/lang/IllegalStateException",
		"cannot load page");
		return -1;
		}

		double width = 0;
		double height = 0;

		const int result = FPDF_GetPageSizeByIndex(document, pageIndex, &width, &height);

		if (!result) {
		jniThrowException(env, "java/lang/IllegalStateException",
		"cannot get page size");
		return -1;
		}

		env->SetIntField(outSize, gPointClassInfo.x, width);
		env->SetIntField(outSize, gPointClassInfo.y, height);

		return reinterpret_cast<jlong>(page);
		}

		static void nativeClosePage(JNIEnv* env, jclass thiz, jlong pagePtr) {
		FPDF_PAGE page = reinterpret_cast<FPDF_PAGE>(pagePtr);
		FPDF_ClosePage(page);
		}

		static void nativeClose(JNIEnv* env, jclass thiz, jlong documentPtr) {
		FPDF_DOCUMENT document = reinterpret_cast<FPDF_DOCUMENT>(documentPtr);
		FPDF_CloseDocument(document);
		destroyLibraryIfNeeded();
		}

		static jint nativeGetPageCount(JNIEnv* env, jclass thiz, jlong documentPtr) {
		FPDF_DOCUMENT document = reinterpret_cast<FPDF_DOCUMENT>(documentPtr);
		return FPDF_GetPageCount(document);
		}

		static jboolean nativeScaleForPrinting(JNIEnv* env, jclass thiz, jlong documentPtr) {
		FPDF_DOCUMENT document = reinterpret_cast<FPDF_DOCUMENT>(documentPtr);
		return FPDF_VIEWERREF_GetPrintScaling(document);
		}

		static void DropContext(void* data) {
		delete (CRenderContext*) data;
		}

		static void renderPageBitmap(FPDF_BITMAP bitmap, FPDF_PAGE page, int destLeft, int destTop,
		int destRight, int destBottom, SkMatrix* transform, int flags) {
		// Note: this code ignores the currently unused RENDER_NO_NATIVETEXT,
		// FPDF_RENDER_LIMITEDIMAGECACHE, FPDF_RENDER_FORCEHALFTONE, FPDF_GRAYSCALE,
		// and FPDF_ANNOT flags. To add support for that refer to FPDF_RenderPage_Retail
		// in fpdfview.cpp

		CRenderContext* pContext = FX_NEW CRenderContext;

		CPDF_Page* pPage = (CPDF_Page*) page;
		pPage->SetPrivateData((void*) 1, pContext, DropContext);

		CFX_FxgeDevice* fxgeDevice = FX_NEW CFX_FxgeDevice;
		pContext->m_pDevice = fxgeDevice;

		// Reverse the bytes (last argument TRUE) since the Android
		// format is ARGB while the renderer uses BGRA internally.
		fxgeDevice->Attach((CFX_DIBitmap*) bitmap, 0, TRUE);

		CPDF_RenderOptions* renderOptions = pContext->m_pOptions;

		if (!renderOptions) {
		renderOptions = FX_NEW CPDF_RenderOptions;
		pContext->m_pOptions = renderOptions;
		}

		if (flags & FPDF_LCD_TEXT) {
		renderOptions->m_Flags \|= RENDER_CLEARTYPE;
		} else {
		renderOptions->m_Flags &= ~RENDER_CLEARTYPE;
		}

		const CPDF_OCContext::UsageType usage = (flags & FPDF_PRINTING)
		? CPDF_OCContext::Print : CPDF_OCContext::View;

		renderOptions->m_AddFlags = flags >> 8;
		renderOptions->m_pOCContext = new CPDF_OCContext(pPage->m_pDocument, usage);

		fxgeDevice->SaveState();

		FX_RECT clip;
		clip.left = destLeft;
		clip.right = destRight;
		clip.top = destTop;
		clip.bottom = destBottom;
		fxgeDevice->SetClip_Rect(&clip);

		CPDF_RenderContext* pageContext = FX_NEW CPDF_RenderContext;
		pContext->m_pContext = pageContext;
		pageContext->Create(pPage);

		CFX_AffineMatrix matrix;
		if (!transform) {
		pPage->GetDisplayMatrix(matrix, destLeft, destTop, destRight - destLeft,
		destBottom - destTop, 0);
		} else {
		// PDF's coordinate system origin is left-bottom while
		// in graphics it is the top-left, so remap the origin.
		matrix.Set(1, 0, 0, -1, 0, pPage->GetPageHeight());
		matrix.Scale(transform->getScaleX(), transform->getScaleY());
		matrix.Rotate(transform->getSkewX(), transform->getSkewY());
		matrix.Translate(transform->getTranslateX(), transform->getTranslateY());
		}
		pageContext->AppendObjectList(pPage, &matrix);

		pContext->m_pRenderer = FX_NEW CPDF_ProgressiveRenderer;
		pContext->m_pRenderer->Start(pageContext, fxgeDevice, renderOptions, NULL);

		fxgeDevice->RestoreState();

		pPage->RemovePrivateData((void*) 1);

		delete pContext;
		}

		static void nativeRenderPage(JNIEnv* env, jclass thiz, jlong documentPtr, jlong pagePtr,
		jlong bitmapPtr, jint destLeft, jint destTop, jint destRight, jint destBottom,
		jlong matrixPtr, jint renderMode) {

		FPDF_DOCUMENT document = reinterpret_cast<FPDF_DOCUMENT>(documentPtr);
		FPDF_PAGE page = reinterpret_cast<FPDF_PAGE>(pagePtr);
		SkBitmap* skBitmap = reinterpret_cast<SkBitmap*>(bitmapPtr);
		SkMatrix* skMatrix = reinterpret_cast<SkMatrix*>(matrixPtr);

		skBitmap->lockPixels();

		const int stride = skBitmap->width() * 4;

		FPDF_BITMAP bitmap = FPDFBitmap_CreateEx(skBitmap->width(), skBitmap->height(),
		FPDFBitmap_BGRA, skBitmap->getPixels(), stride);

		if (!bitmap) {
		ALOGE("Erorr creating bitmap");
		return;
		}

		int renderFlags = 0;
		if (renderMode == RENDER_MODE_FOR_DISPLAY) {
		renderFlags \|= FPDF_LCD_TEXT;
		} else if (renderMode == RENDER_MODE_FOR_PRINT) {
		renderFlags \|= FPDF_PRINTING;
		}

		renderPageBitmap(bitmap, page, destLeft, destTop, destRight,
		destBottom, skMatrix, renderFlags);

		skBitmap->unlockPixels();
		}

		static JNINativeMethod gPdfRenderer_Methods[] = {
		{"nativeCreate", "(IJ)J", (void*) nativeCreate},
		{"nativeClose", "(J)V", (void*) nativeClose},
		{"nativeGetPageCount", "(J)I", (void*) nativeGetPageCount},
		{"nativeScaleForPrinting", "(J)Z", (void*) nativeScaleForPrinting},
		{"nativeRenderPage", "(JJJIIIIJI)V", (void*) nativeRenderPage},
		{"nativeOpenPageAndGetSize", "(JILandroid/graphics/Point;)J", (void*) nativeOpenPageAndGetSize},
		{"nativeClosePage", "(J)V", (void*) nativeClosePage}
		};

		int register_android_graphics_pdf_PdfRenderer(JNIEnv* env) {
		int result = android::AndroidRuntime::registerNativeMethods(
		env, "android/graphics/pdf/PdfRenderer", gPdfRenderer_Methods,
		NELEM(gPdfRenderer_Methods));

		jclass clazz = env->FindClass("android/graphics/Point");
		gPointClassInfo.x = env->GetFieldID(clazz, "x", "I");
		gPointClassInfo.y = env->GetFieldID(clazz, "y", "I");

		return result;
		};

		};