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

Commit faab202a authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Gerrit Code Review
Browse files

Merge changes from topic "upstream-hal-v7_1-p4" 

* changes:
  Make libaudiohal@7.1 to use @7.1-util libraries
  audio: add flag for the Ultrasound input source and content_type
parents 6651930c a226aa48

media/libaudioclient/AidlConversion.cpp

+16 −0
Original line number Diff line number Diff line
@@ -520,6 +520,8 @@ ConversionResult<audio_input_flags_t> aidl2legacy_AudioInputFlags_audio_input_fl 
            return AUDIO_INPUT_FLAG_HW_AV_SYNC;

        case media::AudioInputFlags::DIRECT:

            return AUDIO_INPUT_FLAG_DIRECT;

        case media::AudioInputFlags::ULTRASOUND:

            return AUDIO_INPUT_FLAG_ULTRASOUND;

    }

    return unexpected(BAD_VALUE);

}
@@ -545,6 +547,8 @@ ConversionResult<media::AudioInputFlags> legacy2aidl_audio_input_flags_t_AudioIn 
            return media::AudioInputFlags::HW_AV_SYNC;

        case AUDIO_INPUT_FLAG_DIRECT:

            return media::AudioInputFlags::DIRECT;

        case AUDIO_INPUT_FLAG_ULTRASOUND:

            return media::AudioInputFlags::ULTRASOUND;

    }

    return unexpected(BAD_VALUE);

}
@@ -586,6 +590,8 @@ ConversionResult<audio_output_flags_t> aidl2legacy_AudioOutputFlags_audio_output 
            return AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD;

        case media::AudioOutputFlags::SPATIALIZER:

            return AUDIO_OUTPUT_FLAG_SPATIALIZER;

        case media::AudioOutputFlags::ULTRASOUND:

            return AUDIO_OUTPUT_FLAG_ULTRASOUND;

    }

    return unexpected(BAD_VALUE);

}
@@ -629,6 +635,8 @@ ConversionResult<media::AudioOutputFlags> legacy2aidl_audio_output_flags_t_Audio 
            return media::AudioOutputFlags::GAPLESS_OFFLOAD;

        case AUDIO_OUTPUT_FLAG_SPATIALIZER:

            return media::AudioOutputFlags::SPATIALIZER;

        case AUDIO_OUTPUT_FLAG_ULTRASOUND:

            return media::AudioOutputFlags::ULTRASOUND;

    }

    return unexpected(BAD_VALUE);

}
@@ -854,6 +862,8 @@ ConversionResult<audio_source_t> aidl2legacy_AudioSourceType_audio_source_t( 
            return AUDIO_SOURCE_FM_TUNER;

        case media::AudioSourceType::HOTWORD:

            return AUDIO_SOURCE_HOTWORD;

        case media::AudioSourceType::ULTRASOUND:

            return AUDIO_SOURCE_ULTRASOUND;

    }

    return unexpected(BAD_VALUE);

}
@@ -891,6 +901,8 @@ ConversionResult<media::AudioSourceType> legacy2aidl_audio_source_t_AudioSourceT 
            return media::AudioSourceType::FM_TUNER;

        case AUDIO_SOURCE_HOTWORD:

            return media::AudioSourceType::HOTWORD;

        case AUDIO_SOURCE_ULTRASOUND:

            return media::AudioSourceType::ULTRASOUND;

    }

    return unexpected(BAD_VALUE);

}
@@ -1211,6 +1223,8 @@ aidl2legacy_AudioContentType_audio_content_type_t(media::AudioContentType aidl) 
            return AUDIO_CONTENT_TYPE_MOVIE;

        case media::AudioContentType::SONIFICATION:

            return AUDIO_CONTENT_TYPE_SONIFICATION;

        case media::AudioContentType::ULTRASOUND:

            return AUDIO_CONTENT_TYPE_ULTRASOUND;

    }

    return unexpected(BAD_VALUE);

}
@@ -1228,6 +1242,8 @@ legacy2aidl_audio_content_type_t_AudioContentType(audio_content_type_t legacy) { 
            return media::AudioContentType::MOVIE;

        case AUDIO_CONTENT_TYPE_SONIFICATION:

            return media::AudioContentType::SONIFICATION;

        case AUDIO_CONTENT_TYPE_ULTRASOUND:

            return media::AudioContentType::ULTRASOUND;

    }

    return unexpected(BAD_VALUE);

}

media/libaudioclient/aidl/android/media/AudioContentType.aidl

+1 −0
Original line number Diff line number Diff line
@@ -22,4 +22,5 @@ enum AudioContentType { 
    MUSIC = 2,

    MOVIE = 3,

    SONIFICATION = 4,

    ULTRASOUND = 1997,

}

media/libaudioclient/aidl/android/media/AudioInputFlags.aidl

+1 −0
Original line number Diff line number Diff line
@@ -28,4 +28,5 @@ enum AudioInputFlags { 
    VOIP_TX    = 5,

    HW_AV_SYNC = 6,

    DIRECT     = 7,

    ULTRASOUND = 8,

}

media/libaudioclient/aidl/android/media/AudioOutputFlags.aidl

+1 −0
Original line number Diff line number Diff line
@@ -37,4 +37,5 @@ enum AudioOutputFlags { 
    INCALL_MUSIC     = 14,

    GAPLESS_OFFLOAD  = 15,

    SPATIALIZER      = 16,

    ULTRASOUND       = 17,

}

media/libaudioclient/aidl/android/media/AudioSourceType.aidl

+1 −0
Original line number Diff line number Diff line
@@ -40,4 +40,5 @@ enum AudioSourceType { 
     * Used only internally by the framework.

     */

    HOTWORD = 1999,

    ULTRASOUND = 2000,

}