From 8dad472e7504e17d8f64456b126b7e67cb169193 Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Thu, 2 Sep 2021 17:18:12 -0700 Subject: [PATCH] AudioFormatDescription: remove docs about encapsulation Initially there was an idea to use MIME-compatible '+' syntax for specifying both the encapsulated format and the format of encapsulation, e.g. 'audio/x-iec61937+audio/ac3'. However, it seems to create too many caveats when comparing type values and converting to/from legacy and SDK types. Thus, it's better to store the encapsulation information in a separate type 'AudioEncapsulationType'. Bug: 198000804 Test: m Change-Id: Ieb50ce6b895e54df7d38e865bc9ae1f14a17789e --- .../media/audio/common/AudioFormatDescription.aidl | 8 -------- 1 file changed, 8 deletions(-) diff --git a/media/aidl/android/media/audio/common/AudioFormatDescription.aidl b/media/aidl/android/media/audio/common/AudioFormatDescription.aidl index 2aea8ddcd6d7b..d8725dd963dd5 100644 --- a/media/aidl/android/media/audio/common/AudioFormatDescription.aidl +++ b/media/aidl/android/media/audio/common/AudioFormatDescription.aidl @@ -73,14 +73,6 @@ parcelable AudioFormatDescription { * - Otherwise, "x-" prefix is added, e.g. "audio/x-iec61937". * - All MIME types not found in the IANA formats list have an associated * comment. - * - * For PCM encapsulations with a known bitstream format, the latter - * is added to the encapsulation encoding as a suffix, after a "+" char. - * For example, an IEC61937 encapsulation of AC3 has the following - * representation: - * type = NON_PCM, - * pcm = PcmType.INT_16_BIT, - * encoding = "audio/x-iec61937+audio/ac3" */ @utf8InCpp String encoding; }