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

Commit f33b7cd6 authored by dolby's avatar dolby Committed by Ricardo Cerqueira
Browse files

Merge UDC changes from Perforce 

//depot/aus/PE/Integrations/ds_udc/android/4.2.1_r1/int_releases \
/DS1.5.0.22_b1-Android-4.2.1_r1-QOEM-RFL

P4 Changelist: 721622

Change-Id: I9cfa5f45e99cf164bfbc6e00e801f2c1c1d70214
parent 4876ced9

include/media/openmax/OMX_Audio.h

+22 −0
Original line number Diff line number Diff line
@@ -13,6 +13,25 @@ 
 * express or implied.

 * See the License for the specific language governing permissions

 * and limitations under the License.

 *

 * This file was modified by Dolby Laboratories, Inc. The portions of the

 * code that are surrounded by "DOLBY..." are copyrighted and

 * licensed separately, as follows:

 *

 *  (C) 2011-2012 Dolby Laboratories, Inc.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *    http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 * -------------------------------------------------------------------

 */

/*
@@ -107,6 +126,9 @@ typedef enum OMX_AUDIO_CODINGTYPE { 
    OMX_AUDIO_CodingRA,          /**< Any variant of RA encoded data */

    OMX_AUDIO_CodingMIDI,        /**< Any variant of MIDI encoded data */

    OMX_AUDIO_CodingFLAC,        /**< Any variant of FLAC encoded data */

#ifdef DOLBY_UDC

    OMX_AUDIO_CodingDDP,         /**< Any variant of DDP encoded data */

#endif // DOLBY_UDC

    OMX_AUDIO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ 

    OMX_AUDIO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */

    OMX_AUDIO_CodingMax = 0x7FFFFFFF