Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95192577 authored Jan 25, 2018 by Chong Zhang Committed by Android (Google) Code Review Jan 25, 2018

Merge "MediaCodec: expose constant quality mode"

parents 1ccf7254 88833299

api/current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23115,6 +23115,7 @@ package android.media {

	public static final class MediaCodecInfo.EncoderCapabilities {		public static final class MediaCodecInfo.EncoderCapabilities {
	method public android.util.Range<java.lang.Integer> getComplexityRange();		method public android.util.Range<java.lang.Integer> getComplexityRange();
			method public android.util.Range<java.lang.Integer> getQualityRange();
	method public boolean isBitrateModeSupported(int);		method public boolean isBitrateModeSupported(int);
	field public static final int BITRATE_MODE_CBR = 2; // 0x2		field public static final int BITRATE_MODE_CBR = 2; // 0x2
	field public static final int BITRATE_MODE_CQ = 0; // 0x0		field public static final int BITRATE_MODE_CQ = 0; // 0x0
	@@ -23457,6 +23458,7 @@ package android.media {
	field public static final java.lang.String KEY_PRIORITY = "priority";		field public static final java.lang.String KEY_PRIORITY = "priority";
	field public static final java.lang.String KEY_PROFILE = "profile";		field public static final java.lang.String KEY_PROFILE = "profile";
	field public static final java.lang.String KEY_PUSH_BLANK_BUFFERS_ON_STOP = "push-blank-buffers-on-shutdown";		field public static final java.lang.String KEY_PUSH_BLANK_BUFFERS_ON_STOP = "push-blank-buffers-on-shutdown";
			field public static final java.lang.String KEY_QUALITY = "quality";
	field public static final java.lang.String KEY_REPEAT_PREVIOUS_FRAME_AFTER = "repeat-previous-frame-after";		field public static final java.lang.String KEY_REPEAT_PREVIOUS_FRAME_AFTER = "repeat-previous-frame-after";
	field public static final java.lang.String KEY_ROTATION = "rotation-degrees";		field public static final java.lang.String KEY_ROTATION = "rotation-degrees";
	field public static final java.lang.String KEY_SAMPLE_RATE = "sample-rate";		field public static final java.lang.String KEY_SAMPLE_RATE = "sample-rate";

media/java/android/media/MediaCodecInfo.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2639,7 +2639,8 @@ public final class MediaCodecInfo {
	/**		/**
	* Returns the supported range of quality values.		* Returns the supported range of quality values.
	*		*
	* @hide		* Quality is implementation-specific. As a general rule, a higher quality
			* setting results in a better image quality and a lower compression ratio.
	*/		*/
	public Range<Integer> getQualityRange() {		public Range<Integer> getQualityRange() {
	return mQualityRange;		return mQualityRange;
	@@ -2751,7 +2752,7 @@ public final class MediaCodecInfo {
	}		}
	if (info.containsKey("feature-bitrate-modes")) {		if (info.containsKey("feature-bitrate-modes")) {
	for (String mode: info.getString("feature-bitrate-modes").split(",")) {		for (String mode: info.getString("feature-bitrate-modes").split(",")) {
	mBitControl \|= parseBitrateMode(mode);		mBitControl \|= (1 << parseBitrateMode(mode));
	}		}
	}		}

media/java/android/media/MediaFormat.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -601,8 +601,6 @@ public final class MediaFormat {
	* codec specific, but lower values generally result in more efficient		* codec specific, but lower values generally result in more efficient
	* (smaller-sized) encoding.		* (smaller-sized) encoding.
	*		*
	* @hide
	*
	* @see MediaCodecInfo.EncoderCapabilities#getQualityRange()		* @see MediaCodecInfo.EncoderCapabilities#getQualityRange()
	*/		*/
	public static final String KEY_QUALITY = "quality";		public static final String KEY_QUALITY = "quality";