Merge "Add inPreferQualityOverSpeed into BitmapFactory.Options." (b9e56bb3) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/BitmapFactory.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ jfieldID gOptions_ditherFieldID;
		jfieldID gOptions_purgeableFieldID;
		jfieldID gOptions_shareableFieldID;
		jfieldID gOptions_nativeAllocFieldID;
		jfieldID gOptions_preferQualityOverSpeedFieldID;
		jfieldID gOptions_widthFieldID;
		jfieldID gOptions_heightFieldID;
		jfieldID gOptions_mimeFieldID;
		@@ -185,6 +186,7 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding,
		bool isPurgeable = forcePurgeable \|\|
		(allowPurgeable && optionsPurgeable(env, options));
		bool reportSizeToVM = optionsReportSizeToVM(env, options);
		bool preferQualityOverSpeed = false;

		if (NULL != options) {
		sampleSize = env->GetIntField(options, gOptions_sampleSizeFieldID);
		@@ -199,6 +201,8 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding,
		jobject jconfig = env->GetObjectField(options, gOptions_configFieldID);
		prefConfig = GraphicsJNI::getNativeBitmapConfig(env, jconfig);
		doDither = env->GetBooleanField(options, gOptions_ditherFieldID);
		preferQualityOverSpeed = env->GetBooleanField(options,
		gOptions_preferQualityOverSpeedFieldID);
		}

		SkImageDecoder* decoder = SkImageDecoder::Factory(stream);
		@@ -208,6 +212,7 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding,

		decoder->setSampleSize(sampleSize);
		decoder->setDitherImage(doDither);
		decoder->setPreferQualityOverSpeed(preferQualityOverSpeed);

		NinePatchPeeker peeker(decoder);
		JavaPixelAllocator javaAllocator(env, reportSizeToVM);
		@@ -557,6 +562,8 @@ int register_android_graphics_BitmapFactory(JNIEnv* env) {
		gOptions_purgeableFieldID = getFieldIDCheck(env, gOptions_class, "inPurgeable", "Z");
		gOptions_shareableFieldID = getFieldIDCheck(env, gOptions_class, "inInputShareable", "Z");
		gOptions_nativeAllocFieldID = getFieldIDCheck(env, gOptions_class, "inNativeAlloc", "Z");
		gOptions_preferQualityOverSpeedFieldID = getFieldIDCheck(env, gOptions_class,
		"inPreferQualityOverSpeed", "Z");
		gOptions_widthFieldID = getFieldIDCheck(env, gOptions_class, "outWidth", "I");
		gOptions_heightFieldID = getFieldIDCheck(env, gOptions_class, "outHeight", "I");
		gOptions_mimeFieldID = getFieldIDCheck(env, gOptions_class, "outMimeType", "Ljava/lang/String;");

core/jni/android/graphics/BitmapFactory.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ extern jfieldID gOptions_ditherFieldID;
		extern jfieldID gOptions_purgeableFieldID;
		extern jfieldID gOptions_shareableFieldID;
		extern jfieldID gOptions_nativeAllocFieldID;
		extern jfieldID gOptions_preferQualityOverSpeedFieldID;
		extern jfieldID gOptions_widthFieldID;
		extern jfieldID gOptions_heightFieldID;
		extern jfieldID gOptions_mimeFieldID;

core/jni/android/graphics/BitmapRegionDecoder.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,7 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, SkBitmapRegionDecoder *b
		int sampleSize = 1;
		SkBitmap::Config prefConfig = SkBitmap::kNo_Config;
		bool doDither = true;
		bool preferQualityOverSpeed = false;

		if (NULL != options) {
		sampleSize = env->GetIntField(options, gOptions_sampleSizeFieldID);
		@@ -202,9 +203,12 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, SkBitmapRegionDecoder *b
		jobject jconfig = env->GetObjectField(options, gOptions_configFieldID);
		prefConfig = GraphicsJNI::getNativeBitmapConfig(env, jconfig);
		doDither = env->GetBooleanField(options, gOptions_ditherFieldID);
		preferQualityOverSpeed = env->GetBooleanField(options,
		gOptions_preferQualityOverSpeedFieldID);
		}

		decoder->setDitherImage(doDither);
		decoder->setPreferQualityOverSpeed(preferQualityOverSpeed);
		SkBitmap* bitmap = new SkBitmap;
		SkAutoTDelete<SkBitmap> adb(bitmap);
		AutoDecoderCancel adc(options, decoder);

graphics/java/android/graphics/BitmapFactory.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -204,11 +204,22 @@ public class BitmapFactory {
		*/
		public boolean inNativeAlloc;

		/**
		* If inPreferQualityOverSpeed is set to true, the decoder will try to
		* decode the reconstructed image to a higher quality even at the
		* expense of the decoding speed. Currently the field only affects JPEG
		* decode, in the case of which a more accurate, but slightly slower,
		* IDCT method will be used instead.
		* @hide
		*/
		public boolean inPreferQualityOverSpeed;

		/**
		* The resulting width of the bitmap, set independent of the state of
		* inJustDecodeBounds. However, if there is an error trying to decode,
		* outWidth will be set to -1.
		*/

		public int outWidth;

		/**