commit 9f89d6c8f5f339403f757ce8eb5aed92ac4ffb4e
author Andy Hung <hunga@google.com> Wed Jul 21 12:52:17 2021 -0700
committer Andy Hung <hunga@google.com> Wed Jul 21 15:41:39 2021 -0700
tree fb68f252c4d438c3791c674e4ea03cc1db42e6aa
parent 7b6cfc707c97538e10be44d67c517a19c4d0ee6f

NdkMediaFormat: Add MPEG-H constants

  Java: MediaFormat.KEY_MPEGH_COMPATIBLE_SETS
  Ndk:  AMEDIAFORMAT_KEY_MPEGH_COMPATIBLE_SETS

  Java: MediaFormat.KEY_MPEGH_PROFILE_LEVEL_INDICATION
  Ndk:  AMEDIAFORMAT_KEY_MPEGH_PROFILE_LEVEL_INDICATION

  Java: MediaFormat.KEY_MPEGH_REFERENCE_CHANNEL_LAYOUT
  Ndk:  AMEDIAFORMAT_KEY_MPEGH_REFERENCE_CHANNEL_LAYOUT

Test: compiles, MPEG-H standard used immersive audio
Bug: 194313740
Change-Id: Iae3baf7b73dfc133b9f61810f38f5723ef1cea78

media/ndk/NdkMediaFormat.cpp

diff --git a/media/ndk/NdkMediaFormat.cpp b/media/ndk/NdkMediaFormat.cpp
index c1793ce..b035e5a 100644
--- a/media/ndk/NdkMediaFormat.cpp
+++ b/media/ndk/NdkMediaFormat.cpp
@@ -351,6 +351,11 @@
 EXPORT const char* AMEDIAFORMAT_KEY_MIME = "mime";
 EXPORT const char* AMEDIAFORMAT_KEY_MPEG_USER_DATA = "mpeg-user-data";
 EXPORT const char* AMEDIAFORMAT_KEY_MPEG2_STREAM_HEADER = "mpeg2-stream-header";
+EXPORT const char* AMEDIAFORMAT_KEY_MPEGH_COMPATIBLE_SETS = "mpegh-compatible-sets";
+EXPORT const char* AMEDIAFORMAT_KEY_MPEGH_PROFILE_LEVEL_INDICATION =
+        "mpegh-profile-level-indication";
+EXPORT const char* AMEDIAFORMAT_KEY_MPEGH_REFERENCE_CHANNEL_LAYOUT =
+        "mpegh-reference-channel-layout";
 EXPORT const char* AMEDIAFORMAT_KEY_OPERATING_RATE = "operating-rate";
 EXPORT const char* AMEDIAFORMAT_KEY_PCM_ENCODING = "pcm-encoding";
 EXPORT const char* AMEDIAFORMAT_KEY_PRIORITY = "priority";