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

Commit 6ef88eb9 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Move MediaDeviceInfo to libamidi, its only user" 

am: 10e7728c

Change-Id: I9b69602a349e159b3aedd8a1a03194ce3f088357
parents 460618a6 10e7728c

media/libmedia/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ cc_library { 
        "mediarecorder.cpp",

        "IMediaMetadataRetriever.cpp",

        "mediametadataretriever.cpp",

        "MidiDeviceInfo.cpp",

        "MediaScanner.cpp",

        "MediaScannerClient.cpp",

        "CharacterEncodingDetector.cpp",

media/libmedia/MidiDeviceInfo.cpp

deleted100644 → 0
+0 −138
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.

 */



#define LOG_TAG "MidiDeviceInfo"



#include <media/MidiDeviceInfo.h>



#include <binder/Parcel.h>

#include <log/log.h>

#include <utils/Errors.h>

#include <utils/String16.h>



namespace android {

namespace media {

namespace midi {



// The constant values need to be kept in sync with MidiDeviceInfo.java.

// static

const char* const MidiDeviceInfo::PROPERTY_NAME = "name";

const char* const MidiDeviceInfo::PROPERTY_MANUFACTURER = "manufacturer";

const char* const MidiDeviceInfo::PROPERTY_PRODUCT = "product";

const char* const MidiDeviceInfo::PROPERTY_VERSION = "version";

const char* const MidiDeviceInfo::PROPERTY_SERIAL_NUMBER = "serial_number";

const char* const MidiDeviceInfo::PROPERTY_ALSA_CARD = "alsa_card";

const char* const MidiDeviceInfo::PROPERTY_ALSA_DEVICE = "alsa_device";



String16 MidiDeviceInfo::getProperty(const char* propertyName) {

    String16 value;

    if (mProperties.getString(String16(propertyName), &value)) {

        return value;

    } else {

        return String16();

    }

}



#define RETURN_IF_FAILED(calledOnce)                                     \

    {                                                                    \

        status_t returnStatus = calledOnce;                              \

        if (returnStatus) {                                              \

            ALOGE("Failed at %s:%d (%s)", __FILE__, __LINE__, __func__); \

            return returnStatus;                                         \

         }                                                               \

    }



status_t MidiDeviceInfo::writeToParcel(Parcel* parcel) const {

    // Needs to be kept in sync with code in MidiDeviceInfo.java

    RETURN_IF_FAILED(parcel->writeInt32(mType));

    RETURN_IF_FAILED(parcel->writeInt32(mId));

    RETURN_IF_FAILED(parcel->writeInt32((int32_t)mInputPortNames.size()));

    RETURN_IF_FAILED(parcel->writeInt32((int32_t)mOutputPortNames.size()));

    RETURN_IF_FAILED(writeStringVector(parcel, mInputPortNames));

    RETURN_IF_FAILED(writeStringVector(parcel, mOutputPortNames));

    RETURN_IF_FAILED(parcel->writeInt32(mIsPrivate ? 1 : 0));

    RETURN_IF_FAILED(mProperties.writeToParcel(parcel));

    // This corresponds to "extra" properties written by Java code

    RETURN_IF_FAILED(mProperties.writeToParcel(parcel));

    return OK;

}



status_t MidiDeviceInfo::readFromParcel(const Parcel* parcel) {

    // Needs to be kept in sync with code in MidiDeviceInfo.java

    RETURN_IF_FAILED(parcel->readInt32(&mType));

    RETURN_IF_FAILED(parcel->readInt32(&mId));

    int32_t inputPortCount;

    RETURN_IF_FAILED(parcel->readInt32(&inputPortCount));

    int32_t outputPortCount;

    RETURN_IF_FAILED(parcel->readInt32(&outputPortCount));

    RETURN_IF_FAILED(readStringVector(parcel, &mInputPortNames, inputPortCount));

    RETURN_IF_FAILED(readStringVector(parcel, &mOutputPortNames, outputPortCount));

    int32_t isPrivate;

    RETURN_IF_FAILED(parcel->readInt32(&isPrivate));

    mIsPrivate = isPrivate == 1;

    RETURN_IF_FAILED(mProperties.readFromParcel(parcel));

    // Ignore "extra" properties as they may contain Java Parcelables

    return OK;

}



status_t MidiDeviceInfo::readStringVector(

        const Parcel* parcel, Vector<String16> *vectorPtr, size_t defaultLength) {

    std::unique_ptr<std::vector<std::unique_ptr<String16>>> v;

    status_t result = parcel->readString16Vector(&v);

    if (result != OK) return result;

    vectorPtr->clear();

    if (v.get() != nullptr) {

        for (const auto& iter : *v) {

            if (iter.get() != nullptr) {

                vectorPtr->push_back(*iter);

            } else {

                vectorPtr->push_back(String16());

            }

        }

    } else {

        vectorPtr->resize(defaultLength);

    }

    return OK;

}



status_t MidiDeviceInfo::writeStringVector(Parcel* parcel, const Vector<String16>& vector) const {

    std::vector<String16> v;

    for (size_t i = 0; i < vector.size(); ++i) {

        v.push_back(vector[i]);

    }

    return parcel->writeString16Vector(v);

}



// Vector does not define operator==

static inline bool areVectorsEqual(const Vector<String16>& lhs, const Vector<String16>& rhs) {

    if (lhs.size() != rhs.size()) return false;

    for (size_t i = 0; i < lhs.size(); ++i) {

        if (lhs[i] != rhs[i]) return false;

    }

    return true;

}



bool operator==(const MidiDeviceInfo& lhs, const MidiDeviceInfo& rhs) {

    return (lhs.mType == rhs.mType && lhs.mId == rhs.mId &&

            areVectorsEqual(lhs.mInputPortNames, rhs.mInputPortNames) &&

            areVectorsEqual(lhs.mOutputPortNames, rhs.mOutputPortNames) &&

            lhs.mProperties == rhs.mProperties &&

            lhs.mIsPrivate == rhs.mIsPrivate);

}



}  // namespace midi

}  // namespace media

}  // namespace android

media/libmedia/include/media/MidiDeviceInfo.h

deleted100644 → 0
+0 −81
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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 ANDROID_MEDIA_MIDI_DEVICE_INFO_H

#define ANDROID_MEDIA_MIDI_DEVICE_INFO_H



#include <binder/Parcelable.h>

#include <binder/PersistableBundle.h>

#include <utils/String16.h>

#include <utils/Vector.h>



namespace android {

namespace media {

namespace midi {



class MidiDeviceInfo : public Parcelable {

public:

    MidiDeviceInfo() = default;

    virtual ~MidiDeviceInfo() = default;

    MidiDeviceInfo(const MidiDeviceInfo& midiDeviceInfo) = default;



    status_t writeToParcel(Parcel* parcel) const override;

    status_t readFromParcel(const Parcel* parcel) override;



    int getType() const { return mType; }

    int getUid() const { return mId; }

    bool isPrivate() const { return mIsPrivate; }

    const Vector<String16>& getInputPortNames() const { return mInputPortNames; }

    const Vector<String16>&  getOutputPortNames() const { return mOutputPortNames; }

    String16 getProperty(const char* propertyName);



    // The constants need to be kept in sync with MidiDeviceInfo.java

    enum {

        TYPE_USB = 1,

        TYPE_VIRTUAL = 2,

        TYPE_BLUETOOTH = 3,

    };

    static const char* const PROPERTY_NAME;

    static const char* const PROPERTY_MANUFACTURER;

    static const char* const PROPERTY_PRODUCT;

    static const char* const PROPERTY_VERSION;

    static const char* const PROPERTY_SERIAL_NUMBER;

    static const char* const PROPERTY_ALSA_CARD;

    static const char* const PROPERTY_ALSA_DEVICE;



    friend bool operator==(const MidiDeviceInfo& lhs, const MidiDeviceInfo& rhs);

    friend bool operator!=(const MidiDeviceInfo& lhs, const MidiDeviceInfo& rhs) {

        return !(lhs == rhs);

    }



private:

    status_t readStringVector(

            const Parcel* parcel, Vector<String16> *vectorPtr, size_t defaultLength);

    status_t writeStringVector(Parcel* parcel, const Vector<String16>& vector) const;



    int32_t mType;

    int32_t mId;

    Vector<String16> mInputPortNames;

    Vector<String16> mOutputPortNames;

    os::PersistableBundle mProperties;

    bool mIsPrivate;

};



}  // namespace midi

}  // namespace media

}  // namespace android



#endif  // ANDROID_MEDIA_MIDI_DEVICE_INFO_H