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

Commit d9847734 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Fix buildCommonTypesStructureFile.py script am: be73c527 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1515659

Change-Id: I3b33a8d256b2cc410d5111d99488ec7e1ae20a23
parents a69f0713 be73c527

services/audiopolicy/engineconfigurable/tools/buildCommonTypesStructureFile.py

+10 −3
Original line number Diff line number Diff line
@@ -126,9 +126,9 @@ def parseAndroidAudioFile(androidaudiobaseheaderFile): 
    ignored_values = ['CNT', 'MAX', 'ALL', 'NONE']



    criteria_pattern = re.compile(

        r"\s*(?P<type>(?:"+'|'.join(component_type_mapping_table.keys()) + "))_" \

        r"(?P<literal>(?!" + '|'.join(ignored_values) + ")\w*)\s*=\s*" \

        r"(?P<values>(?:0[xX])?[0-9a-fA-F]+)")

        r"\s*V\((?P<type>(?:"+'|'.join(component_type_mapping_table.keys()) + "))_" \

        r"(?P<literal>(?!" + '|'.join(ignored_values) + ")\w*)\s*,\s*" \

        r"(?:AUDIO_DEVICE_BIT_IN \| )?(?P<values>(?:0[xX])[0-9a-fA-F]+|[0-9]+)")



    logging.info("Checking Android Header file {}".format(androidaudiobaseheaderFile))
@@ -164,6 +164,13 @@ def parseAndroidAudioFile(androidaudiobaseheaderFile): 


            logging.debug("type:{}, literal:{}, values:{}.".format(component_type_name, component_type_literal, component_type_numerical_value))



    if "stub" not in all_component_types["OutputDevicesMask"]:

        all_component_types["OutputDevicesMask"]["stub"] = 0x40000000

        logging.info("added stub output device mask")

    if "stub" not in all_component_types["InputDevicesMask"]:

        all_component_types["InputDevicesMask"]["stub"] = 0x40000000

        logging.info("added stub input device mask")



    # Transform input source in inclusive criterion

    shift = len(all_component_types['OutputDevicesMask'])

    if shift > 32: