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

Commit de2c195a authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Merge changes from topic "fix-b-63901775-add-presentation" 

* changes:
  Audio presentation selection for AudioTrack native
  Add presentation API interface
parents 4b8dbfc9 a70eef73

include/media/AudioPresentationInfo.h

0 → 100644
+79 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * 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.

 */



#ifndef AUDIO_PRESENTATION_INFO_H_

#define AUDIO_PRESENTATION_INFO_H_



#include <sstream>

#include <stdint.h>



#include <utils/KeyedVector.h>

#include <utils/RefBase.h>

#include <utils/String8.h>

#include <utils/Vector.h>



namespace android {



enum mastering_indication {

    MASTERING_NOT_INDICATED,

    MASTERED_FOR_STEREO,

    MASTERED_FOR_SURROUND,

    MASTERED_FOR_3D,

    MASTERED_FOR_HEADPHONE,

};



struct AudioPresentation : public RefBase {

    int32_t mPresentationId;

    int32_t mProgramId;

    KeyedVector<String8, String8> mLabels;

    String8 mLanguage;

    int32_t mMasteringIndication;

    bool mAudioDescriptionAvailable;

    bool mSpokenSubtitlesAvailable;

    bool mDialogueEnhancementAvailable;



    AudioPresentation() {

        mPresentationId = -1;

        mProgramId = -1;

        mLanguage = "";

        mMasteringIndication = MASTERING_NOT_INDICATED;

        mAudioDescriptionAvailable = false;

        mSpokenSubtitlesAvailable = false;

        mDialogueEnhancementAvailable = false;

    }

};



typedef Vector<sp<AudioPresentation>> AudioPresentations;



class AudioPresentationInfo : public RefBase {

 public:

    AudioPresentationInfo();



    ~AudioPresentationInfo();



    void addPresentation(sp<AudioPresentation> presentation);



    size_t countPresentations() const;



    const sp<AudioPresentation> getPresentation(size_t index) const;



 private:

    AudioPresentations mPresentations;

};



}  // namespace android



#endif  // AUDIO_PRESENTATION_INFO_H_

media/libaudioclient/AudioTrack.cpp

+12 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <utils/Log.h>

#include <private/media/AudioTrackShared.h>

#include <media/IAudioFlinger.h>

#include <media/AudioParameter.h>

#include <media/AudioPolicyHelper.h>

#include <media/AudioResamplerPublic.h>

#include <media/MediaAnalyticsItem.h>
@@ -2354,6 +2355,17 @@ status_t AudioTrack::setParameters(const String8& keyValuePairs) 
    return mAudioTrack->setParameters(keyValuePairs);

}



status_t AudioTrack::selectPresentation(int presentationId, int programId)

{

    AutoMutex lock(mLock);

    AudioParameter param = AudioParameter();

    param.addInt(String8(AudioParameter::keyPresentationId), presentationId);

    param.addInt(String8(AudioParameter::keyProgramId), programId);

    ALOGV("PresentationId/ProgramId[%s]",param.toString().string());



    return mAudioTrack->setParameters(param.toString());

}



VolumeShaper::Status AudioTrack::applyVolumeShaper(

        const sp<VolumeShaper::Configuration>& configuration,

        const sp<VolumeShaper::Operation>& operation)

media/libaudioclient/include/media/AudioParameter.h

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,12 @@ public: 
    static const char * const keyMonoOutput;

    static const char * const keyStreamHwAvSync;



    //  keys for presentation selection

    //  keyPresentationId: Audio presentation identifier

    //  keyProgramId: Audio presentation program identifier

    static const char * const keyPresentationId;

    static const char * const keyProgramId;



    //  keyStreamConnect / Disconnect: value is an int in audio_devices_t

    static const char * const keyStreamConnect;

    static const char * const keyStreamDisconnect;

media/libaudioclient/include/media/AudioTrack.h

+3 −0
Original line number Diff line number Diff line
@@ -765,6 +765,9 @@ public: 
    /* Gets the volume shaper state */

            sp<media::VolumeShaper::State> getVolumeShaperState(int id);



    /* Selects the presentation (if available) */

            status_t    selectPresentation(int presentationId, int programId);



    /* Get parameters */

            String8     getParameters(const String8& keys);

media/libmedia/AudioParameter.cpp

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ const char * const AudioParameter::keyInputSource = AUDIO_PARAMETER_STREAM_INPUT 
const char * const AudioParameter::keyScreenState = AUDIO_PARAMETER_KEY_SCREEN_STATE;

const char * const AudioParameter::keyBtNrec = AUDIO_PARAMETER_KEY_BT_NREC;

const char * const AudioParameter::keyHwAvSync = AUDIO_PARAMETER_HW_AV_SYNC;

const char * const AudioParameter::keyPresentationId = AUDIO_PARAMETER_STREAM_PRESENTATION_ID;

const char * const AudioParameter::keyProgramId = AUDIO_PARAMETER_STREAM_PROGRAM_ID;

const char * const AudioParameter::keyMonoOutput = AUDIO_PARAMETER_MONO_OUTPUT;

const char * const AudioParameter::keyStreamHwAvSync = AUDIO_PARAMETER_STREAM_HW_AV_SYNC;

const char * const AudioParameter::keyStreamConnect = AUDIO_PARAMETER_DEVICE_CONNECT;