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

Merge "AudioMetadata: Translate KEY_ATMOS_PRESENT for JNI" into rvc-dev

Browse Source
This commit is contained in:
Andy Hung
2020-05-07 03:28:15 +00:00
committed by Android (Google) Code Review
parent 09550968fb db7fd16f1f
commit 65c14feec9
1 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
media/java/android/media/AudioMetadata.java
View File

@@ -166,9 +166,24 @@ public final class AudioMetadata {
* *
* A Boolean value which is true if Atmos is present in an E-AC3 stream. * A Boolean value which is true if Atmos is present in an E-AC3 stream.
*/ */
// Since Boolean isn't handled by Parceling, we translate
// internally to KEY_HAS_ATMOS when sending through JNI.
// Consider deprecating this key for KEY_HAS_ATMOS in the future.
//
@NonNull public static final Key<Boolean> KEY_ATMOS_PRESENT = @NonNull public static final Key<Boolean> KEY_ATMOS_PRESENT =
createKey("atmos-present", Boolean.class); createKey("atmos-present", Boolean.class);
/**
* A key representing the presence of Atmos in an E-AC3 stream.
*
* An Integer value which is nonzero if Atmos is present in an E-AC3 stream.
* The integer representation is used for communication to the native side.
* @hide
*/
@NonNull public static final Key<Integer> KEY_HAS_ATMOS =
createKey("has-atmos", Integer.class);
/** /**
* A key representing the audio encoding used for the stream. * A key representing the audio encoding used for the stream.
* This is the same encoding used in {@link AudioFormat#getEncoding()}. * This is the same encoding used in {@link AudioFormat#getEncoding()}.
@@ -731,6 +746,15 @@ public final class AudioMetadata {
Log.e(TAG, "Failed to unpack value for map"); Log.e(TAG, "Failed to unpack value for map");
return null; return null;
} }
// Special handling of KEY_ATMOS_PRESENT.
if (key.equals(Format.KEY_HAS_ATMOS.getName())
&& value.first == Format.KEY_HAS_ATMOS.getValueClass()) {
ret.set(Format.KEY_ATMOS_PRESENT,
(Boolean) ((int) value.second != 0)); // Translate Integer to Boolean
continue; // Should we store both keys in the java table?
}
ret.set(createKey(key, value.first), value.first.cast(value.second)); ret.set(createKey(key, value.first), value.first.cast(value.second));
} }
return ret; return ret;
@@ -746,11 +770,19 @@ public final class AudioMetadata {
return false; return false;
} }
for (Key<?> key : obj.keySet()) { for (Key<?> key : obj.keySet()) {
Object value = obj.get(key);
// Special handling of KEY_ATMOS_PRESENT.
if (key == Format.KEY_ATMOS_PRESENT) {
key = Format.KEY_HAS_ATMOS;
value = (Integer) ((boolean) value ? 1 : 0); // Translate Boolean to Integer
}
if (!strDataPackage.pack(output, key.getName())) { if (!strDataPackage.pack(output, key.getName())) {
Log.i(TAG, "Failed to pack key: " + key.getName()); Log.i(TAG, "Failed to pack key: " + key.getName());
return false; return false;
} }
if (!OBJECT_PACKAGE.pack(output, new Pair<>(key.getValueClass(), obj.get(key)))) { if (!OBJECT_PACKAGE.pack(output, new Pair<>(key.getValueClass(), value))) {
Log.i(TAG, "Failed to pack value: " + obj.get(key)); Log.i(TAG, "Failed to pack value: " + obj.get(key));
return false; return false;
} }