Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make some minor improvements to MediaFormat" into rvc-dev am: 7c33cc554d

Browse Source 
Change-Id: Ib7682c69f594209a57d64c573af9e9e25315d8bf
This commit is contained in:
TreeHugger Robot
2020-04-21 10:54:05 +00:00
committed by Automerger Merge Worker
parent 755ddabf36 7c33cc554d
commit 9f8f7a2a59
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
media/java/android/media/MediaFormat.java
View File

@@ -1312,7 +1312,7 @@ public final class MediaFormat {
} }
/** /**
* Returns the value of an long key, or the default value if the key is missing. * Returns the value of a long key, or the default value if the key is missing.
* *
* @return defaultValue if the key does not exist or the stored value for the key is null * @return defaultValue if the key does not exist or the stored value for the key is null
* @throws ClassCastException if the stored value for the key is int, float, ByteBuffer or * @throws ClassCastException if the stored value for the key is int, float, ByteBuffer or
@@ -1340,19 +1340,15 @@ public final class MediaFormat {
} }
/** /**
* Returns the value of an float key, or the default value if the key is missing. * Returns the value of a float key, or the default value if the key is missing.
* *
* @return defaultValue if the key does not exist or the stored value for the key is null * @return defaultValue if the key does not exist or the stored value for the key is null
* @throws ClassCastException if the stored value for the key is int, long, ByteBuffer or * @throws ClassCastException if the stored value for the key is int, long, ByteBuffer or
* String * String
*/ */
public final float getFloat(@NonNull String name, float defaultValue) { public final float getFloat(@NonNull String name, float defaultValue) {
try { Object value = mMap.get(name);
return getFloat(name); return value != null ? (float) value : defaultValue;
} catch (NullPointerException e) {
/* no such field or field is null */
return defaultValue;
}
} }
/** /**
@@ -1366,7 +1362,7 @@ public final class MediaFormat {
} }
/** /**
* Returns the value of an string key, or the default value if the key is missing. * Returns the value of a string key, or the default value if the key is missing.
* *
* @return defaultValue if the key does not exist or the stored value for the key is null * @return defaultValue if the key does not exist or the stored value for the key is null
* @throws ClassCastException if the stored value for the key is int, long, float or ByteBuffer * @throws ClassCastException if the stored value for the key is int, long, float or ByteBuffer