Merge "Implement IOmxStore" into oc-mr1-dev
diff --git a/media/libmedia/IMediaCodecService.cpp b/media/libmedia/IMediaCodecService.cpp
index 2d62419..adfa93d 100644
--- a/media/libmedia/IMediaCodecService.cpp
+++ b/media/libmedia/IMediaCodecService.cpp
@@ -27,7 +27,8 @@
namespace android {
enum {
- GET_OMX = IBinder::FIRST_CALL_TRANSACTION
+ GET_OMX = IBinder::FIRST_CALL_TRANSACTION,
+ GET_OMX_STORE
};
class BpMediaCodecService : public BpInterface<IMediaCodecService>
@@ -45,6 +46,13 @@
return interface_cast<IOMX>(reply.readStrongBinder());
}
+ virtual sp<IOMXStore> getOMXStore() {
+ Parcel data, reply;
+ data.writeInterfaceToken(IMediaCodecService::getInterfaceDescriptor());
+ remote()->transact(GET_OMX_STORE, data, &reply);
+ return interface_cast<IOMXStore>(reply.readStrongBinder());
+ }
+
};
IMPLEMENT_META_INTERFACE(MediaCodecService, "android.media.IMediaCodecService");
@@ -62,6 +70,12 @@
reply->writeStrongBinder(IInterface::asBinder(omx));
return NO_ERROR;
}
+ case GET_OMX_STORE: {
+ CHECK_INTERFACE(IMediaCodecService, data, reply);
+ sp<IOMXStore> omxStore = getOMXStore();
+ reply->writeStrongBinder(IInterface::asBinder(omxStore));
+ return NO_ERROR;
+ }
default:
return BBinder::onTransact(code, data, reply, flags);
}
diff --git a/media/libmedia/MediaCodecInfo.cpp b/media/libmedia/MediaCodecInfo.cpp
index 2a74512..a570ffe 100644
--- a/media/libmedia/MediaCodecInfo.cpp
+++ b/media/libmedia/MediaCodecInfo.cpp
@@ -101,42 +101,46 @@
return OK;
}
-void MediaCodecInfo::CapabilitiesBuilder::addProfileLevel(uint32_t profile, uint32_t level) {
+void MediaCodecInfo::CapabilitiesWriter::addDetail(
+ const char* key, const char* value) {
+ mCap->mDetails->setString(key, value);
+}
+
+void MediaCodecInfo::CapabilitiesWriter::addDetail(
+ const char* key, int32_t value) {
+ mCap->mDetails->setInt32(key, value);
+}
+
+void MediaCodecInfo::CapabilitiesWriter::addProfileLevel(
+ uint32_t profile, uint32_t level) {
ProfileLevel profileLevel;
profileLevel.mProfile = profile;
profileLevel.mLevel = level;
- if (mProfileLevelsSorted.indexOf(profileLevel) < 0) {
- mProfileLevels.push_back(profileLevel);
- mProfileLevelsSorted.add(profileLevel);
+ if (mCap->mProfileLevelsSorted.indexOf(profileLevel) < 0) {
+ mCap->mProfileLevels.push_back(profileLevel);
+ mCap->mProfileLevelsSorted.add(profileLevel);
}
}
-void MediaCodecInfo::CapabilitiesBuilder::addColorFormat(uint32_t format) {
- if (mColorFormatsSorted.indexOf(format) < 0) {
- mColorFormats.push(format);
- mColorFormatsSorted.add(format);
+void MediaCodecInfo::CapabilitiesWriter::addColorFormat(uint32_t format) {
+ if (mCap->mColorFormatsSorted.indexOf(format) < 0) {
+ mCap->mColorFormats.push(format);
+ mCap->mColorFormatsSorted.add(format);
}
}
-void MediaCodecInfo::CapabilitiesBuilder::addFlags(uint32_t flags) {
- mFlags |= flags;
+void MediaCodecInfo::CapabilitiesWriter::addFlags(uint32_t flags) {
+ mCap->mFlags |= flags;
+}
+
+MediaCodecInfo::CapabilitiesWriter::CapabilitiesWriter(
+ MediaCodecInfo::Capabilities* cap) : mCap(cap) {
}
bool MediaCodecInfo::isEncoder() const {
return mIsEncoder;
}
-bool MediaCodecInfo::hasQuirk(const char *name) const {
- if (name) {
- for (size_t ix = 0; ix < mQuirks.size(); ix++) {
- if (mQuirks.itemAt(ix).equalsIgnoreCase(name)) {
- return true;
- }
- }
- }
- return false;
-}
-
void MediaCodecInfo::getSupportedMimes(Vector<AString> *mimes) const {
mimes->clear();
for (size_t ix = 0; ix < mCaps.size(); ix++) {
@@ -157,20 +161,21 @@
return mName.c_str();
}
+const char *MediaCodecInfo::getOwnerName() const {
+ return mOwner.c_str();
+}
+
// static
sp<MediaCodecInfo> MediaCodecInfo::FromParcel(const Parcel &parcel) {
AString name = AString::FromParcel(parcel);
+ AString owner = AString::FromParcel(parcel);
bool isEncoder = static_cast<bool>(parcel.readInt32());
- sp<MediaCodecInfo> info = new MediaCodecInfo(name, isEncoder, NULL);
+ sp<MediaCodecInfo> info = new MediaCodecInfo;
+ info->mName = name;
+ info->mOwner = owner;
+ info->mIsEncoder = isEncoder;
size_t size = static_cast<size_t>(parcel.readInt32());
for (size_t i = 0; i < size; i++) {
- AString quirk = AString::FromParcel(parcel);
- if (info != NULL) {
- info->mQuirks.push_back(quirk);
- }
- }
- size = static_cast<size_t>(parcel.readInt32());
- for (size_t i = 0; i < size; i++) {
AString mime = AString::FromParcel(parcel);
sp<Capabilities> caps = Capabilities::FromParcel(parcel);
if (caps == NULL)
@@ -184,11 +189,8 @@
status_t MediaCodecInfo::writeToParcel(Parcel *parcel) const {
mName.writeToParcel(parcel);
+ mOwner.writeToParcel(parcel);
parcel->writeInt32(mIsEncoder);
- parcel->writeInt32(mQuirks.size());
- for (size_t i = 0; i < mQuirks.size(); i++) {
- mQuirks.itemAt(i).writeToParcel(parcel);
- }
parcel->writeInt32(mCaps.size());
for (size_t i = 0; i < mCaps.size(); i++) {
mCaps.keyAt(i).writeToParcel(parcel);
@@ -208,86 +210,46 @@
return -1;
}
-MediaCodecInfo::MediaCodecInfo(AString name, bool encoder, const char *mime)
- : mName(name),
- mIsEncoder(encoder),
- mHasSoleMime(false) {
- if (mime != NULL) {
- addMime(mime);
- mHasSoleMime = true;
- }
+MediaCodecInfo::MediaCodecInfo() {
}
-status_t MediaCodecInfo::addMime(const char *mime) {
- if (mHasSoleMime) {
- ALOGE("Codec '%s' already had its type specified", mName.c_str());
- return -EINVAL;
- }
- ssize_t ix = getCapabilityIndex(mime);
+void MediaCodecInfoWriter::setName(const char* name) {
+ mInfo->mName = name;
+}
+
+void MediaCodecInfoWriter::setOwner(const char* owner) {
+ mInfo->mOwner = owner;
+}
+
+void MediaCodecInfoWriter::setEncoder(bool isEncoder) {
+ mInfo->mIsEncoder = isEncoder;
+}
+
+std::unique_ptr<MediaCodecInfo::CapabilitiesWriter>
+ MediaCodecInfoWriter::addMime(const char *mime) {
+ ssize_t ix = mInfo->getCapabilityIndex(mime);
if (ix >= 0) {
- mCurrentCaps = mCaps.valueAt(ix);
- } else {
- mCurrentCaps = new Capabilities();
- mCaps.add(AString(mime), mCurrentCaps);
+ return std::unique_ptr<MediaCodecInfo::CapabilitiesWriter>(
+ new MediaCodecInfo::CapabilitiesWriter(
+ mInfo->mCaps.valueAt(ix).get()));
}
- return OK;
+ sp<MediaCodecInfo::Capabilities> caps = new MediaCodecInfo::Capabilities();
+ mInfo->mCaps.add(AString(mime), caps);
+ return std::unique_ptr<MediaCodecInfo::CapabilitiesWriter>(
+ new MediaCodecInfo::CapabilitiesWriter(caps.get()));
}
-status_t MediaCodecInfo::updateMime(const char *mime) {
- ssize_t ix = getCapabilityIndex(mime);
- if (ix < 0) {
- ALOGE("updateMime mime not found %s", mime);
- return -EINVAL;
- }
-
- mCurrentCaps = mCaps.valueAt(ix);
- return OK;
-}
-
-void MediaCodecInfo::removeMime(const char *mime) {
- ssize_t ix = getCapabilityIndex(mime);
+bool MediaCodecInfoWriter::removeMime(const char *mime) {
+ ssize_t ix = mInfo->getCapabilityIndex(mime);
if (ix >= 0) {
- mCaps.removeItemsAt(ix);
- // mCurrentCaps will be removed when completed
+ mInfo->mCaps.removeItemsAt(ix);
+ return true;
}
+ return false;
}
-status_t MediaCodecInfo::initializeCapabilities(const sp<Capabilities> &caps) {
- // TRICKY: copy data to mCurrentCaps as it is a reference to
- // an element of the capabilites map.
- mCurrentCaps->mColorFormats.clear();
- mCurrentCaps->mColorFormats.appendVector(caps->mColorFormats);
- mCurrentCaps->mProfileLevels.clear();
- mCurrentCaps->mProfileLevels.appendVector(caps->mProfileLevels);
- mCurrentCaps->mFlags = caps->mFlags;
- mCurrentCaps->mDetails = caps->mDetails;
- return OK;
-}
-
-void MediaCodecInfo::addQuirk(const char *name) {
- if (!hasQuirk(name)) {
- mQuirks.push(name);
- }
-}
-
-void MediaCodecInfo::complete() {
- mCurrentCaps = NULL;
-}
-
-void MediaCodecInfo::addDetail(const AString &key, const AString &value) {
- mCurrentCaps->mDetails->setString(key.c_str(), value.c_str());
-}
-
-void MediaCodecInfo::addFeature(const AString &key, int32_t value) {
- AString tag = "feature-";
- tag.append(key);
- mCurrentCaps->mDetails->setInt32(tag.c_str(), value);
-}
-
-void MediaCodecInfo::addFeature(const AString &key, const char *value) {
- AString tag = "feature-";
- tag.append(key);
- mCurrentCaps->mDetails->setString(tag.c_str(), value);
+MediaCodecInfoWriter::MediaCodecInfoWriter(MediaCodecInfo* info) :
+ mInfo(info) {
}
} // namespace android
diff --git a/media/libmedia/include/media/IMediaCodecService.h b/media/libmedia/include/media/IMediaCodecService.h
index da3c5a03..59fb1c0 100644
--- a/media/libmedia/include/media/IMediaCodecService.h
+++ b/media/libmedia/include/media/IMediaCodecService.h
@@ -22,6 +22,7 @@
#include <binder/Parcel.h>
#include <media/IDataSource.h>
#include <media/IOMX.h>
+#include <media/IOMXStore.h>
namespace android {
@@ -31,6 +32,7 @@
DECLARE_META_INTERFACE(MediaCodecService);
virtual sp<IOMX> getOMX() = 0;
+ virtual sp<IOMXStore> getOMXStore() = 0;
};
class BnMediaCodecService: public BnInterface<IMediaCodecService>
diff --git a/media/libmedia/include/media/IOMXStore.h b/media/libmedia/include/media/IOMXStore.h
index f739c3b..628db70 100644
--- a/media/libmedia/include/media/IOMXStore.h
+++ b/media/libmedia/include/media/IOMXStore.h
@@ -27,11 +27,6 @@
#include <vector>
#include <string>
-/*
-#include <OMX_Core.h>
-#include <OMX_Video.h>
-*/
-
namespace android {
using hardware::media::omx::V1_0::IOmxStore;
diff --git a/media/libmedia/include/media/MediaCodecInfo.h b/media/libmedia/include/media/MediaCodecInfo.h
index ef641d2..ab2cd24 100644
--- a/media/libmedia/include/media/MediaCodecInfo.h
+++ b/media/libmedia/include/media/MediaCodecInfo.h
@@ -18,6 +18,7 @@
#define MEDIA_CODEC_INFO_H_
+#include <android-base/macros.h>
#include <binder/Parcel.h>
#include <media/stagefright/foundation/ABase.h>
#include <media/stagefright/foundation/AString.h>
@@ -36,6 +37,9 @@
typedef KeyedVector<AString, AString> CodecSettings;
+struct MediaCodecInfoWriter;
+struct MediaCodecListWriter;
+
struct MediaCodecInfo : public RefBase {
struct ProfileLevel {
uint32_t mProfile;
@@ -45,6 +49,8 @@
}
};
+ struct CapabilitiesWriter;
+
struct Capabilities : public RefBase {
enum {
// decoder flags
@@ -77,72 +83,191 @@
static sp<Capabilities> FromParcel(const Parcel &parcel);
status_t writeToParcel(Parcel *parcel) const;
- DISALLOW_EVIL_CONSTRUCTORS(Capabilities);
+ DISALLOW_COPY_AND_ASSIGN(Capabilities);
friend struct MediaCodecInfo;
+ friend struct MediaCodecInfoWriter;
+ friend struct CapabilitiesWriter;
};
- // Use a subclass to allow setting fields on construction without allowing
- // to do the same throughout the framework.
- struct CapabilitiesBuilder : public Capabilities {
+ /**
+ * This class is used for modifying information inside a `Capabilities`
+ * object. An object of type `CapabilitiesWriter` can be obtained by calling
+ * `MediaCodecInfoWriter::addMime()` or
+ * `MediaCodecInfoWriter::updateMime()`.
+ */
+ struct CapabilitiesWriter {
+ /**
+ * Add a key-value pair to the list of details. If the key already
+ * exists, the old value will be replaced.
+ *
+ * A pair added by this function will be accessible by
+ * `Capabilities::getDetails()`. Call `AMessage::getString()` with the
+ * same key to retrieve the value.
+ *
+ * @param key The key.
+ * @param value The string value.
+ */
+ void addDetail(const char* key, const char* value);
+ /**
+ * Add a key-value pair to the list of details. If the key already
+ * exists, the old value will be replaced.
+ *
+ * A pair added by this function will be accessible by
+ * `Capabilities::getDetails()`. Call `AMessage::getInt32()` with the
+ * same key to retrieve the value.
+ *
+ * @param key The key.
+ * @param value The `int32_t` value.
+ */
+ void addDetail(const char* key, int32_t value);
+ /**
+ * Add a profile-level pair. If this profile-level pair already exists,
+ * it will be ignored.
+ *
+ * @param profile The "profile" component.
+ * @param level The "level" component.
+ */
void addProfileLevel(uint32_t profile, uint32_t level);
+ /**
+ * Add a color format. If this color format already exists, it will be
+ * ignored.
+ *
+ * @param format The color format.
+ */
void addColorFormat(uint32_t format);
+ /**
+ * Add flags. The underlying operation is bitwise-or. In other words,
+ * bits that have already been set will be ignored.
+ *
+ * @param flags The additional flags.
+ */
void addFlags(uint32_t flags);
+ private:
+ /**
+ * The associated `Capabilities` object.
+ */
+ Capabilities* mCap;
+ /**
+ * Construct a writer for the given `Capabilities` object.
+ *
+ * @param cap The `Capabilities` object to be written to.
+ */
+ CapabilitiesWriter(Capabilities* cap);
+
+ friend MediaCodecInfoWriter;
};
bool isEncoder() const;
- bool hasQuirk(const char *name) const;
void getSupportedMimes(Vector<AString> *mimes) const;
const sp<Capabilities> getCapabilitiesFor(const char *mime) const;
const char *getCodecName() const;
/**
+ * Return the name of the service that hosts the codec. This value is not
+ * visible at the Java level.
+ *
+ * Currently, this is the "instance name" of the IOmx service.
+ */
+ const char *getOwnerName() const;
+
+ /**
* Serialization over Binder
*/
static sp<MediaCodecInfo> FromParcel(const Parcel &parcel);
status_t writeToParcel(Parcel *parcel) const;
private:
- // variable set only in constructor - these are accessed by MediaCodecList
- // to avoid duplication of same variables
AString mName;
+ AString mOwner;
bool mIsEncoder;
- bool mHasSoleMime; // was initialized with mime
-
- Vector<AString> mQuirks;
KeyedVector<AString, sp<Capabilities> > mCaps;
- sp<Capabilities> mCurrentCaps; // currently initalized capabilities
-
ssize_t getCapabilityIndex(const char *mime) const;
- /* Methods used by MediaCodecList to construct the info
- * object from XML.
- *
- * After info object is created:
- * - additional quirks can be added
- * - additional mimes can be added
- * - OMX codec capabilities can be set for the current mime-type
- * - a capability detail can be set for the current mime-type
- * - a feature can be set for the current mime-type
- * - info object can be completed when parsing of a mime-type is done
+ /**
+ * Construct an `MediaCodecInfo` object. After the construction, its
+ * information can be set via an `MediaCodecInfoWriter` object obtained from
+ * `MediaCodecListWriter::addMediaCodecInfo()`.
*/
- MediaCodecInfo(AString name, bool encoder, const char *mime);
- void addQuirk(const char *name);
- status_t addMime(const char *mime);
- status_t updateMime(const char *mime);
+ MediaCodecInfo();
- status_t initializeCapabilities(const sp<Capabilities> &caps);
- void addDetail(const AString &key, const AString &value);
- void addFeature(const AString &key, int32_t value);
- void addFeature(const AString &key, const char *value);
- void removeMime(const char *mime);
- void complete();
+ DISALLOW_COPY_AND_ASSIGN(MediaCodecInfo);
- DISALLOW_EVIL_CONSTRUCTORS(MediaCodecInfo);
-
- friend struct MediaCodecList;
friend class MediaCodecListOverridesTest;
+ friend struct MediaCodecInfoWriter;
+ friend struct MediaCodecListWriter;
+};
+
+/**
+ * This class is to be used by a `MediaCodecListBuilderBase` instance to
+ * populate information inside the associated `MediaCodecInfo` object.
+ *
+ * The only place where an instance of `MediaCodecInfoWriter` can be constructed
+ * is `MediaCodecListWriter::addMediaCodecInfo()`. A `MediaCodecListBuilderBase`
+ * instance should call `MediaCodecListWriter::addMediaCodecInfo()` on the given
+ * `MediaCodecListWriter` object given as an input to
+ * `MediaCodecListBuilderBase::buildMediaCodecList()`.
+ */
+struct MediaCodecInfoWriter {
+ /**
+ * Set the name of the codec.
+ *
+ * @param name The new name.
+ */
+ void setName(const char* name);
+ /**
+ * Set the owner name of the codec.
+ *
+ * This "owner name" is the name of the `IOmx` instance that supports this
+ * codec.
+ *
+ * @param owner The new owner name.
+ */
+ void setOwner(const char* owner);
+ /**
+ * Set whether this codec is an encoder or a decoder.
+ *
+ * @param isEncoder Whether this codec is an encoder or a decoder.
+ */
+ void setEncoder(bool isEncoder = true);
+ /**
+ * Add a mime to an indexed list and return a `CapabilitiesWriter` object
+ * that can be used for modifying the associated `Capabilities`.
+ *
+ * If the mime already exists, this function will return the
+ * `CapabilitiesWriter` associated with the mime.
+ *
+ * @param[in] mime The name of a new mime to add.
+ * @return writer The `CapabilitiesWriter` object for modifying the
+ * `Capabilities` associated with the mime. `writer` will be valid
+ * regardless of whether `mime` already exists or not.
+ */
+ std::unique_ptr<MediaCodecInfo::CapabilitiesWriter> addMime(
+ const char* mime);
+ /**
+ * Remove a mime.
+ *
+ * @param mime The name of the mime to remove.
+ * @return `true` if `mime` is removed; `false` if `mime` is not found.
+ */
+ bool removeMime(const char* mime);
+private:
+ /**
+ * The associated `MediaCodecInfo`.
+ */
+ MediaCodecInfo* mInfo;
+ /**
+ * Construct the `MediaCodecInfoWriter` object associated with the given
+ * `MediaCodecInfo` object.
+ *
+ * @param info The underlying `MediaCodecInfo` object.
+ */
+ MediaCodecInfoWriter(MediaCodecInfo* info);
+
+ DISALLOW_COPY_AND_ASSIGN(MediaCodecInfoWriter);
+
+ friend struct MediaCodecListWriter;
};
} // namespace android
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index ec48561..c9394bb 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -62,9 +62,6 @@
#include "include/SharedMemoryBuffer.h"
#include <media/stagefright/omx/OMXUtils.h>
-#include <android/hidl/allocator/1.0/IAllocator.h>
-#include <android/hidl/memory/1.0/IMemory.h>
-
namespace android {
using binder::Status;
@@ -6344,19 +6341,10 @@
CHECK(mCodec->mOMXNode == NULL);
- OMXClient client;
- bool trebleFlag;
- if (client.connect(&trebleFlag) != OK) {
- mCodec->signalError(OMX_ErrorUndefined, NO_INIT);
- return false;
- }
- mCodec->setTrebleFlag(trebleFlag);
-
- sp<IOMX> omx = client.interface();
-
sp<AMessage> notify = new AMessage(kWhatOMXDied, mCodec);
Vector<AString> matchingCodecs;
+ Vector<AString> owners;
AString mime;
@@ -6364,9 +6352,28 @@
int32_t encoder = false;
if (msg->findString("componentName", &componentName)) {
sp<IMediaCodecList> list = MediaCodecList::getInstance();
- if (list != NULL && list->findCodecByName(componentName.c_str()) >= 0) {
- matchingCodecs.add(componentName);
+ if (list == nullptr) {
+ ALOGE("Unable to obtain MediaCodecList while "
+ "attempting to create codec \"%s\"",
+ componentName.c_str());
+ return false;
}
+ ssize_t index = list->findCodecByName(componentName.c_str());
+ if (index < 0) {
+ ALOGE("Unable to find codec \"%s\"",
+ componentName.c_str());
+ return false;
+ }
+ sp<MediaCodecInfo> info = list->getCodecInfo(index);
+ if (info == nullptr) {
+ ALOGE("Unexpected error (index out-of-bound) while "
+ "retrieving information for codec \"%s\"",
+ componentName.c_str());
+ return false;
+ }
+ matchingCodecs.add(info->getCodecName());
+ owners.add(info->getOwnerName() == nullptr ?
+ "default" : info->getOwnerName());
} else {
CHECK(msg->findString("mime", &mime));
@@ -6378,10 +6385,12 @@
mime.c_str(),
encoder, // createEncoder
0, // flags
- &matchingCodecs);
+ &matchingCodecs,
+ &owners);
}
sp<CodecObserver> observer = new CodecObserver;
+ sp<IOMX> omx;
sp<IOMXNode> omxNode;
status_t err = NAME_NOT_FOUND;
@@ -6389,6 +6398,14 @@
++matchIndex) {
componentName = matchingCodecs[matchIndex];
+ OMXClient client;
+ bool trebleFlag;
+ if (client.connect(owners[matchIndex].c_str(), &trebleFlag) != OK) {
+ mCodec->signalError(OMX_ErrorUndefined, NO_INIT);
+ return false;
+ }
+ omx = client.interface();
+
pid_t tid = gettid();
int prevPriority = androidGetThreadPriority(tid);
androidSetThreadPriority(tid, ANDROID_PRIORITY_FOREGROUND);
@@ -6396,6 +6413,7 @@
androidSetThreadPriority(tid, prevPriority);
if (err == OK) {
+ mCodec->setTrebleFlag(trebleFlag);
break;
} else {
ALOGW("Allocating component '%s' failed, try next one.", componentName.c_str());
@@ -8219,16 +8237,15 @@
}
status_t ACodec::queryCapabilities(
- const AString &name, const AString &mime, bool isEncoder,
- sp<MediaCodecInfo::Capabilities> *caps) {
- (*caps).clear();
- const char *role = GetComponentRole(isEncoder, mime.c_str());
+ const char* owner, const char* name, const char* mime, bool isEncoder,
+ MediaCodecInfo::CapabilitiesWriter* caps) {
+ const char *role = GetComponentRole(isEncoder, mime);
if (role == NULL) {
return BAD_VALUE;
}
OMXClient client;
- status_t err = client.connect();
+ status_t err = client.connect(owner);
if (err != OK) {
return err;
}
@@ -8237,7 +8254,7 @@
sp<CodecObserver> observer = new CodecObserver;
sp<IOMXNode> omxNode;
- err = omx->allocateNode(name.c_str(), observer, &omxNode);
+ err = omx->allocateNode(name, observer, &omxNode);
if (err != OK) {
client.disconnect();
return err;
@@ -8250,8 +8267,7 @@
return err;
}
- sp<MediaCodecInfo::CapabilitiesBuilder> builder = new MediaCodecInfo::CapabilitiesBuilder();
- bool isVideo = mime.startsWithIgnoreCase("video/");
+ bool isVideo = strncasecmp(mime, "video/", 6) == 0;
if (isVideo) {
OMX_VIDEO_PARAM_PROFILELEVELTYPE param;
@@ -8266,22 +8282,22 @@
if (err != OK) {
break;
}
- builder->addProfileLevel(param.eProfile, param.eLevel);
+ caps->addProfileLevel(param.eProfile, param.eLevel);
// AVC components may not list the constrained profiles explicitly, but
// decoders that support a profile also support its constrained version.
// Encoders must explicitly support constrained profiles.
- if (!isEncoder && mime.equalsIgnoreCase(MEDIA_MIMETYPE_VIDEO_AVC)) {
+ if (!isEncoder && strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_AVC) == 0) {
if (param.eProfile == OMX_VIDEO_AVCProfileHigh) {
- builder->addProfileLevel(OMX_VIDEO_AVCProfileConstrainedHigh, param.eLevel);
+ caps->addProfileLevel(OMX_VIDEO_AVCProfileConstrainedHigh, param.eLevel);
} else if (param.eProfile == OMX_VIDEO_AVCProfileBaseline) {
- builder->addProfileLevel(OMX_VIDEO_AVCProfileConstrainedBaseline, param.eLevel);
+ caps->addProfileLevel(OMX_VIDEO_AVCProfileConstrainedBaseline, param.eLevel);
}
}
if (index == kMaxIndicesToCheck) {
ALOGW("[%s] stopping checking profiles after %u: %x/%x",
- name.c_str(), index,
+ name, index,
param.eProfile, param.eLevel);
}
}
@@ -8305,17 +8321,17 @@
if (IsFlexibleColorFormat(
omxNode, portFormat.eColorFormat, false /* usingNativeWindow */,
&flexibleEquivalent)) {
- builder->addColorFormat(flexibleEquivalent);
+ caps->addColorFormat(flexibleEquivalent);
}
- builder->addColorFormat(portFormat.eColorFormat);
+ caps->addColorFormat(portFormat.eColorFormat);
if (index == kMaxIndicesToCheck) {
ALOGW("[%s] stopping checking formats after %u: %s(%x)",
- name.c_str(), index,
+ name, index,
asString(portFormat.eColorFormat), portFormat.eColorFormat);
}
}
- } else if (mime.equalsIgnoreCase(MEDIA_MIMETYPE_AUDIO_AAC)) {
+ } else if (strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC) == 0) {
// More audio codecs if they have profiles.
OMX_AUDIO_PARAM_ANDROID_PROFILETYPE param;
InitOMXParams(¶m);
@@ -8329,11 +8345,11 @@
break;
}
// For audio, level is ignored.
- builder->addProfileLevel(param.eProfile, 0 /* level */);
+ caps->addProfileLevel(param.eProfile, 0 /* level */);
if (index == kMaxIndicesToCheck) {
ALOGW("[%s] stopping checking profiles after %u: %x",
- name.c_str(), index,
+ name, index,
param.eProfile);
}
}
@@ -8341,7 +8357,7 @@
// NOTE: Without Android extensions, OMX does not provide a way to query
// AAC profile support
if (param.nProfileIndex == 0) {
- ALOGW("component %s doesn't support profile query.", name.c_str());
+ ALOGW("component %s doesn't support profile query.", name);
}
}
@@ -8350,14 +8366,14 @@
if (omxNode->configureVideoTunnelMode(
kPortIndexOutput, OMX_TRUE, 0, &sidebandHandle) == OK) {
// tunneled playback includes adaptive playback
- builder->addFlags(MediaCodecInfo::Capabilities::kFlagSupportsAdaptivePlayback
+ caps->addFlags(MediaCodecInfo::Capabilities::kFlagSupportsAdaptivePlayback
| MediaCodecInfo::Capabilities::kFlagSupportsTunneledPlayback);
} else if (omxNode->setPortMode(
kPortIndexOutput, IOMX::kPortModeDynamicANWBuffer) == OK ||
omxNode->prepareForAdaptivePlayback(
kPortIndexOutput, OMX_TRUE,
1280 /* width */, 720 /* height */) == OK) {
- builder->addFlags(MediaCodecInfo::Capabilities::kFlagSupportsAdaptivePlayback);
+ caps->addFlags(MediaCodecInfo::Capabilities::kFlagSupportsAdaptivePlayback);
}
}
@@ -8369,11 +8385,10 @@
if (omxNode->getConfig(
(OMX_INDEXTYPE)OMX_IndexConfigAndroidIntraRefresh,
¶ms, sizeof(params)) == OK) {
- builder->addFlags(MediaCodecInfo::Capabilities::kFlagSupportsIntraRefresh);
+ caps->addFlags(MediaCodecInfo::Capabilities::kFlagSupportsIntraRefresh);
}
}
- *caps = builder;
omxNode->freeNode();
client.disconnect();
return OK;
diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp
index 348abf8..c8d4e4a 100644
--- a/media/libstagefright/Android.bp
+++ b/media/libstagefright/Android.bp
@@ -51,6 +51,7 @@
"NuCachedSource2.cpp",
"NuMediaExtractor.cpp",
"OMXClient.cpp",
+ "OmxInfoBuilder.cpp",
"OggExtractor.cpp",
"SampleIterator.cpp",
"SampleTable.cpp",
@@ -93,6 +94,7 @@
"libnativewindow",
"libmedia_helper",
+ "libstagefright_omx_utils",
"libstagefright_flacdec",
"libstagefright_foundation",
"libstagefright_xmlparser",
@@ -114,7 +116,6 @@
"libstagefright_aacenc",
"libstagefright_matroska",
"libstagefright_mediafilter",
- "libstagefright_omx_utils",
"libstagefright_webm",
"libstagefright_timedtext",
"libvpx",
@@ -124,9 +125,12 @@
"libFLAC",
],
- export_shared_lib_headers: ["libmedia"],
+ export_shared_lib_headers: [
+ "libmedia",
+ "android.hidl.allocator@1.0",
+ ],
+
export_include_dirs: [
- ".",
"include",
],
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 98d101a..3cdb49e 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -429,22 +429,6 @@
}
// static
-status_t MediaCodec::QueryCapabilities(
- const AString &name, const AString &mime, bool isEncoder,
- sp<MediaCodecInfo::Capabilities> *caps /* nonnull */) {
- // TRICKY: this method is used by MediaCodecList/Info during its
- // initialization. As such, we cannot create a MediaCodec instance
- // because that requires an initialized MediaCodecList.
-
- sp<CodecBase> codec = GetCodecBase(name);
- if (codec == NULL) {
- return NAME_NOT_FOUND;
- }
-
- return codec->queryCapabilities(name, mime, isEncoder, caps);
-}
-
-// static
sp<PersistentSurface> MediaCodec::CreatePersistentInputSurface() {
OMXClient client;
if (client.connect() != OK) {
diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp
index 1dcba29..4652594 100644
--- a/media/libstagefright/MediaCodecList.cpp
+++ b/media/libstagefright/MediaCodecList.cpp
@@ -24,17 +24,17 @@
#include <media/IMediaCodecList.h>
#include <media/IMediaPlayerService.h>
-#include <media/IResourceManagerService.h>
+#include <media/IMediaCodecService.h>
#include <media/MediaCodecInfo.h>
-#include <media/MediaResourcePolicy.h>
+#include <media/MediaDefs.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/AMessage.h>
-#include <media/stagefright/ACodec.h>
-#include <media/stagefright/MediaCodec.h>
#include <media/stagefright/MediaCodecList.h>
#include <media/stagefright/MediaErrors.h>
-#include <media/stagefright/OMXClient.h>
+#include <media/stagefright/OmxInfoBuilder.h>
+#include <media/stagefright/omx/OMXUtils.h>
+#include <media/stagefright/xmlparser/MediaCodecsXmlParser.h>
#include <sys/stat.h>
#include <utils/threads.h>
@@ -42,20 +42,20 @@
#include <cutils/properties.h>
#include <expat.h>
+#include <algorithm>
+
namespace android {
-static Mutex sInitMutex;
+namespace {
-static bool parseBoolean(const char *s) {
- if (!strcasecmp(s, "true") || !strcasecmp(s, "yes") || !strcasecmp(s, "y")) {
- return true;
- }
- char *end;
- unsigned long res = strtoul(s, &end, 10);
- return *s != '\0' && *end == '\0' && res > 0;
-}
+Mutex sInitMutex;
-static bool isProfilingNeeded() {
+Mutex sRemoteInitMutex;
+
+constexpr const char* kProfilingResults =
+ MediaCodecsXmlParser::defaultProfilingResultsXmlPath;
+
+bool isProfilingNeeded() {
int8_t value = property_get_bool("debug.stagefright.profilecodec", 0);
if (value == 0) {
return false;
@@ -78,6 +78,10 @@
return profilingNeeded;
}
+OmxInfoBuilder sOmxInfoBuilder;
+
+} // unnamed namespace
+
// static
sp<IMediaCodecList> MediaCodecList::sCodecList;
@@ -86,42 +90,42 @@
ALOGV("Enter profilerThreadWrapper.");
remove(kProfilingResults); // remove previous result so that it won't be loaded to
// the new MediaCodecList
- MediaCodecList *codecList = new MediaCodecList();
+ sp<MediaCodecList> codecList(new MediaCodecList(&sOmxInfoBuilder));
if (codecList->initCheck() != OK) {
ALOGW("Failed to create a new MediaCodecList, skipping codec profiling.");
- delete codecList;
- return NULL;
+ return nullptr;
}
- Vector<sp<MediaCodecInfo>> infos;
- for (size_t i = 0; i < codecList->countCodecs(); ++i) {
- infos.push_back(codecList->getCodecInfo(i));
- }
+ const auto& infos = codecList->mCodecInfos;
ALOGV("Codec profiling started.");
- profileCodecs(infos);
+ profileCodecs(infos, kProfilingResults);
ALOGV("Codec profiling completed.");
- codecList->parseTopLevelXMLFile(kProfilingResults, true /* ignore_errors */);
+ codecList = new MediaCodecList(&sOmxInfoBuilder);
+ if (codecList->initCheck() != OK) {
+ ALOGW("Failed to parse profiling results.");
+ return nullptr;
+ }
{
Mutex::Autolock autoLock(sInitMutex);
sCodecList = codecList;
}
- return NULL;
+ return nullptr;
}
// static
sp<IMediaCodecList> MediaCodecList::getLocalInstance() {
Mutex::Autolock autoLock(sInitMutex);
- if (sCodecList == NULL) {
- MediaCodecList *codecList = new MediaCodecList;
+ if (sCodecList == nullptr) {
+ MediaCodecList *codecList = new MediaCodecList(&sOmxInfoBuilder);
if (codecList->initCheck() == OK) {
sCodecList = codecList;
if (isProfilingNeeded()) {
ALOGV("Codec profiling needed, will be run in separated thread.");
pthread_t profiler;
- if (pthread_create(&profiler, NULL, profilerThreadWrapper, NULL) != 0) {
+ if (pthread_create(&profiler, nullptr, profilerThreadWrapper, nullptr) != 0) {
ALOGW("Failed to create thread for codec profiling.");
}
}
@@ -134,8 +138,6 @@
return sCodecList;
}
-static Mutex sRemoteInitMutex;
-
sp<IMediaCodecList> MediaCodecList::sRemoteList;
sp<MediaCodecList::BinderDeathObserver> MediaCodecList::sBinderDeathObserver;
@@ -149,19 +151,19 @@
// static
sp<IMediaCodecList> MediaCodecList::getInstance() {
Mutex::Autolock _l(sRemoteInitMutex);
- if (sRemoteList == NULL) {
+ if (sRemoteList == nullptr) {
sp<IBinder> binder =
defaultServiceManager()->getService(String16("media.player"));
sp<IMediaPlayerService> service =
interface_cast<IMediaPlayerService>(binder);
- if (service.get() != NULL) {
+ if (service.get() != nullptr) {
sRemoteList = service->getCodecList();
- if (sRemoteList != NULL) {
+ if (sRemoteList != nullptr) {
sBinderDeathObserver = new BinderDeathObserver();
binder->linkToDeath(sBinderDeathObserver.get());
}
}
- if (sRemoteList == NULL) {
+ if (sRemoteList == nullptr) {
// if failed to get remote list, create local list
sRemoteList = getLocalInstance();
}
@@ -169,175 +171,11 @@
return sRemoteList;
}
-// Treblized media codec list will be located in /odm/etc or /vendor/etc.
-static const char *kConfigLocationList[] =
- {"/odm/etc", "/vendor/etc", "/etc"};
-static const int kConfigLocationListSize =
- (sizeof(kConfigLocationList) / sizeof(kConfigLocationList[0]));
-
-#define MEDIA_CODECS_CONFIG_FILE_PATH_MAX_LENGTH 128
-
-static bool findMediaCodecListFileFullPath(const char *file_name, char *out_path) {
- for (int i = 0; i < kConfigLocationListSize; i++) {
- snprintf(out_path,
- MEDIA_CODECS_CONFIG_FILE_PATH_MAX_LENGTH,
- "%s/%s",
- kConfigLocationList[i],
- file_name);
- struct stat file_stat;
- if (stat(out_path, &file_stat) == 0 && S_ISREG(file_stat.st_mode)) {
- return true;
- }
- }
- return false;
-}
-
-MediaCodecList::MediaCodecList()
- : mInitCheck(NO_INIT),
- mUpdate(false),
- mGlobalSettings(new AMessage()) {
- char config_file_path[MEDIA_CODECS_CONFIG_FILE_PATH_MAX_LENGTH];
- if (findMediaCodecListFileFullPath("media_codecs.xml", config_file_path)) {
- parseTopLevelXMLFile(config_file_path);
- }
- if (findMediaCodecListFileFullPath("media_codecs_performance.xml",
- config_file_path)) {
- parseTopLevelXMLFile(config_file_path, true/* ignore_errors */);
- }
- parseTopLevelXMLFile(kProfilingResults, true/* ignore_errors */);
-}
-
-void MediaCodecList::parseTopLevelXMLFile(const char *codecs_xml, bool ignore_errors) {
- // get href_base
- const char *href_base_end = strrchr(codecs_xml, '/');
- if (href_base_end != NULL) {
- mHrefBase = AString(codecs_xml, href_base_end - codecs_xml + 1);
- }
-
- mInitCheck = OK; // keeping this here for safety
- mCurrentSection = SECTION_TOPLEVEL;
- mDepth = 0;
-
- OMXClient client;
- mInitCheck = client.connect();
- if (mInitCheck != OK) {
- return; // this may fail if IMediaPlayerService is not available.
- }
- parseXMLFile(codecs_xml);
-
- if (mInitCheck != OK) {
- if (ignore_errors) {
- mInitCheck = OK;
- return;
- }
- mCodecInfos.clear();
- return;
- }
-
- Vector<MediaResourcePolicy> policies;
- AString value;
- if (mGlobalSettings->findString(kPolicySupportsMultipleSecureCodecs, &value)) {
- policies.push_back(
- MediaResourcePolicy(
- String8(kPolicySupportsMultipleSecureCodecs),
- String8(value.c_str())));
- }
- if (mGlobalSettings->findString(kPolicySupportsSecureWithNonSecureCodec, &value)) {
- policies.push_back(
- MediaResourcePolicy(
- String8(kPolicySupportsSecureWithNonSecureCodec),
- String8(value.c_str())));
- }
- if (policies.size() > 0) {
- sp<IServiceManager> sm = defaultServiceManager();
- sp<IBinder> binder = sm->getService(String16("media.resource_manager"));
- sp<IResourceManagerService> service = interface_cast<IResourceManagerService>(binder);
- if (service == NULL) {
- ALOGE("MediaCodecList: failed to get ResourceManagerService");
- } else {
- service->config(policies);
- }
- }
-
- for (size_t i = mCodecInfos.size(); i > 0;) {
- i--;
- const MediaCodecInfo &info = *mCodecInfos.itemAt(i).get();
- if (info.mCaps.size() == 0) {
- // No types supported by this component???
- ALOGW("Component %s does not support any type of media?",
- info.mName.c_str());
-
- mCodecInfos.removeAt(i);
-#if LOG_NDEBUG == 0
- } else {
- for (size_t type_ix = 0; type_ix < info.mCaps.size(); ++type_ix) {
- AString mime = info.mCaps.keyAt(type_ix);
- const sp<MediaCodecInfo::Capabilities> &caps = info.mCaps.valueAt(type_ix);
-
- ALOGV("%s codec info for %s: %s", info.mName.c_str(), mime.c_str(),
- caps->getDetails()->debugString().c_str());
- ALOGV(" flags=%d", caps->getFlags());
- {
- Vector<uint32_t> colorFormats;
- caps->getSupportedColorFormats(&colorFormats);
- AString nice;
- for (size_t ix = 0; ix < colorFormats.size(); ix++) {
- if (ix > 0) {
- nice.append(", ");
- }
- nice.append(colorFormats.itemAt(ix));
- }
- ALOGV(" colors=[%s]", nice.c_str());
- }
- {
- Vector<MediaCodecInfo::ProfileLevel> profileLevels;
- caps->getSupportedProfileLevels(&profileLevels);
- AString nice;
- for (size_t ix = 0; ix < profileLevels.size(); ix++) {
- if (ix > 0) {
- nice.append(", ");
- }
- const MediaCodecInfo::ProfileLevel &pl =
- profileLevels.itemAt(ix);
- nice.append(pl.mProfile);
- nice.append("/");
- nice.append(pl.mLevel);
- }
- ALOGV(" levels=[%s]", nice.c_str());
- }
- {
- AString quirks;
- for (size_t ix = 0; ix < info.mQuirks.size(); ix++) {
- if (ix > 0) {
- quirks.append(", ");
- }
- quirks.append(info.mQuirks[ix]);
- }
- ALOGV(" quirks=[%s]", quirks.c_str());
- }
- }
-#endif
- }
- }
-
-#if 0
- for (size_t i = 0; i < mCodecInfos.size(); ++i) {
- const CodecInfo &info = mCodecInfos.itemAt(i);
-
- AString line = info.mName;
- line.append(" supports ");
- for (size_t j = 0; j < mTypes.size(); ++j) {
- uint32_t value = mTypes.valueAt(j);
-
- if (info.mTypes & (1ul << value)) {
- line.append(mTypes.keyAt(j));
- line.append(" ");
- }
- }
-
- ALOGI("%s", line.c_str());
- }
-#endif
+MediaCodecList::MediaCodecList(MediaCodecListBuilderBase* builder) {
+ mGlobalSettings = new AMessage();
+ mCodecInfos.clear();
+ MediaCodecListWriter writer(this);
+ mInitCheck = builder->buildMediaCodecList(&writer);
}
MediaCodecList::~MediaCodecList() {
@@ -347,531 +185,21 @@
return mInitCheck;
}
-void MediaCodecList::parseXMLFile(const char *path) {
- FILE *file = fopen(path, "r");
-
- if (file == NULL) {
- ALOGW("unable to open media codecs configuration xml file: %s", path);
- mInitCheck = NAME_NOT_FOUND;
- return;
- }
-
- XML_Parser parser = ::XML_ParserCreate(NULL);
- CHECK(parser != NULL);
-
- ::XML_SetUserData(parser, this);
- ::XML_SetElementHandler(
- parser, StartElementHandlerWrapper, EndElementHandlerWrapper);
-
- const int BUFF_SIZE = 512;
- while (mInitCheck == OK) {
- void *buff = ::XML_GetBuffer(parser, BUFF_SIZE);
- if (buff == NULL) {
- ALOGE("failed in call to XML_GetBuffer()");
- mInitCheck = UNKNOWN_ERROR;
- break;
- }
-
- int bytes_read = ::fread(buff, 1, BUFF_SIZE, file);
- if (bytes_read < 0) {
- ALOGE("failed in call to read");
- mInitCheck = ERROR_IO;
- break;
- }
-
- XML_Status status = ::XML_ParseBuffer(parser, bytes_read, bytes_read == 0);
- if (status != XML_STATUS_OK) {
- ALOGE("malformed (%s)", ::XML_ErrorString(::XML_GetErrorCode(parser)));
- mInitCheck = ERROR_MALFORMED;
- break;
- }
-
- if (bytes_read == 0) {
- break;
- }
- }
-
- ::XML_ParserFree(parser);
-
- fclose(file);
- file = NULL;
+MediaCodecListWriter::MediaCodecListWriter(MediaCodecList* list) :
+ mList(list) {
}
-// static
-void MediaCodecList::StartElementHandlerWrapper(
- void *me, const char *name, const char **attrs) {
- static_cast<MediaCodecList *>(me)->startElementHandler(name, attrs);
+void MediaCodecListWriter::addGlobalSetting(
+ const char* key, const char* value) {
+ mList->mGlobalSettings->setString(key, value);
}
-// static
-void MediaCodecList::EndElementHandlerWrapper(void *me, const char *name) {
- static_cast<MediaCodecList *>(me)->endElementHandler(name);
-}
-
-status_t MediaCodecList::includeXMLFile(const char **attrs) {
- const char *href = NULL;
- size_t i = 0;
- while (attrs[i] != NULL) {
- if (!strcmp(attrs[i], "href")) {
- if (attrs[i + 1] == NULL) {
- return -EINVAL;
- }
- href = attrs[i + 1];
- ++i;
- } else {
- return -EINVAL;
- }
- ++i;
- }
-
- // For security reasons and for simplicity, file names can only contain
- // [a-zA-Z0-9_.] and must start with media_codecs_ and end with .xml
- for (i = 0; href[i] != '\0'; i++) {
- if (href[i] == '.' || href[i] == '_' ||
- (href[i] >= '0' && href[i] <= '9') ||
- (href[i] >= 'A' && href[i] <= 'Z') ||
- (href[i] >= 'a' && href[i] <= 'z')) {
- continue;
- }
- ALOGE("invalid include file name: %s", href);
- return -EINVAL;
- }
-
- AString filename = href;
- if (!filename.startsWith("media_codecs_") ||
- !filename.endsWith(".xml")) {
- ALOGE("invalid include file name: %s", href);
- return -EINVAL;
- }
- filename.insert(mHrefBase, 0);
-
- parseXMLFile(filename.c_str());
- return mInitCheck;
-}
-
-void MediaCodecList::startElementHandler(
- const char *name, const char **attrs) {
- if (mInitCheck != OK) {
- return;
- }
-
- bool inType = true;
-
- if (!strcmp(name, "Include")) {
- mInitCheck = includeXMLFile(attrs);
- if (mInitCheck == OK) {
- mPastSections.push(mCurrentSection);
- mCurrentSection = SECTION_INCLUDE;
- }
- ++mDepth;
- return;
- }
-
- switch (mCurrentSection) {
- case SECTION_TOPLEVEL:
- {
- if (!strcmp(name, "Decoders")) {
- mCurrentSection = SECTION_DECODERS;
- } else if (!strcmp(name, "Encoders")) {
- mCurrentSection = SECTION_ENCODERS;
- } else if (!strcmp(name, "Settings")) {
- mCurrentSection = SECTION_SETTINGS;
- }
- break;
- }
-
- case SECTION_SETTINGS:
- {
- if (!strcmp(name, "Setting")) {
- mInitCheck = addSettingFromAttributes(attrs);
- }
- break;
- }
-
- case SECTION_DECODERS:
- {
- if (!strcmp(name, "MediaCodec")) {
- mInitCheck =
- addMediaCodecFromAttributes(false /* encoder */, attrs);
-
- mCurrentSection = SECTION_DECODER;
- }
- break;
- }
-
- case SECTION_ENCODERS:
- {
- if (!strcmp(name, "MediaCodec")) {
- mInitCheck =
- addMediaCodecFromAttributes(true /* encoder */, attrs);
-
- mCurrentSection = SECTION_ENCODER;
- }
- break;
- }
-
- case SECTION_DECODER:
- case SECTION_ENCODER:
- {
- if (!strcmp(name, "Quirk")) {
- mInitCheck = addQuirk(attrs);
- } else if (!strcmp(name, "Type")) {
- mInitCheck = addTypeFromAttributes(attrs);
- mCurrentSection =
- (mCurrentSection == SECTION_DECODER
- ? SECTION_DECODER_TYPE : SECTION_ENCODER_TYPE);
- }
- }
- inType = false;
- // fall through
-
- case SECTION_DECODER_TYPE:
- case SECTION_ENCODER_TYPE:
- {
- // ignore limits and features specified outside of type
- bool outside = !inType && !mCurrentInfo->mHasSoleMime;
- if (outside && (!strcmp(name, "Limit") || !strcmp(name, "Feature"))) {
- ALOGW("ignoring %s specified outside of a Type", name);
- } else if (!strcmp(name, "Limit")) {
- mInitCheck = addLimit(attrs);
- } else if (!strcmp(name, "Feature")) {
- mInitCheck = addFeature(attrs);
- }
- break;
- }
-
- default:
- break;
- }
-
- ++mDepth;
-}
-
-void MediaCodecList::endElementHandler(const char *name) {
- if (mInitCheck != OK) {
- return;
- }
-
- switch (mCurrentSection) {
- case SECTION_SETTINGS:
- {
- if (!strcmp(name, "Settings")) {
- mCurrentSection = SECTION_TOPLEVEL;
- }
- break;
- }
-
- case SECTION_DECODERS:
- {
- if (!strcmp(name, "Decoders")) {
- mCurrentSection = SECTION_TOPLEVEL;
- }
- break;
- }
-
- case SECTION_ENCODERS:
- {
- if (!strcmp(name, "Encoders")) {
- mCurrentSection = SECTION_TOPLEVEL;
- }
- break;
- }
-
- case SECTION_DECODER_TYPE:
- case SECTION_ENCODER_TYPE:
- {
- if (!strcmp(name, "Type")) {
- mCurrentSection =
- (mCurrentSection == SECTION_DECODER_TYPE
- ? SECTION_DECODER : SECTION_ENCODER);
-
- mCurrentInfo->complete();
- }
- break;
- }
-
- case SECTION_DECODER:
- {
- if (!strcmp(name, "MediaCodec")) {
- mCurrentSection = SECTION_DECODERS;
- mCurrentInfo->complete();
- mCurrentInfo = NULL;
- }
- break;
- }
-
- case SECTION_ENCODER:
- {
- if (!strcmp(name, "MediaCodec")) {
- mCurrentSection = SECTION_ENCODERS;
- mCurrentInfo->complete();;
- mCurrentInfo = NULL;
- }
- break;
- }
-
- case SECTION_INCLUDE:
- {
- if (!strcmp(name, "Include") && mPastSections.size() > 0) {
- mCurrentSection = mPastSections.top();
- mPastSections.pop();
- }
- break;
- }
-
- default:
- break;
- }
-
- --mDepth;
-}
-
-status_t MediaCodecList::addSettingFromAttributes(const char **attrs) {
- const char *name = NULL;
- const char *value = NULL;
- const char *update = NULL;
-
- size_t i = 0;
- while (attrs[i] != NULL) {
- if (!strcmp(attrs[i], "name")) {
- if (attrs[i + 1] == NULL) {
- return -EINVAL;
- }
- name = attrs[i + 1];
- ++i;
- } else if (!strcmp(attrs[i], "value")) {
- if (attrs[i + 1] == NULL) {
- return -EINVAL;
- }
- value = attrs[i + 1];
- ++i;
- } else if (!strcmp(attrs[i], "update")) {
- if (attrs[i + 1] == NULL) {
- return -EINVAL;
- }
- update = attrs[i + 1];
- ++i;
- } else {
- return -EINVAL;
- }
-
- ++i;
- }
-
- if (name == NULL || value == NULL) {
- return -EINVAL;
- }
-
- mUpdate = (update != NULL) && parseBoolean(update);
- if (mUpdate != mGlobalSettings->contains(name)) {
- return -EINVAL;
- }
-
- mGlobalSettings->setString(name, value);
- return OK;
-}
-
-void MediaCodecList::setCurrentCodecInfo(bool encoder, const char *name, const char *type) {
- for (size_t i = 0; i < mCodecInfos.size(); ++i) {
- if (AString(name) == mCodecInfos[i]->getCodecName()) {
- if (mCodecInfos[i]->getCapabilitiesFor(type) == NULL) {
- ALOGW("Overrides with an unexpected mime %s", type);
- // Create a new MediaCodecInfo (but don't add it to mCodecInfos) to hold the
- // overrides we don't want.
- mCurrentInfo = new MediaCodecInfo(name, encoder, type);
- } else {
- mCurrentInfo = mCodecInfos.editItemAt(i);
- mCurrentInfo->updateMime(type); // to set the current cap
- }
- return;
- }
- }
- mCurrentInfo = new MediaCodecInfo(name, encoder, type);
- // The next step involves trying to load the codec, which may
- // fail. Only list the codec if this succeeds.
- // However, keep mCurrentInfo object around until parsing
- // of full codec info is completed.
- if (initializeCapabilities(type) == OK) {
- mCodecInfos.push_back(mCurrentInfo);
- }
-}
-
-status_t MediaCodecList::addMediaCodecFromAttributes(
- bool encoder, const char **attrs) {
- const char *name = NULL;
- const char *type = NULL;
- const char *update = NULL;
-
- size_t i = 0;
- while (attrs[i] != NULL) {
- if (!strcmp(attrs[i], "name")) {
- if (attrs[i + 1] == NULL) {
- return -EINVAL;
- }
- name = attrs[i + 1];
- ++i;
- } else if (!strcmp(attrs[i], "type")) {
- if (attrs[i + 1] == NULL) {
- return -EINVAL;
- }
- type = attrs[i + 1];
- ++i;
- } else if (!strcmp(attrs[i], "update")) {
- if (attrs[i + 1] == NULL) {
- return -EINVAL;
- }
- update = attrs[i + 1];
- ++i;
- } else {
- return -EINVAL;
- }
-
- ++i;
- }
-
- if (name == NULL) {
- return -EINVAL;
- }
-
- mUpdate = (update != NULL) && parseBoolean(update);
- ssize_t index = -1;
- for (size_t i = 0; i < mCodecInfos.size(); ++i) {
- if (AString(name) == mCodecInfos[i]->getCodecName()) {
- index = i;
- }
- }
- if (mUpdate != (index >= 0)) {
- return -EINVAL;
- }
-
- if (index >= 0) {
- // existing codec
- mCurrentInfo = mCodecInfos.editItemAt(index);
- if (type != NULL) {
- // existing type
- if (mCodecInfos[index]->getCapabilitiesFor(type) == NULL) {
- return -EINVAL;
- }
- mCurrentInfo->updateMime(type);
- }
- } else {
- // new codec
- mCurrentInfo = new MediaCodecInfo(name, encoder, type);
- // The next step involves trying to load the codec, which may
- // fail. Only list the codec if this succeeds.
- // However, keep mCurrentInfo object around until parsing
- // of full codec info is completed.
- if (initializeCapabilities(type) == OK) {
- mCodecInfos.push_back(mCurrentInfo);
- }
- }
-
- return OK;
-}
-
-status_t MediaCodecList::initializeCapabilities(const char *type) {
- if (type == NULL) {
- return OK;
- }
-
- ALOGV("initializeCapabilities %s:%s",
- mCurrentInfo->mName.c_str(), type);
-
- sp<MediaCodecInfo::Capabilities> caps;
- status_t err = MediaCodec::QueryCapabilities(
- mCurrentInfo->mName,
- type,
- mCurrentInfo->mIsEncoder,
- &caps);
- if (err != OK) {
- return err;
- } else if (caps == NULL) {
- ALOGE("MediaCodec::QueryCapabilities returned OK but no capabilities for '%s':'%s':'%s'",
- mCurrentInfo->mName.c_str(), type,
- mCurrentInfo->mIsEncoder ? "encoder" : "decoder");
- return UNKNOWN_ERROR;
- }
-
- return mCurrentInfo->initializeCapabilities(caps);
-}
-
-status_t MediaCodecList::addQuirk(const char **attrs) {
- const char *name = NULL;
-
- size_t i = 0;
- while (attrs[i] != NULL) {
- if (!strcmp(attrs[i], "name")) {
- if (attrs[i + 1] == NULL) {
- return -EINVAL;
- }
- name = attrs[i + 1];
- ++i;
- } else {
- return -EINVAL;
- }
-
- ++i;
- }
-
- if (name == NULL) {
- return -EINVAL;
- }
-
- mCurrentInfo->addQuirk(name);
- return OK;
-}
-
-status_t MediaCodecList::addTypeFromAttributes(const char **attrs) {
- const char *name = NULL;
- const char *update = NULL;
-
- size_t i = 0;
- while (attrs[i] != NULL) {
- if (!strcmp(attrs[i], "name")) {
- if (attrs[i + 1] == NULL) {
- return -EINVAL;
- }
- name = attrs[i + 1];
- ++i;
- } else if (!strcmp(attrs[i], "update")) {
- if (attrs[i + 1] == NULL) {
- return -EINVAL;
- }
- update = attrs[i + 1];
- ++i;
- } else {
- return -EINVAL;
- }
-
- ++i;
- }
-
- if (name == NULL) {
- return -EINVAL;
- }
-
- bool isExistingType = (mCurrentInfo->getCapabilitiesFor(name) != NULL);
- if (mUpdate != isExistingType) {
- return -EINVAL;
- }
-
- status_t ret;
- if (mUpdate) {
- ret = mCurrentInfo->updateMime(name);
- } else {
- ret = mCurrentInfo->addMime(name);
- }
-
- if (ret != OK) {
- return ret;
- }
-
- // The next step involves trying to load the codec, which may
- // fail. Handle this gracefully (by not reporting such mime).
- if (!mUpdate && initializeCapabilities(name) != OK) {
- mCurrentInfo->removeMime(name);
- }
- return OK;
+std::unique_ptr<MediaCodecInfoWriter>
+ MediaCodecListWriter::addMediaCodecInfo() {
+ sp<MediaCodecInfo> info = new MediaCodecInfo();
+ mList->mCodecInfos.push_back(info);
+ return std::unique_ptr<MediaCodecInfoWriter>(
+ new MediaCodecInfoWriter(info.get()));
}
// legacy method for non-advanced codecs
@@ -882,15 +210,15 @@
"feature-tunneled-playback",
};
- size_t numCodecs = mCodecInfos.size();
- for (; startIndex < numCodecs; ++startIndex) {
- const MediaCodecInfo &info = *mCodecInfos.itemAt(startIndex).get();
+ size_t numCodecInfos = mCodecInfos.size();
+ for (; startIndex < numCodecInfos; ++startIndex) {
+ const MediaCodecInfo &info = *mCodecInfos[startIndex];
if (info.isEncoder() != encoder) {
continue;
}
sp<MediaCodecInfo::Capabilities> capabilities = info.getCapabilitiesFor(type);
- if (capabilities == NULL) {
+ if (capabilities == nullptr) {
continue;
}
const sp<AMessage> &details = capabilities->getDetails();
@@ -913,223 +241,9 @@
return -ENOENT;
}
-static status_t limitFoundMissingAttr(const AString &name, const char *attr, bool found = true) {
- ALOGE("limit '%s' with %s'%s' attribute", name.c_str(),
- (found ? "" : "no "), attr);
- return -EINVAL;
-}
-
-static status_t limitError(const AString &name, const char *msg) {
- ALOGE("limit '%s' %s", name.c_str(), msg);
- return -EINVAL;
-}
-
-static status_t limitInvalidAttr(const AString &name, const char *attr, const AString &value) {
- ALOGE("limit '%s' with invalid '%s' attribute (%s)", name.c_str(),
- attr, value.c_str());
- return -EINVAL;
-}
-
-status_t MediaCodecList::addLimit(const char **attrs) {
- sp<AMessage> msg = new AMessage();
-
- size_t i = 0;
- while (attrs[i] != NULL) {
- if (attrs[i + 1] == NULL) {
- return -EINVAL;
- }
-
- // attributes with values
- if (!strcmp(attrs[i], "name")
- || !strcmp(attrs[i], "default")
- || !strcmp(attrs[i], "in")
- || !strcmp(attrs[i], "max")
- || !strcmp(attrs[i], "min")
- || !strcmp(attrs[i], "range")
- || !strcmp(attrs[i], "ranges")
- || !strcmp(attrs[i], "scale")
- || !strcmp(attrs[i], "value")) {
- msg->setString(attrs[i], attrs[i + 1]);
- ++i;
- } else {
- return -EINVAL;
- }
- ++i;
- }
-
- AString name;
- if (!msg->findString("name", &name)) {
- ALOGE("limit with no 'name' attribute");
- return -EINVAL;
- }
-
- // size, blocks, bitrate, frame-rate, blocks-per-second, aspect-ratio,
- // measured-frame-rate, measured-blocks-per-second: range
- // quality: range + default + [scale]
- // complexity: range + default
- bool found;
-
- if (name == "aspect-ratio" || name == "bitrate" || name == "block-count"
- || name == "blocks-per-second" || name == "complexity"
- || name == "frame-rate" || name == "quality" || name == "size"
- || name == "measured-blocks-per-second" || name.startsWith("measured-frame-rate-")) {
- AString min, max;
- if (msg->findString("min", &min) && msg->findString("max", &max)) {
- min.append("-");
- min.append(max);
- if (msg->contains("range") || msg->contains("value")) {
- return limitError(name, "has 'min' and 'max' as well as 'range' or "
- "'value' attributes");
- }
- msg->setString("range", min);
- } else if (msg->contains("min") || msg->contains("max")) {
- return limitError(name, "has only 'min' or 'max' attribute");
- } else if (msg->findString("value", &max)) {
- min = max;
- min.append("-");
- min.append(max);
- if (msg->contains("range")) {
- return limitError(name, "has both 'range' and 'value' attributes");
- }
- msg->setString("range", min);
- }
-
- AString range, scale = "linear", def, in_;
- if (!msg->findString("range", &range)) {
- return limitError(name, "with no 'range', 'value' or 'min'/'max' attributes");
- }
-
- if ((name == "quality" || name == "complexity") ^
- (found = msg->findString("default", &def))) {
- return limitFoundMissingAttr(name, "default", found);
- }
- if (name != "quality" && msg->findString("scale", &scale)) {
- return limitFoundMissingAttr(name, "scale");
- }
- if ((name == "aspect-ratio") ^ (found = msg->findString("in", &in_))) {
- return limitFoundMissingAttr(name, "in", found);
- }
-
- if (name == "aspect-ratio") {
- if (!(in_ == "pixels") && !(in_ == "blocks")) {
- return limitInvalidAttr(name, "in", in_);
- }
- in_.erase(5, 1); // (pixel|block)-aspect-ratio
- in_.append("-");
- in_.append(name);
- name = in_;
- }
- if (name == "quality") {
- mCurrentInfo->addDetail("quality-scale", scale);
- }
- if (name == "quality" || name == "complexity") {
- AString tag = name;
- tag.append("-default");
- mCurrentInfo->addDetail(tag, def);
- }
- AString tag = name;
- tag.append("-range");
- mCurrentInfo->addDetail(tag, range);
- } else {
- AString max, value, ranges;
- if (msg->contains("default")) {
- return limitFoundMissingAttr(name, "default");
- } else if (msg->contains("in")) {
- return limitFoundMissingAttr(name, "in");
- } else if ((name == "channel-count" || name == "concurrent-instances") ^
- (found = msg->findString("max", &max))) {
- return limitFoundMissingAttr(name, "max", found);
- } else if (msg->contains("min")) {
- return limitFoundMissingAttr(name, "min");
- } else if (msg->contains("range")) {
- return limitFoundMissingAttr(name, "range");
- } else if ((name == "sample-rate") ^
- (found = msg->findString("ranges", &ranges))) {
- return limitFoundMissingAttr(name, "ranges", found);
- } else if (msg->contains("scale")) {
- return limitFoundMissingAttr(name, "scale");
- } else if ((name == "alignment" || name == "block-size") ^
- (found = msg->findString("value", &value))) {
- return limitFoundMissingAttr(name, "value", found);
- }
-
- if (max.size()) {
- AString tag = "max-";
- tag.append(name);
- mCurrentInfo->addDetail(tag, max);
- } else if (value.size()) {
- mCurrentInfo->addDetail(name, value);
- } else if (ranges.size()) {
- AString tag = name;
- tag.append("-ranges");
- mCurrentInfo->addDetail(tag, ranges);
- } else {
- ALOGW("Ignoring unrecognized limit '%s'", name.c_str());
- }
- }
- return OK;
-}
-
-status_t MediaCodecList::addFeature(const char **attrs) {
- size_t i = 0;
- const char *name = NULL;
- int32_t optional = -1;
- int32_t required = -1;
- const char *value = NULL;
-
- while (attrs[i] != NULL) {
- if (attrs[i + 1] == NULL) {
- return -EINVAL;
- }
-
- // attributes with values
- if (!strcmp(attrs[i], "name")) {
- name = attrs[i + 1];
- ++i;
- } else if (!strcmp(attrs[i], "optional") || !strcmp(attrs[i], "required")) {
- int value = (int)parseBoolean(attrs[i + 1]);
- if (!strcmp(attrs[i], "optional")) {
- optional = value;
- } else {
- required = value;
- }
- ++i;
- } else if (!strcmp(attrs[i], "value")) {
- value = attrs[i + 1];
- ++i;
- } else {
- return -EINVAL;
- }
- ++i;
- }
- if (name == NULL) {
- ALOGE("feature with no 'name' attribute");
- return -EINVAL;
- }
-
- if (optional == required && optional != -1) {
- ALOGE("feature '%s' is both/neither optional and required", name);
- return -EINVAL;
- }
-
- if ((optional != -1 || required != -1) && (value != NULL)) {
- ALOGE("feature '%s' has both a value and optional/required attribute", name);
- return -EINVAL;
- }
-
- if (value != NULL) {
- mCurrentInfo->addFeature(name, value);
- } else {
- mCurrentInfo->addFeature(name, (required == 1) || (optional == 0));
- }
- return OK;
-}
-
ssize_t MediaCodecList::findCodecByName(const char *name) const {
for (size_t i = 0; i < mCodecInfos.size(); ++i) {
- const MediaCodecInfo &info = *mCodecInfos.itemAt(i).get();
-
- if (info.mName == name) {
+ if (strcmp(mCodecInfos[i]->getCodecName(), name) == 0) {
return i;
}
}
@@ -1167,11 +281,15 @@
//static
void MediaCodecList::findMatchingCodecs(
- const char *mime, bool encoder, uint32_t flags, Vector<AString> *matches) {
+ const char *mime, bool encoder, uint32_t flags,
+ Vector<AString> *matches, Vector<AString> *owners) {
matches->clear();
+ if (owners != nullptr) {
+ owners->clear();
+ }
const sp<IMediaCodecList> list = getInstance();
- if (list == NULL) {
+ if (list == nullptr) {
return;
}
@@ -1187,45 +305,27 @@
index = matchIndex + 1;
const sp<MediaCodecInfo> info = list->getCodecInfo(matchIndex);
- CHECK(info != NULL);
+ CHECK(info != nullptr);
AString componentName = info->getCodecName();
if ((flags & kHardwareCodecsOnly) && isSoftwareCodec(componentName)) {
ALOGV("skipping SW codec '%s'", componentName.c_str());
} else {
matches->push(componentName);
+ if (owners != nullptr) {
+ owners->push(AString(info->getOwnerName()));
+ }
ALOGV("matching '%s'", componentName.c_str());
}
}
- if (flags & kPreferSoftwareCodecs || property_get_bool("debug.stagefright.swcodec", false)) {
+ if (flags & kPreferSoftwareCodecs ||
+ property_get_bool("debug.stagefright.swcodec", false)) {
matches->sort(compareSoftwareCodecsFirst);
}
}
-// static
-uint32_t MediaCodecList::getQuirksFor(const char *componentName) {
- const sp<IMediaCodecList> list = getInstance();
- if (list == NULL) {
- return 0;
- }
-
- ssize_t ix = list->findCodecByName(componentName);
- if (ix < 0) {
- return 0;
- }
-
- const sp<MediaCodecInfo> info = list->getCodecInfo(ix);
-
- uint32_t quirks = 0;
- if (info->hasQuirk("requires-allocate-on-input-ports")) {
- quirks |= ACodec::kRequiresAllocateBufferOnInputPorts;
- }
- if (info->hasQuirk("requires-allocate-on-output-ports")) {
- quirks |= ACodec::kRequiresAllocateBufferOnOutputPorts;
- }
-
- return quirks;
+MediaCodecListBuilderBase::~MediaCodecListBuilderBase() {
}
} // namespace android
diff --git a/media/libstagefright/MediaCodecListOverrides.cpp b/media/libstagefright/MediaCodecListOverrides.cpp
index 095fc6a..6920e51 100644
--- a/media/libstagefright/MediaCodecListOverrides.cpp
+++ b/media/libstagefright/MediaCodecListOverrides.cpp
@@ -33,8 +33,6 @@
namespace android {
-const char *kProfilingResults = "/data/misc/media/media_codecs_profiling_results.xml";
-
AString getProfilingVersionString() {
char val[PROPERTY_VALUE_MAX];
if (property_get("ro.build.display.id", val, NULL) && (strlen(val) > 0)) {
@@ -205,24 +203,24 @@
return true;
}
-void profileCodecs(const Vector<sp<MediaCodecInfo>> &infos) {
+void profileCodecs(const std::vector<sp<MediaCodecInfo>> &infos,
+ const char* profilingResults) {
CodecSettings global_results;
KeyedVector<AString, CodecSettings> encoder_results;
KeyedVector<AString, CodecSettings> decoder_results;
profileCodecs(infos, &global_results, &encoder_results, &decoder_results);
- exportResultsToXML(kProfilingResults, global_results, encoder_results, decoder_results);
+ exportResultsToXML(profilingResults, global_results, encoder_results, decoder_results);
}
void profileCodecs(
- const Vector<sp<MediaCodecInfo>> &infos,
+ const std::vector<sp<MediaCodecInfo>> &infos,
CodecSettings *global_results,
KeyedVector<AString, CodecSettings> *encoder_results,
KeyedVector<AString, CodecSettings> *decoder_results,
bool forceToMeasure) {
KeyedVector<AString, sp<MediaCodecInfo::Capabilities>> codecsNeedMeasure;
AString supportMultipleSecureCodecs = "true";
- for (size_t i = 0; i < infos.size(); ++i) {
- const sp<MediaCodecInfo> info = infos[i];
+ for (const auto& info : infos) {
AString name = info->getCodecName();
if (name.startsWith("OMX.google.") ||
// TODO: reenable below codecs once fixed
diff --git a/media/libstagefright/MediaCodecListOverrides.h b/media/libstagefright/MediaCodecListOverrides.h
index d4bb225..4f8c2f5 100644
--- a/media/libstagefright/MediaCodecListOverrides.h
+++ b/media/libstagefright/MediaCodecListOverrides.h
@@ -23,12 +23,10 @@
#include <utils/StrongPointer.h>
#include <utils/KeyedVector.h>
+#include <vector>
namespace android {
-extern const char *kProfilingVersionString;
-extern const char *kProfilingResults;
-
struct MediaCodecInfo;
AString getProfilingVersionString();
@@ -36,11 +34,12 @@
bool splitString(const AString &s, const AString &delimiter, AString *s1, AString *s2);
// profile codecs and save the result to xml file named kProfilingResults.
-void profileCodecs(const Vector<sp<MediaCodecInfo>> &infos);
+void profileCodecs(const std::vector<sp<MediaCodecInfo>> &infos,
+ const char* profilingResults);
// profile codecs and save the result to global_results, encoder_results and decoder_results.
void profileCodecs(
- const Vector<sp<MediaCodecInfo>> &infos,
+ const std::vector<sp<MediaCodecInfo>> &infos,
CodecSettings *global_results,
KeyedVector<AString, CodecSettings> *encoder_results,
KeyedVector<AString, CodecSettings> *decoder_results,
diff --git a/media/libstagefright/OMXClient.cpp b/media/libstagefright/OMXClient.cpp
index 5f9aa01..5f50e46 100644
--- a/media/libstagefright/OMXClient.cpp
+++ b/media/libstagefright/OMXClient.cpp
@@ -38,7 +38,7 @@
}
status_t OMXClient::connect() {
- return connect(nullptr);
+ return connect("default", nullptr);
}
status_t OMXClient::connect(bool* trebleFlag) {
@@ -54,6 +54,19 @@
return connectLegacy();
}
+status_t OMXClient::connect(const char* name, bool* trebleFlag) {
+ if (property_get_bool("persist.media.treble_omx", true)) {
+ if (trebleFlag != nullptr) {
+ *trebleFlag = true;
+ }
+ return connectTreble(name);
+ }
+ if (trebleFlag != nullptr) {
+ *trebleFlag = false;
+ }
+ return connectLegacy();
+}
+
status_t OMXClient::connectLegacy() {
sp<IServiceManager> sm = defaultServiceManager();
sp<IBinder> codecbinder = sm->getService(String16("media.codec"));
@@ -73,9 +86,12 @@
return OK;
}
-status_t OMXClient::connectTreble() {
+status_t OMXClient::connectTreble(const char* name) {
using namespace ::android::hardware::media::omx::V1_0;
- sp<IOmx> tOmx = IOmx::getService("default");
+ if (name == nullptr) {
+ name = "default";
+ }
+ sp<IOmx> tOmx = IOmx::getService(name);
if (tOmx.get() == nullptr) {
ALOGE("Cannot obtain Treble IOmx.");
return NO_INIT;
diff --git a/media/libstagefright/OmxInfoBuilder.cpp b/media/libstagefright/OmxInfoBuilder.cpp
new file mode 100644
index 0000000..686bcc8
--- /dev/null
+++ b/media/libstagefright/OmxInfoBuilder.cpp
@@ -0,0 +1,323 @@
+/*
+ * Copyright (C) 2017 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_NDEBUG 0
+#define LOG_TAG "OmxInfoBuilder"
+
+#ifdef __LP64__
+#define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS
+#endif
+
+#include <utils/Log.h>
+#include <cutils/properties.h>
+
+#include <binder/IServiceManager.h>
+#include <media/IMediaCodecService.h>
+#include <media/stagefright/OmxInfoBuilder.h>
+#include <media/stagefright/ACodec.h>
+
+#include <android/hardware/media/omx/1.0/IOmxStore.h>
+#include <android/hardware/media/omx/1.0/IOmx.h>
+#include <android/hardware/media/omx/1.0/IOmxNode.h>
+#include <media/stagefright/omx/OMXUtils.h>
+
+#include <media/IOMXStore.h>
+#include <media/IOMX.h>
+#include <media/MediaDefs.h>
+#include <media/omx/1.0/WOmx.h>
+
+#include <media/openmax/OMX_Index.h>
+#include <media/openmax/OMX_IndexExt.h>
+#include <media/openmax/OMX_Audio.h>
+#include <media/openmax/OMX_AudioExt.h>
+#include <media/openmax/OMX_Video.h>
+#include <media/openmax/OMX_VideoExt.h>
+
+namespace android {
+
+namespace /* unnamed */ {
+
+status_t queryCapabilities(
+ const IOMXStore::NodeInfo& node, const char* mime, bool isEncoder,
+ MediaCodecInfo::CapabilitiesWriter* caps) {
+ sp<ACodec> codec = new ACodec();
+ status_t err = codec->queryCapabilities(
+ node.owner.c_str(), node.name.c_str(), mime, isEncoder, caps);
+ if (err != OK) {
+ return err;
+ }
+ for (const auto& attribute : node.attributes) {
+ // All features have an int32 value except
+ // "feature-bitrate-control", which has a string value.
+ if ((attribute.key.compare(0, 8, "feature-") == 0) &&
+ (attribute.key.compare(8, 15, "bitrate-control")
+ != 0)) {
+ // If this attribute.key is a feature that is not a bitrate
+ // control, add an int32 value.
+ caps->addDetail(
+ attribute.key.c_str(),
+ attribute.value == "1" ? 1 : 0);
+ } else {
+ // Non-feature attributes
+ caps->addDetail(
+ attribute.key.c_str(), attribute.value.c_str());
+ }
+ }
+ return OK;
+}
+
+} // unnamed namespace
+
+OmxInfoBuilder::OmxInfoBuilder() {
+}
+
+status_t OmxInfoBuilder::buildMediaCodecList(MediaCodecListWriter* writer) {
+ bool treble;
+ sp<IOMX> omx;
+ std::vector<IOMXStore::RoleInfo> roles;
+
+ treble = property_get_bool("persist.media.treble_omx", true);
+ if (treble) {
+ using namespace ::android::hardware::media::omx::V1_0;
+ using ::android::hardware::hidl_vec;
+ using ::android::hardware::hidl_string;
+
+ // Obtain IOmxStore
+ sp<IOmxStore> omxStore = IOmxStore::getService();
+ if (omxStore == nullptr) {
+ ALOGE("Cannot connect to an IOmxStore instance.");
+ return NO_INIT;
+ }
+
+ // List service attributes (global settings)
+ Status status;
+ hidl_vec<IOmxStore::ServiceAttribute> serviceAttributes;
+ auto transStatus = omxStore->listServiceAttributes(
+ [&status, &serviceAttributes]
+ (Status inStatus, const hidl_vec<IOmxStore::ServiceAttribute>&
+ inAttributes) {
+ status = inStatus;
+ serviceAttributes = inAttributes;
+ });
+ if (!transStatus.isOk()) {
+ ALOGE("Fail to obtain global settings from IOmxStore.");
+ return NO_INIT;
+ }
+ if (status != Status::OK) {
+ ALOGE("IOmxStore reports parsing error.");
+ return NO_INIT;
+ }
+ for (const auto& p : serviceAttributes) {
+ writer->addGlobalSetting(
+ p.key.c_str(), p.value.c_str());
+ }
+
+ // List roles and convert to IOMXStore's format
+ transStatus = omxStore->listRoles(
+ [&roles]
+ (const hidl_vec<IOmxStore::RoleInfo>& inRoleList) {
+ roles.reserve(inRoleList.size());
+ for (const auto& inRole : inRoleList) {
+ IOMXStore::RoleInfo role;
+ role.role = inRole.role;
+ role.type = inRole.type;
+ role.isEncoder = inRole.isEncoder;
+ role.preferPlatformNodes = inRole.preferPlatformNodes;
+ std::vector<IOMXStore::NodeInfo>& nodes =
+ role.nodes;
+ nodes.reserve(inRole.nodes.size());
+ for (const auto& inNode : inRole.nodes) {
+ IOMXStore::NodeInfo node;
+ node.name = inNode.name;
+ node.owner = inNode.owner;
+ std::vector<IOMXStore::Attribute>& attributes =
+ node.attributes;
+ attributes.reserve(inNode.attributes.size());
+ for (const auto& inAttr : inNode.attributes) {
+ IOMXStore::Attribute attr;
+ attr.key = inAttr.key;
+ attr.value = inAttr.value;
+ attributes.push_back(std::move(attr));
+ }
+ nodes.push_back(std::move(node));
+ }
+ roles.push_back(std::move(role));
+ }
+ });
+ if (!transStatus.isOk()) {
+ ALOGE("Fail to obtain codec roles from IOmxStore.");
+ return NO_INIT;
+ }
+ } else {
+ // Obtain IOMXStore
+ sp<IServiceManager> sm = defaultServiceManager();
+ if (sm == nullptr) {
+ ALOGE("Cannot obtain the default service manager.");
+ return NO_INIT;
+ }
+ sp<IBinder> codecBinder = sm->getService(String16("media.codec"));
+ if (codecBinder == nullptr) {
+ ALOGE("Cannot obtain the media codec service.");
+ return NO_INIT;
+ }
+ sp<IMediaCodecService> codecService =
+ interface_cast<IMediaCodecService>(codecBinder);
+ if (codecService == nullptr) {
+ ALOGE("Wrong type of media codec service obtained.");
+ return NO_INIT;
+ }
+ omx = codecService->getOMX();
+ if (omx == nullptr) {
+ ALOGE("Cannot connect to an IOMX instance.");
+ }
+ sp<IOMXStore> omxStore = codecService->getOMXStore();
+ if (omxStore == nullptr) {
+ ALOGE("Cannot connect to an IOMXStore instance.");
+ return NO_INIT;
+ }
+
+ // List service attributes (global settings)
+ std::vector<IOMXStore::Attribute> serviceAttributes;
+ status_t status = omxStore->listServiceAttributes(&serviceAttributes);
+ if (status != OK) {
+ ALOGE("Fail to obtain global settings from IOMXStore.");
+ return NO_INIT;
+ }
+ for (const auto& p : serviceAttributes) {
+ writer->addGlobalSetting(
+ p.key.c_str(), p.value.c_str());
+ }
+
+ // List roles
+ status = omxStore->listRoles(&roles);
+ if (status != OK) {
+ ALOGE("Fail to obtain codec roles from IOMXStore.");
+ return NO_INIT;
+ }
+ }
+
+ // Convert roles to lists of codecs
+
+ // codec name -> index into swCodecs
+ std::map<std::string, std::unique_ptr<MediaCodecInfoWriter> >
+ swCodecName2Info;
+ // codec name -> index into hwCodecs
+ std::map<std::string, std::unique_ptr<MediaCodecInfoWriter> >
+ hwCodecName2Info;
+ // owner name -> MediaCodecInfo
+ // This map will be used to obtain the correct IOmx service(s) needed for
+ // creating IOmxNode instances and querying capabilities.
+ std::map<std::string, std::vector<sp<MediaCodecInfo> > >
+ owner2CodecInfo;
+
+ for (const auto& role : roles) {
+ const auto& typeName = role.type;
+ bool isEncoder = role.isEncoder;
+ bool preferPlatformNodes = role.preferPlatformNodes;
+ // If preferPlatformNodes is true, hardware nodes must be added after
+ // platform (software) nodes. hwCodecs is used to hold hardware nodes
+ // that need to be added after software nodes for the same role.
+ std::vector<const IOMXStore::NodeInfo*> hwCodecs;
+ for (const auto& node : role.nodes) {
+ const auto& nodeName = node.name;
+ bool isSoftware = nodeName.compare(0, 10, "OMX.google") == 0;
+ MediaCodecInfoWriter* info;
+ if (isSoftware) {
+ auto c2i = swCodecName2Info.find(nodeName);
+ if (c2i == swCodecName2Info.end()) {
+ // Create a new MediaCodecInfo for a new node.
+ c2i = swCodecName2Info.insert(std::make_pair(
+ nodeName, writer->addMediaCodecInfo())).first;
+ info = c2i->second.get();
+ info->setName(nodeName.c_str());
+ info->setOwner(node.owner.c_str());
+ info->setEncoder(isEncoder);
+ } else {
+ // The node has been seen before. Simply retrieve the
+ // existing MediaCodecInfoWriter.
+ info = c2i->second.get();
+ }
+ } else {
+ auto c2i = hwCodecName2Info.find(nodeName);
+ if (c2i == hwCodecName2Info.end()) {
+ // Create a new MediaCodecInfo for a new node.
+ if (!preferPlatformNodes) {
+ c2i = hwCodecName2Info.insert(std::make_pair(
+ nodeName, writer->addMediaCodecInfo())).first;
+ info = c2i->second.get();
+ info->setName(nodeName.c_str());
+ info->setOwner(node.owner.c_str());
+ info->setEncoder(isEncoder);
+ } else {
+ // If preferPlatformNodes is true, this node must be
+ // added after all software nodes.
+ hwCodecs.push_back(&node);
+ continue;
+ }
+ } else {
+ // The node has been seen before. Simply retrieve the
+ // existing MediaCodecInfoWriter.
+ info = c2i->second.get();
+ }
+ }
+ std::unique_ptr<MediaCodecInfo::CapabilitiesWriter> caps =
+ info->addMime(typeName.c_str());
+ if (queryCapabilities(
+ node, typeName.c_str(), isEncoder, caps.get()) != OK) {
+ ALOGW("Fail to add mime %s to codec %s",
+ typeName.c_str(), nodeName.c_str());
+ info->removeMime(typeName.c_str());
+ }
+ }
+
+ // If preferPlatformNodes is true, hardware nodes will not have been
+ // added in the loop above, but rather saved in hwCodecs. They are
+ // going to be added here.
+ if (preferPlatformNodes) {
+ for (const auto& node : hwCodecs) {
+ MediaCodecInfoWriter* info;
+ const auto& nodeName = node->name;
+ auto c2i = hwCodecName2Info.find(nodeName);
+ if (c2i == hwCodecName2Info.end()) {
+ // Create a new MediaCodecInfo for a new node.
+ c2i = hwCodecName2Info.insert(std::make_pair(
+ nodeName, writer->addMediaCodecInfo())).first;
+ info = c2i->second.get();
+ info->setName(nodeName.c_str());
+ info->setOwner(node->owner.c_str());
+ info->setEncoder(isEncoder);
+ } else {
+ // The node has been seen before. Simply retrieve the
+ // existing MediaCodecInfoWriter.
+ info = c2i->second.get();
+ }
+ std::unique_ptr<MediaCodecInfo::CapabilitiesWriter> caps =
+ info->addMime(typeName.c_str());
+ if (queryCapabilities(
+ *node, typeName.c_str(), isEncoder, caps.get()) != OK) {
+ ALOGW("Fail to add mime %s to codec %s "
+ "after software codecs",
+ typeName.c_str(), nodeName.c_str());
+ info->removeMime(typeName.c_str());
+ }
+ }
+ }
+ }
+ return OK;
+}
+
+} // namespace android
+
diff --git a/media/libstagefright/include/media/stagefright/ACodec.h b/media/libstagefright/include/media/stagefright/ACodec.h
index b9f48c4..424246d 100644
--- a/media/libstagefright/include/media/stagefright/ACodec.h
+++ b/media/libstagefright/include/media/stagefright/ACodec.h
@@ -20,6 +20,7 @@
#include <stdint.h>
#include <android/native_window.h>
#include <media/hardware/MetadataBufferType.h>
+#include <media/MediaCodecInfo.h>
#include <media/IOMX.h>
#include <media/stagefright/foundation/AHierarchicalStateMachine.h>
#include <media/stagefright/CodecBase.h>
@@ -30,6 +31,8 @@
#include <OMX_Audio.h>
#include <hardware/gralloc.h>
#include <nativebase/nativebase.h>
+#include <android/hidl/allocator/1.0/IAllocator.h>
+#include <android/hidl/memory/1.0/IMemory.h>
#define TRACK_BUFFER_TIMING 0
@@ -42,20 +45,6 @@
struct DescribeColorFormat2Params;
struct DataConverter;
-// Treble shared memory
-namespace hidl {
-namespace allocator {
-namespace V1_0 {
-struct IAllocator;
-} // V1_0
-} // allocator
-namespace memory {
-namespace V1_0 {
-struct IMemory;
-} // V1_0
-} // memory
-} // hidl
-
typedef hidl::allocator::V1_0::IAllocator TAllocator;
typedef hidl::memory::V1_0::IMemory TMemory;
@@ -72,9 +61,10 @@
virtual void initiateStart();
virtual void initiateShutdown(bool keepComponentAllocated = false);
- virtual status_t queryCapabilities(
- const AString &name, const AString &mime, bool isEncoder,
- sp<MediaCodecInfo::Capabilities> *caps);
+ status_t queryCapabilities(
+ const char* owner, const char* name,
+ const char* mime, bool isEncoder,
+ MediaCodecInfo::CapabilitiesWriter* caps);
virtual status_t setSurface(const sp<Surface> &surface);
diff --git a/media/libstagefright/include/media/stagefright/CodecBase.h b/media/libstagefright/include/media/stagefright/CodecBase.h
index 6245ccb..9197f7b 100644
--- a/media/libstagefright/include/media/stagefright/CodecBase.h
+++ b/media/libstagefright/include/media/stagefright/CodecBase.h
@@ -213,10 +213,6 @@
// require an explicit message handler
virtual void onMessageReceived(const sp<AMessage> &msg) = 0;
- virtual status_t queryCapabilities(
- const AString& /*name*/, const AString& /*mime*/, bool /*isEncoder*/,
- sp<MediaCodecInfo::Capabilities>* /*caps*/ /* nonnull */) { return INVALID_OPERATION; }
-
virtual status_t setSurface(const sp<Surface>& /*surface*/) { return INVALID_OPERATION; }
virtual void signalFlush() = 0;
diff --git a/media/libstagefright/include/media/stagefright/FrameRenderTracker.h b/media/libstagefright/include/media/stagefright/FrameRenderTracker.h
index 044699c..c14755a 100644
--- a/media/libstagefright/include/media/stagefright/FrameRenderTracker.h
+++ b/media/libstagefright/include/media/stagefright/FrameRenderTracker.h
@@ -23,6 +23,8 @@
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/AString.h>
+#include <ui/Fence.h>
+#include <ui/GraphicBuffer.h>
#include <list>
@@ -30,9 +32,6 @@
namespace android {
-class Fence;
-class GraphicBuffer;
-
// Tracks the render information about a frame. Frames go through several states while
// the render information is tracked:
//
diff --git a/media/libstagefright/include/media/stagefright/MediaCodec.h b/media/libstagefright/include/media/stagefright/MediaCodec.h
index 209fe12..836534d 100644
--- a/media/libstagefright/include/media/stagefright/MediaCodec.h
+++ b/media/libstagefright/include/media/stagefright/MediaCodec.h
@@ -87,11 +87,6 @@
static sp<PersistentSurface> CreatePersistentInputSurface();
- // utility method to query capabilities
- static status_t QueryCapabilities(
- const AString &name, const AString &mime, bool isEncoder,
- sp<MediaCodecInfo::Capabilities> *caps /* nonnull */);
-
status_t configure(
const sp<AMessage> &format,
const sp<Surface> &nativeWindow,
diff --git a/media/libstagefright/include/media/stagefright/MediaCodecList.h b/media/libstagefright/include/media/stagefright/MediaCodecList.h
index 430bc16..f2bd496 100644
--- a/media/libstagefright/include/media/stagefright/MediaCodecList.h
+++ b/media/libstagefright/include/media/stagefright/MediaCodecList.h
@@ -21,7 +21,6 @@
#include <media/stagefright/foundation/ABase.h>
#include <media/stagefright/foundation/AString.h>
#include <media/IMediaCodecList.h>
-#include <media/IOMX.h>
#include <media/MediaCodecInfo.h>
#include <sys/types.h>
@@ -36,6 +35,8 @@
struct AMessage;
+struct MediaCodecListBuilderBase;
+
struct MediaCodecList : public BnMediaCodecList {
static sp<IMediaCodecList> getInstance();
@@ -51,7 +52,7 @@
ALOGE("b/24445127");
return NULL;
}
- return mCodecInfos.itemAt(index);
+ return mCodecInfos[index];
}
virtual const sp<AMessage> getGlobalSettings() const;
@@ -62,9 +63,6 @@
// only to be used by getLocalInstance
static void *profilerThreadWrapper(void * /*arg*/);
- // only to be used by MediaPlayerService
- void parseTopLevelXMLFile(const char *path, bool ignore_errors = false);
-
enum Flags {
kPreferSoftwareCodecs = 1,
kHardwareCodecsOnly = 2,
@@ -74,13 +72,11 @@
const char *mime,
bool createEncoder,
uint32_t flags,
- Vector<AString> *matching);
-
- static uint32_t getQuirksFor(const char *mComponentName);
+ Vector<AString> *matchingCodecs,
+ Vector<AString> *owners = nullptr);
static bool isSoftwareCodec(const AString &componentName);
-
private:
class BinderDeathObserver : public IBinder::DeathRecipient {
void binderDied(const wp<IBinder> &the_late_who __unused);
@@ -88,64 +84,86 @@
static sp<BinderDeathObserver> sBinderDeathObserver;
- enum Section {
- SECTION_TOPLEVEL,
- SECTION_SETTINGS,
- SECTION_DECODERS,
- SECTION_DECODER,
- SECTION_DECODER_TYPE,
- SECTION_ENCODERS,
- SECTION_ENCODER,
- SECTION_ENCODER_TYPE,
- SECTION_INCLUDE,
- };
-
static sp<IMediaCodecList> sCodecList;
static sp<IMediaCodecList> sRemoteList;
status_t mInitCheck;
- Section mCurrentSection;
- bool mUpdate;
- Vector<Section> mPastSections;
- int32_t mDepth;
- AString mHrefBase;
sp<AMessage> mGlobalSettings;
- KeyedVector<AString, CodecSettings> mOverrides;
+ std::vector<sp<MediaCodecInfo> > mCodecInfos;
- Vector<sp<MediaCodecInfo> > mCodecInfos;
- sp<MediaCodecInfo> mCurrentInfo;
+ /**
+ * This constructor will call `buildMediaCodecList()` from the given
+ * `MediaCodecListBuilderBase` object.
+ */
+ MediaCodecList(MediaCodecListBuilderBase* builder);
- MediaCodecList();
~MediaCodecList();
status_t initCheck() const;
- void parseXMLFile(const char *path);
- static void StartElementHandlerWrapper(
- void *me, const char *name, const char **attrs);
+ MediaCodecList(const MediaCodecList&) = delete;
+ MediaCodecList& operator=(const MediaCodecList&) = delete;
- static void EndElementHandlerWrapper(void *me, const char *name);
+ friend MediaCodecListWriter;
+};
- void startElementHandler(const char *name, const char **attrs);
- void endElementHandler(const char *name);
+/**
+ * This class is to be used by a `MediaCodecListBuilderBase` instance to add
+ * information to the associated `MediaCodecList` object.
+ */
+struct MediaCodecListWriter {
+ /**
+ * Add a key-value pair to a `MediaCodecList`'s global settings.
+ *
+ * @param key Key.
+ * @param value Value.
+ */
+ void addGlobalSetting(const char* key, const char* value);
+ /**
+ * Create an add a new `MediaCodecInfo` object to a `MediaCodecList`, and
+ * return a `MediaCodecInfoWriter` object associated with the newly added
+ * `MediaCodecInfo`.
+ *
+ * @return The `MediaCodecInfoWriter` object associated with the newly
+ * added `MediaCodecInfo` object.
+ */
+ std::unique_ptr<MediaCodecInfoWriter> addMediaCodecInfo();
+private:
+ /**
+ * The associated `MediaCodecList` object.
+ */
+ MediaCodecList* mList;
- status_t includeXMLFile(const char **attrs);
- status_t addSettingFromAttributes(const char **attrs);
- status_t addMediaCodecFromAttributes(bool encoder, const char **attrs);
- void addMediaCodec(bool encoder, const char *name, const char *type = NULL);
+ /**
+ * Construct this writer object associated with the given `MediaCodecList`
+ * object.
+ *
+ * @param list The "base" `MediaCodecList` object.
+ */
+ MediaCodecListWriter(MediaCodecList* list);
- void setCurrentCodecInfo(bool encoder, const char *name, const char *type);
+ friend MediaCodecList;
+};
- status_t addQuirk(const char **attrs);
- status_t addTypeFromAttributes(const char **attrs);
- status_t addLimit(const char **attrs);
- status_t addFeature(const char **attrs);
- void addType(const char *name);
+/**
+ * This interface is to be used by `MediaCodecList` to fill its members with
+ * appropriate information. `buildMediaCodecList()` will be called from a
+ * `MediaCodecList` object during its construction.
+ */
+struct MediaCodecListBuilderBase {
+ /**
+ * Build the `MediaCodecList` via the given `MediaCodecListWriter` interface.
+ *
+ * @param writer The writer interface.
+ * @return The status of the construction. `NO_ERROR` means success.
+ */
+ virtual status_t buildMediaCodecList(MediaCodecListWriter* writer) = 0;
- status_t initializeCapabilities(const char *type);
-
- DISALLOW_EVIL_CONSTRUCTORS(MediaCodecList);
+ /**
+ * The default destructor does nothing.
+ */
+ virtual ~MediaCodecListBuilderBase();
};
} // namespace android
diff --git a/media/libstagefright/include/media/stagefright/OMXClient.h b/media/libstagefright/include/media/stagefright/OMXClient.h
index 203a181..2f159b0 100644
--- a/media/libstagefright/include/media/stagefright/OMXClient.h
+++ b/media/libstagefright/include/media/stagefright/OMXClient.h
@@ -28,9 +28,10 @@
status_t connect();
status_t connect(bool* trebleFlag);
+ status_t connect(const char* name, bool* trebleFlag = nullptr);
status_t connectLegacy();
- status_t connectTreble();
+ status_t connectTreble(const char* name = "default");
void disconnect();
sp<IOMX> interface() {
@@ -40,8 +41,8 @@
private:
sp<IOMX> mOMX;
- OMXClient(const OMXClient &);
- OMXClient &operator=(const OMXClient &);
+ OMXClient(const OMXClient &) = delete;
+ OMXClient &operator=(const OMXClient &) = delete;
};
} // namespace android
diff --git a/media/libstagefright/include/media/stagefright/OmxInfoBuilder.h b/media/libstagefright/include/media/stagefright/OmxInfoBuilder.h
new file mode 100644
index 0000000..1b4d873
--- /dev/null
+++ b/media/libstagefright/include/media/stagefright/OmxInfoBuilder.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 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 OMX_INFO_BUILDER_H_
+#define OMX_INFO_BUILDER_H_
+
+#include <media/stagefright/MediaCodecList.h>
+#include <utils/Errors.h>
+
+namespace android {
+
+class OmxInfoBuilder : public MediaCodecListBuilderBase {
+public:
+ OmxInfoBuilder();
+ status_t buildMediaCodecList(MediaCodecListWriter* writer) override;
+};
+
+} // namespace android
+
+#endif // OMX_INFO_BUILDER_H_
diff --git a/media/libstagefright/omx/1.0/Omx.cpp b/media/libstagefright/omx/1.0/Omx.cpp
index dfab3b0..fe50656 100644
--- a/media/libstagefright/omx/1.0/Omx.cpp
+++ b/media/libstagefright/omx/1.0/Omx.cpp
@@ -114,15 +114,23 @@
return Void();
}
instance->setHandle(handle);
- std::vector<AString> quirkVector;
- if (mParser.getQuirks(name.c_str(), &quirkVector) == OK) {
+
+ // Find quirks from mParser
+ const auto& codec = mParser.getCodecMap().find(name.c_str());
+ if (codec == mParser.getCodecMap().cend()) {
+ LOG(WARNING) << "Failed to obtain quirks for omx component "
+ "'" << name.c_str() << "' "
+ "from XML files";
+ } else {
uint32_t quirks = 0;
- for (const AString quirk : quirkVector) {
+ for (const auto& quirk : codec->second.quirkSet) {
if (quirk == "requires-allocate-on-input-ports") {
- quirks |= kRequiresAllocateBufferOnInputPorts;
+ quirks |= OMXNodeInstance::
+ kRequiresAllocateBufferOnInputPorts;
}
if (quirk == "requires-allocate-on-output-ports") {
- quirks |= kRequiresAllocateBufferOnOutputPorts;
+ quirks |= OMXNodeInstance::
+ kRequiresAllocateBufferOnOutputPorts;
}
}
instance->setQuirks(quirks);
diff --git a/media/libstagefright/omx/1.0/OmxStore.cpp b/media/libstagefright/omx/1.0/OmxStore.cpp
index a82625a..447af6f 100644
--- a/media/libstagefright/omx/1.0/OmxStore.cpp
+++ b/media/libstagefright/omx/1.0/OmxStore.cpp
@@ -21,6 +21,7 @@
#include <media/stagefright/omx/1.0/Conversion.h>
#include <media/stagefright/omx/1.0/OmxStore.h>
+#include <media/stagefright/xmlparser/MediaCodecsXmlParser.h>
namespace android {
namespace hardware {
@@ -29,24 +30,87 @@
namespace V1_0 {
namespace implementation {
-OmxStore::OmxStore() {
+OmxStore::OmxStore(
+ const char* owner,
+ const char* const* searchDirs,
+ const char* mainXmlName,
+ const char* performanceXmlName,
+ const char* profilingResultsXmlPath) {
+ MediaCodecsXmlParser parser(searchDirs,
+ mainXmlName,
+ performanceXmlName,
+ profilingResultsXmlPath);
+ mParsingStatus = toStatus(parser.getParsingStatus());
+
+ const auto& serviceAttributeMap = parser.getServiceAttributeMap();
+ mServiceAttributeList.resize(serviceAttributeMap.size());
+ size_t i = 0;
+ for (const auto& attributePair : serviceAttributeMap) {
+ ServiceAttribute attribute;
+ attribute.key = attributePair.first;
+ attribute.value = attributePair.second;
+ mServiceAttributeList[i] = std::move(attribute);
+ ++i;
+ }
+
+ const auto& roleMap = parser.getRoleMap();
+ mRoleList.resize(roleMap.size());
+ i = 0;
+ for (const auto& rolePair : roleMap) {
+ RoleInfo role;
+ role.role = rolePair.first;
+ role.type = rolePair.second.type;
+ role.isEncoder = rolePair.second.isEncoder;
+ // TODO: Currently, preferPlatformNodes information is not available in
+ // the xml file. Once we have a way to provide this information, it
+ // should be parsed properly.
+ role.preferPlatformNodes = rolePair.first.compare(0, 5, "audio") == 0;
+ hidl_vec<NodeInfo>& nodeList = role.nodes;
+ nodeList.resize(rolePair.second.nodeList.size());
+ size_t j = 0;
+ for (const auto& nodePair : rolePair.second.nodeList) {
+ NodeInfo node;
+ node.name = nodePair.second.name;
+ node.owner = owner;
+ hidl_vec<NodeAttribute>& attributeList = node.attributes;
+ attributeList.resize(nodePair.second.attributeList.size());
+ size_t k = 0;
+ for (const auto& attributePair : nodePair.second.attributeList) {
+ NodeAttribute attribute;
+ attribute.key = attributePair.first;
+ attribute.value = attributePair.second;
+ attributeList[k] = std::move(attribute);
+ ++k;
+ }
+ nodeList[j] = std::move(node);
+ ++j;
+ }
+ mRoleList[i] = std::move(role);
+ ++i;
+ }
+
+ mPrefix = parser.getCommonPrefix();
}
OmxStore::~OmxStore() {
}
Return<void> OmxStore::listServiceAttributes(listServiceAttributes_cb _hidl_cb) {
- _hidl_cb(toStatus(NO_ERROR), hidl_vec<ServiceAttribute>());
+ if (mParsingStatus == Status::NO_ERROR) {
+ _hidl_cb(Status::NO_ERROR, mServiceAttributeList);
+ } else {
+ _hidl_cb(mParsingStatus, hidl_vec<ServiceAttribute>());
+ }
return Void();
}
Return<void> OmxStore::getNodePrefix(getNodePrefix_cb _hidl_cb) {
- _hidl_cb(hidl_string());
+ _hidl_cb(mPrefix);
return Void();
}
Return<void> OmxStore::listRoles(listRoles_cb _hidl_cb) {
- _hidl_cb(hidl_vec<RoleInfo>());
+ _hidl_cb(mRoleList);
return Void();
}
@@ -54,12 +118,6 @@
return IOmx::tryGetService(omxName);
}
-// Methods from ::android::hidl::base::V1_0::IBase follow.
-
-IOmxStore* HIDL_FETCH_IOmxStore(const char* /* name */) {
- return new OmxStore();
-}
-
} // namespace implementation
} // namespace V1_0
} // namespace omx
diff --git a/media/libstagefright/omx/Android.bp b/media/libstagefright/omx/Android.bp
index bb05740..d4cdf69 100644
--- a/media/libstagefright/omx/Android.bp
+++ b/media/libstagefright/omx/Android.bp
@@ -10,6 +10,7 @@
"GraphicBufferSource.cpp",
"BWGraphicBufferSource.cpp",
"OMX.cpp",
+ "OMXStore.cpp",
"OMXMaster.cpp",
"OMXNodeInstance.cpp",
"OMXUtils.cpp",
@@ -32,15 +33,6 @@
"include",
],
- include_dirs: [
- "frameworks/av/include/media/",
- "frameworks/av/media/libstagefright",
- "frameworks/av/media/libstagefright/include",
- "frameworks/native/include", // for media/hardware/MetadataBufferType.h
- "frameworks/native/include/media/hardware",
- "frameworks/native/include/media/openmax",
- ],
-
header_libs: [
"media_plugin_headers",
],
@@ -99,8 +91,12 @@
},
}
-cc_library_static {
+cc_library_shared {
name: "libstagefright_omx_utils",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
srcs: ["OMXUtils.cpp"],
export_include_dirs: [
"include",
@@ -112,10 +108,11 @@
"media_plugin_headers",
],
shared_libs: [
- "libmedia",
+ "libmedia_omx",
+ "liblog",
],
export_shared_lib_headers: [
- "libmedia",
+ "libmedia_omx",
],
sanitize: {
misc_undefined: [
diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp
index 93b4dbe..09c4019 100644
--- a/media/libstagefright/omx/OMX.cpp
+++ b/media/libstagefright/omx/OMX.cpp
@@ -115,15 +115,22 @@
return StatusFromOMXError(err);
}
instance->setHandle(handle);
- std::vector<AString> quirkVector;
- if (mParser.getQuirks(name, &quirkVector) == OK) {
+
+ // Find quirks from mParser
+ const auto& codec = mParser.getCodecMap().find(name);
+ if (codec == mParser.getCodecMap().cend()) {
+ ALOGW("Failed to obtain quirks for omx component '%s' from XML files",
+ name);
+ } else {
uint32_t quirks = 0;
- for (const AString quirk : quirkVector) {
+ for (const auto& quirk : codec->second.quirkSet) {
if (quirk == "requires-allocate-on-input-ports") {
- quirks |= kRequiresAllocateBufferOnInputPorts;
+ quirks |= OMXNodeInstance::
+ kRequiresAllocateBufferOnInputPorts;
}
if (quirk == "requires-allocate-on-output-ports") {
- quirks |= kRequiresAllocateBufferOnOutputPorts;
+ quirks |= OMXNodeInstance::
+ kRequiresAllocateBufferOnOutputPorts;
}
}
instance->setQuirks(quirks);
diff --git a/media/libstagefright/omx/OMXStore.cpp b/media/libstagefright/omx/OMXStore.cpp
new file mode 100644
index 0000000..345336d
--- /dev/null
+++ b/media/libstagefright/omx/OMXStore.cpp
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2009 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_NDEBUG 0
+#define LOG_TAG "OMXStore"
+#include <utils/Log.h>
+
+#include <media/stagefright/omx/OMXUtils.h>
+#include <media/stagefright/omx/OMX.h>
+#include <media/stagefright/omx/OMXStore.h>
+#include <media/stagefright/xmlparser/MediaCodecsXmlParser.h>
+
+#include <map>
+#include <string>
+
+namespace android {
+
+namespace {
+ struct RoleProperties {
+ std::string type;
+ bool isEncoder;
+ bool preferPlatformNodes;
+ std::multimap<size_t, IOMXStore::NodeInfo> nodeList;
+ };
+} // Unnamed namespace
+
+OMXStore::OMXStore(
+ const char* owner,
+ const char* const* searchDirs,
+ const char* mainXmlName,
+ const char* performanceXmlName,
+ const char* profilingResultsXmlPath) {
+ MediaCodecsXmlParser parser(
+ searchDirs,
+ mainXmlName,
+ performanceXmlName,
+ profilingResultsXmlPath);
+ mParsingStatus = parser.getParsingStatus();
+
+ const auto& serviceAttributeMap = parser.getServiceAttributeMap();
+ mServiceAttributeList.reserve(serviceAttributeMap.size());
+ for (const auto& attributePair : serviceAttributeMap) {
+ Attribute attribute;
+ attribute.key = attributePair.first;
+ attribute.value = attributePair.second;
+ mServiceAttributeList.push_back(std::move(attribute));
+ }
+
+ const auto& roleMap = parser.getRoleMap();
+ mRoleList.reserve(roleMap.size());
+ for (const auto& rolePair : roleMap) {
+ RoleInfo role;
+ role.role = rolePair.first;
+ role.type = rolePair.second.type;
+ role.isEncoder = rolePair.second.isEncoder;
+ // TODO: Currently, preferPlatformNodes information is not available in
+ // the xml file. Once we have a way to provide this information, it
+ // should be parsed properly.
+ role.preferPlatformNodes = rolePair.first.compare(0, 5, "audio") == 0;
+ std::vector<NodeInfo>& nodeList = role.nodes;
+ nodeList.reserve(rolePair.second.nodeList.size());
+ for (const auto& nodePair : rolePair.second.nodeList) {
+ NodeInfo node;
+ node.name = nodePair.second.name;
+ node.owner = owner;
+ std::vector<Attribute>& attributeList = node.attributes;
+ attributeList.reserve(nodePair.second.attributeList.size());
+ for (const auto& attributePair : nodePair.second.attributeList) {
+ Attribute attribute;
+ attribute.key = attributePair.first;
+ attribute.value = attributePair.second;
+ attributeList.push_back(std::move(attribute));
+ }
+ nodeList.push_back(std::move(node));
+ }
+ mRoleList.push_back(std::move(role));
+ }
+
+ mPrefix = parser.getCommonPrefix();
+}
+
+status_t OMXStore::listServiceAttributes(std::vector<Attribute>* attributes) {
+ *attributes = mServiceAttributeList;
+ return mParsingStatus;
+}
+
+status_t OMXStore::getNodePrefix(std::string* prefix) {
+ *prefix = mPrefix;
+ return mParsingStatus;
+}
+
+status_t OMXStore::listRoles(std::vector<RoleInfo>* roleList) {
+ *roleList = mRoleList;
+ return mParsingStatus;
+}
+
+status_t OMXStore::getOmx(const std::string& name, sp<IOMX>* omx) {
+ *omx = new OMX();
+ return NO_ERROR;
+}
+
+OMXStore::~OMXStore() {
+}
+
+} // namespace android
+
diff --git a/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h b/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h
index f377f5a..006d2d9 100644
--- a/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h
+++ b/media/libstagefright/omx/include/media/stagefright/omx/1.0/OmxStore.h
@@ -21,6 +21,7 @@
#include <hidl/Status.h>
#include <android/hardware/media/omx/1.0/IOmxStore.h>
+#include <media/stagefright/xmlparser/MediaCodecsXmlParser.h>
namespace android {
namespace hardware {
@@ -41,17 +42,31 @@
using ::android::wp;
struct OmxStore : public IOmxStore {
- OmxStore();
+ OmxStore(
+ const char* owner = "default",
+ const char* const* searchDirs
+ = MediaCodecsXmlParser::defaultSearchDirs,
+ const char* mainXmlName
+ = MediaCodecsXmlParser::defaultMainXmlName,
+ const char* performanceXmlName
+ = MediaCodecsXmlParser::defaultPerformanceXmlName,
+ const char* profilingResultsXmlPath
+ = MediaCodecsXmlParser::defaultProfilingResultsXmlPath);
+
virtual ~OmxStore();
- // Methods from IOmx
+ // Methods from IOmxStore
Return<void> listServiceAttributes(listServiceAttributes_cb) override;
Return<void> getNodePrefix(getNodePrefix_cb) override;
Return<void> listRoles(listRoles_cb) override;
Return<sp<IOmx>> getOmx(hidl_string const&) override;
-};
-extern "C" IOmxStore* HIDL_FETCH_IOmxStore(const char* name);
+protected:
+ Status mParsingStatus;
+ hidl_string mPrefix;
+ hidl_vec<ServiceAttribute> mServiceAttributeList;
+ hidl_vec<RoleInfo> mRoleList;
+};
} // namespace implementation
} // namespace V1_0
diff --git a/media/libstagefright/omx/include/media/stagefright/omx/GraphicBufferSource.h b/media/libstagefright/omx/include/media/stagefright/omx/GraphicBufferSource.h
index 29b51a8..0f2d9a6 100644
--- a/media/libstagefright/omx/include/media/stagefright/omx/GraphicBufferSource.h
+++ b/media/libstagefright/omx/include/media/stagefright/omx/GraphicBufferSource.h
@@ -22,7 +22,7 @@
#include <gui/BufferQueue.h>
#include <utils/RefBase.h>
-#include <VideoAPI.h>
+#include <media/hardware/VideoAPI.h>
#include <media/IOMX.h>
#include <media/OMXFenceParcelable.h>
#include <media/stagefright/foundation/ABase.h>
diff --git a/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h b/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h
index 3f9c0ca..897f287 100644
--- a/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h
+++ b/media/libstagefright/omx/include/media/stagefright/omx/OMXMaster.h
@@ -18,7 +18,7 @@
#define OMX_MASTER_H_
-#include <OMXPluginBase.h>
+#include <media/hardware/OMXPluginBase.h>
#include <utils/threads.h>
#include <utils/KeyedVector.h>
diff --git a/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h b/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h
index 8e08d15..19114e2 100644
--- a/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h
+++ b/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h
@@ -92,6 +92,15 @@
status_t getExtensionIndex(
const char *parameterName, OMX_INDEXTYPE *index);
+ // Quirk still supported, even though deprecated
+ enum Quirks {
+ kRequiresAllocateBufferOnInputPorts = 1,
+ kRequiresAllocateBufferOnOutputPorts = 2,
+
+ kQuirksMask = kRequiresAllocateBufferOnInputPorts
+ | kRequiresAllocateBufferOnOutputPorts,
+ };
+
status_t setQuirks(OMX_U32 quirks);
bool isSecure() const {
diff --git a/media/libstagefright/omx/include/media/stagefright/omx/OMXStore.h b/media/libstagefright/omx/include/media/stagefright/omx/OMXStore.h
new file mode 100644
index 0000000..e00d713
--- /dev/null
+++ b/media/libstagefright/omx/include/media/stagefright/omx/OMXStore.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2009 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_OMXSTORE_H_
+#define ANDROID_OMXSTORE_H_
+
+#include <media/IOMXStore.h>
+#include <media/IOMX.h>
+#include <media/stagefright/xmlparser/MediaCodecsXmlParser.h>
+
+#include <vector>
+#include <string>
+
+namespace android {
+
+class OMXStore : public BnOMXStore {
+public:
+ OMXStore(
+ const char* owner = "default",
+ const char* const* searchDirs
+ = MediaCodecsXmlParser::defaultSearchDirs,
+ const char* mainXmlName
+ = MediaCodecsXmlParser::defaultMainXmlName,
+ const char* performanceXmlName
+ = MediaCodecsXmlParser::defaultPerformanceXmlName,
+ const char* profilingResultsXmlPath
+ = MediaCodecsXmlParser::defaultProfilingResultsXmlPath);
+
+ status_t listServiceAttributes(
+ std::vector<Attribute>* attributes) override;
+
+ status_t getNodePrefix(std::string* prefix) override;
+
+ status_t listRoles(std::vector<RoleInfo>* roleList) override;
+
+ status_t getOmx(const std::string& name, sp<IOMX>* omx) override;
+
+ ~OMXStore() override;
+
+protected:
+ status_t mParsingStatus;
+ std::string mPrefix;
+ std::vector<Attribute> mServiceAttributeList;
+ std::vector<RoleInfo> mRoleList;
+};
+
+} // namespace android
+
+#endif // ANDROID_OMXSTORE_H_
diff --git a/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h b/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h
index c89cd87..8ec717e 100644
--- a/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h
+++ b/media/libstagefright/omx/include/media/stagefright/omx/SoftOMXPlugin.h
@@ -19,7 +19,7 @@
#define SOFT_OMX_PLUGIN_H_
#include <media/stagefright/foundation/ABase.h>
-#include <OMXPluginBase.h>
+#include <media/hardware/OMXPluginBase.h>
namespace android {
diff --git a/media/libstagefright/tests/MediaCodecListOverrides_test.cpp b/media/libstagefright/tests/MediaCodecListOverrides_test.cpp
index 2599608..0c22a42 100644
--- a/media/libstagefright/tests/MediaCodecListOverrides_test.cpp
+++ b/media/libstagefright/tests/MediaCodecListOverrides_test.cpp
@@ -26,6 +26,8 @@
#include <media/stagefright/foundation/AMessage.h>
#include <media/stagefright/MediaCodecList.h>
+#include <vector>
+
namespace android {
static const char kTestOverridesStr[] =
@@ -117,7 +119,7 @@
// TODO: the codec component never returns OMX_EventCmdComplete in unit test.
TEST_F(MediaCodecListOverridesTest, DISABLED_profileCodecs) {
sp<IMediaCodecList> list = MediaCodecList::getInstance();
- Vector<sp<MediaCodecInfo>> infos;
+ std::vector<sp<MediaCodecInfo>> infos;
for (size_t i = 0; i < list->countCodecs(); ++i) {
infos.push_back(list->getCodecInfo(i));
}
diff --git a/media/libstagefright/xmlparser/Android.bp b/media/libstagefright/xmlparser/Android.bp
index ab893de..3507284 100644
--- a/media/libstagefright/xmlparser/Android.bp
+++ b/media/libstagefright/xmlparser/Android.bp
@@ -9,11 +9,6 @@
"MediaCodecsXmlParser.cpp",
],
- include_dirs: [
- "frameworks/av/media/libstagefright",
- "frameworks/av/include",
- ],
-
export_include_dirs: [
"include",
],
@@ -24,6 +19,7 @@
"liblog",
"libcutils",
"libstagefright_foundation",
+ "libstagefright_omx_utils",
],
cflags: [
@@ -38,6 +34,10 @@
"unsigned-integer-overflow",
"signed-integer-overflow",
],
+ cfi: true,
+ diag: {
+ cfi: true,
+ },
},
}
diff --git a/media/libstagefright/xmlparser/MediaCodecsXmlParser.cpp b/media/libstagefright/xmlparser/MediaCodecsXmlParser.cpp
index 4fdd107..bbd1807 100644
--- a/media/libstagefright/xmlparser/MediaCodecsXmlParser.cpp
+++ b/media/libstagefright/xmlparser/MediaCodecsXmlParser.cpp
@@ -16,157 +16,190 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "MediaCodecsXmlParser"
-#include <utils/Log.h>
#include <media/stagefright/xmlparser/MediaCodecsXmlParser.h>
-#include <media/MediaCodecInfo.h>
-
-#include <media/stagefright/foundation/ADebug.h>
-#include <media/stagefright/foundation/AMessage.h>
-#include <media/stagefright/foundation/AUtils.h>
+#include <utils/Log.h>
#include <media/stagefright/MediaErrors.h>
-
+#include <media/stagefright/omx/OMXUtils.h>
#include <sys/stat.h>
-
#include <expat.h>
-#include <string>
-#define MEDIA_CODECS_CONFIG_FILE_PATH_MAX_LENGTH 256
+#include <cctype>
+#include <algorithm>
namespace android {
-namespace { // Local variables and functions
+namespace {
-const char *kProfilingResults =
- "/data/misc/media/media_codecs_profiling_results.xml";
-
-// Treblized media codec list will be located in /odm/etc or /vendor/etc.
-const char *kConfigLocationList[] =
- {"/odm/etc", "/vendor/etc", "/etc"};
-constexpr int kConfigLocationListSize =
- (sizeof(kConfigLocationList) / sizeof(kConfigLocationList[0]));
-
-bool findMediaCodecListFileFullPath(
- const char *file_name, std::string *out_path) {
- for (int i = 0; i < kConfigLocationListSize; i++) {
- *out_path = std::string(kConfigLocationList[i]) + "/" + file_name;
- struct stat file_stat;
- if (stat(out_path->c_str(), &file_stat) == 0 &&
- S_ISREG(file_stat.st_mode)) {
+/**
+ * Search for a file in a list of search directories.
+ *
+ * For each string `searchDir` in `searchDirs`, `searchDir/fileName` will be
+ * tested whether it is a valid file name or not. If it is a valid file name,
+ * the concatenated name (`searchDir/fileName`) will be stored in the output
+ * variable `outPath`, and the function will return `true`. Otherwise, the
+ * search continues until the `nullptr` element in `searchDirs` is reached, at
+ * which point the function returns `false`.
+ *
+ * \param[in] searchDirs Null-terminated array of search paths.
+ * \param[in] fileName Name of the file to search.
+ * \param[out] outPath Full path of the file. `outPath` will hold a valid file
+ * name if the return value of this function is `true`.
+ * \return `true` if some element in `searchDirs` combined with `fileName` is a
+ * valid file name; `false` otherwise.
+ */
+bool findFileInDirs(
+ const char* const* searchDirs,
+ const char *fileName,
+ std::string *outPath) {
+ for (; *searchDirs != nullptr; ++searchDirs) {
+ *outPath = std::string(*searchDirs) + "/" + fileName;
+ struct stat fileStat;
+ if (stat(outPath->c_str(), &fileStat) == 0 &&
+ S_ISREG(fileStat.st_mode)) {
return true;
}
}
return false;
}
-// Find TypeInfo by name.
-std::vector<TypeInfo>::iterator findTypeInfo(
- CodecInfo &codecInfo, const AString &typeName) {
- return std::find_if(
- codecInfo.mTypes.begin(), codecInfo.mTypes.end(),
- [typeName](const auto &typeInfo) {
- return typeInfo.mName == typeName;
- });
+bool strnEq(const char* s1, const char* s2, size_t count) {
+ return strncmp(s1, s2, count) == 0;
}
-// Convert a string into a boolean value.
-bool ParseBoolean(const char *s) {
- if (!strcasecmp(s, "true") || !strcasecmp(s, "yes") || !strcasecmp(s, "y")) {
- return true;
- }
- char *end;
- unsigned long res = strtoul(s, &end, 10);
- return *s != '\0' && *end == '\0' && res > 0;
+bool strEq(const char* s1, const char* s2) {
+ return strcmp(s1, s2) == 0;
}
-} // unnamed namespace
+bool striEq(const char* s1, const char* s2) {
+ return strcasecmp(s1, s2) == 0;
+}
-MediaCodecsXmlParser::MediaCodecsXmlParser() :
- mInitCheck(NO_INIT),
- mUpdate(false) {
- std::string config_file_path;
- if (findMediaCodecListFileFullPath(
- "media_codecs.xml", &config_file_path)) {
- parseTopLevelXMLFile(config_file_path.c_str(), false);
+bool strHasPrefix(const char* test, const char* prefix) {
+ return strnEq(test, prefix, strlen(prefix));
+}
+
+bool parseBoolean(const char* s) {
+ return striEq(s, "y") ||
+ striEq(s, "yes") ||
+ striEq(s, "t") ||
+ striEq(s, "true") ||
+ striEq(s, "1");
+}
+
+status_t limitFoundMissingAttr(const char* name, const char *attr, bool found = true) {
+ ALOGE("limit '%s' with %s'%s' attribute", name,
+ (found ? "" : "no "), attr);
+ return -EINVAL;
+}
+
+status_t limitError(const char* name, const char *msg) {
+ ALOGE("limit '%s' %s", name, msg);
+ return -EINVAL;
+}
+
+status_t limitInvalidAttr(const char* name, const char* attr, const char* value) {
+ ALOGE("limit '%s' with invalid '%s' attribute (%s)", name,
+ attr, value);
+ return -EINVAL;
+}
+
+}; // unnamed namespace
+
+constexpr char const* MediaCodecsXmlParser::defaultSearchDirs[];
+constexpr char const* MediaCodecsXmlParser::defaultMainXmlName;
+constexpr char const* MediaCodecsXmlParser::defaultPerformanceXmlName;
+constexpr char const* MediaCodecsXmlParser::defaultProfilingResultsXmlPath;
+
+MediaCodecsXmlParser::MediaCodecsXmlParser(
+ const char* const* searchDirs,
+ const char* mainXmlName,
+ const char* performanceXmlName,
+ const char* profilingResultsXmlPath) :
+ mParsingStatus(NO_INIT),
+ mUpdate(false),
+ mCodecCounter(0) {
+ std::string path;
+ if (findFileInDirs(searchDirs, mainXmlName, &path)) {
+ parseTopLevelXMLFile(path.c_str(), false);
} else {
- mInitCheck = NAME_NOT_FOUND;
+ ALOGE("Cannot find %s", mainXmlName);
+ mParsingStatus = NAME_NOT_FOUND;
}
- if (findMediaCodecListFileFullPath(
- "media_codecs_performance.xml", &config_file_path)) {
- parseTopLevelXMLFile(config_file_path.c_str(), true);
+ if (findFileInDirs(searchDirs, performanceXmlName, &path)) {
+ parseTopLevelXMLFile(path.c_str(), true);
}
- parseTopLevelXMLFile(kProfilingResults, true);
+ if (profilingResultsXmlPath != nullptr) {
+ parseTopLevelXMLFile(profilingResultsXmlPath, true);
+ }
}
-void MediaCodecsXmlParser::parseTopLevelXMLFile(
- const char *codecs_xml, bool ignore_errors) {
+bool MediaCodecsXmlParser::parseTopLevelXMLFile(
+ const char *codecs_xml,
+ bool ignore_errors) {
// get href_base
const char *href_base_end = strrchr(codecs_xml, '/');
- if (href_base_end != NULL) {
- mHrefBase = AString(codecs_xml, href_base_end - codecs_xml + 1);
+ if (href_base_end != nullptr) {
+ mHrefBase = std::string(codecs_xml, href_base_end - codecs_xml + 1);
}
- mInitCheck = OK; // keeping this here for safety
+ mParsingStatus = OK; // keeping this here for safety
mCurrentSection = SECTION_TOPLEVEL;
- mDepth = 0;
parseXMLFile(codecs_xml);
- if (mInitCheck != OK) {
+ if (mParsingStatus != OK) {
+ ALOGW("parseTopLevelXMLFile(%s) failed", codecs_xml);
if (ignore_errors) {
- mInitCheck = OK;
- return;
+ mParsingStatus = OK;
+ return false;
}
- mCodecInfos.clear();
- return;
+ mCodecMap.clear();
+ return false;
}
+ return true;
}
MediaCodecsXmlParser::~MediaCodecsXmlParser() {
}
-status_t MediaCodecsXmlParser::initCheck() const {
- return mInitCheck;
-}
-
void MediaCodecsXmlParser::parseXMLFile(const char *path) {
FILE *file = fopen(path, "r");
- if (file == NULL) {
+ if (file == nullptr) {
ALOGW("unable to open media codecs configuration xml file: %s", path);
- mInitCheck = NAME_NOT_FOUND;
+ mParsingStatus = NAME_NOT_FOUND;
return;
}
- ALOGV("Start parsing %s", path);
- XML_Parser parser = ::XML_ParserCreate(NULL);
- CHECK(parser != NULL);
+ XML_Parser parser = ::XML_ParserCreate(nullptr);
+ LOG_FATAL_IF(parser == nullptr, "XML_MediaCodecsXmlParserCreate() failed.");
::XML_SetUserData(parser, this);
::XML_SetElementHandler(
parser, StartElementHandlerWrapper, EndElementHandlerWrapper);
- const int BUFF_SIZE = 512;
- while (mInitCheck == OK) {
+ static constexpr int BUFF_SIZE = 512;
+ while (mParsingStatus == OK) {
void *buff = ::XML_GetBuffer(parser, BUFF_SIZE);
- if (buff == NULL) {
+ if (buff == nullptr) {
ALOGE("failed in call to XML_GetBuffer()");
- mInitCheck = UNKNOWN_ERROR;
+ mParsingStatus = UNKNOWN_ERROR;
break;
}
int bytes_read = ::fread(buff, 1, BUFF_SIZE, file);
if (bytes_read < 0) {
ALOGE("failed in call to read");
- mInitCheck = ERROR_IO;
+ mParsingStatus = ERROR_IO;
break;
}
XML_Status status = ::XML_ParseBuffer(parser, bytes_read, bytes_read == 0);
if (status != XML_STATUS_OK) {
ALOGE("malformed (%s)", ::XML_ErrorString(::XML_GetErrorCode(parser)));
- mInitCheck = ERROR_MALFORMED;
+ mParsingStatus = ERROR_MALFORMED;
break;
}
@@ -178,30 +211,29 @@
::XML_ParserFree(parser);
fclose(file);
- file = NULL;
+ file = nullptr;
}
// static
void MediaCodecsXmlParser::StartElementHandlerWrapper(
void *me, const char *name, const char **attrs) {
- static_cast<MediaCodecsXmlParser *>(me)->startElementHandler(name, attrs);
+ static_cast<MediaCodecsXmlParser*>(me)->startElementHandler(name, attrs);
}
// static
void MediaCodecsXmlParser::EndElementHandlerWrapper(void *me, const char *name) {
- static_cast<MediaCodecsXmlParser *>(me)->endElementHandler(name);
+ static_cast<MediaCodecsXmlParser*>(me)->endElementHandler(name);
}
status_t MediaCodecsXmlParser::includeXMLFile(const char **attrs) {
- const char *href = NULL;
+ const char *href = nullptr;
size_t i = 0;
- while (attrs[i] != NULL) {
- if (!strcmp(attrs[i], "href")) {
- if (attrs[i + 1] == NULL) {
+ while (attrs[i] != nullptr) {
+ if (strEq(attrs[i], "href")) {
+ if (attrs[++i] == nullptr) {
return -EINVAL;
}
- href = attrs[i + 1];
- ++i;
+ href = attrs[i];
} else {
ALOGE("includeXMLFile: unrecognized attribute: %s", attrs[i]);
return -EINVAL;
@@ -222,44 +254,43 @@
return -EINVAL;
}
- AString filename = href;
- if (!filename.startsWith("media_codecs_") ||
- !filename.endsWith(".xml")) {
+ std::string filename = href;
+ if (filename.compare(0, 13, "media_codecs_") != 0 ||
+ filename.compare(filename.size() - 4, 4, ".xml") != 0) {
ALOGE("invalid include file name: %s", href);
return -EINVAL;
}
- filename.insert(mHrefBase, 0);
+ filename.insert(0, mHrefBase);
parseXMLFile(filename.c_str());
- return mInitCheck;
+ return mParsingStatus;
}
void MediaCodecsXmlParser::startElementHandler(
const char *name, const char **attrs) {
- if (mInitCheck != OK) {
+ if (mParsingStatus != OK) {
return;
}
bool inType = true;
- if (!strcmp(name, "Include")) {
- mInitCheck = includeXMLFile(attrs);
- if (mInitCheck == OK) {
- mPastSections.push(mCurrentSection);
+ if (strEq(name, "Include")) {
+ mParsingStatus = includeXMLFile(attrs);
+ if (mParsingStatus == OK) {
+ mSectionStack.push_back(mCurrentSection);
mCurrentSection = SECTION_INCLUDE;
}
- ++mDepth;
return;
}
switch (mCurrentSection) {
case SECTION_TOPLEVEL:
{
- if (!strcmp(name, "Decoders")) {
+ if (strEq(name, "Decoders")) {
mCurrentSection = SECTION_DECODERS;
- } else if (!strcmp(name, "Encoders")) {
+ } else if (strEq(name, "Encoders")) {
mCurrentSection = SECTION_ENCODERS;
- } else if (!strcmp(name, "Settings")) {
+ } else if (strEq(name, "Settings")) {
mCurrentSection = SECTION_SETTINGS;
}
break;
@@ -267,16 +298,16 @@
case SECTION_SETTINGS:
{
- if (!strcmp(name, "Setting")) {
- mInitCheck = addSettingFromAttributes(attrs);
+ if (strEq(name, "Setting")) {
+ mParsingStatus = addSettingFromAttributes(attrs);
}
break;
}
case SECTION_DECODERS:
{
- if (!strcmp(name, "MediaCodec")) {
- mInitCheck =
+ if (strEq(name, "MediaCodec")) {
+ mParsingStatus =
addMediaCodecFromAttributes(false /* encoder */, attrs);
mCurrentSection = SECTION_DECODER;
@@ -286,8 +317,8 @@
case SECTION_ENCODERS:
{
- if (!strcmp(name, "MediaCodec")) {
- mInitCheck =
+ if (strEq(name, "MediaCodec")) {
+ mParsingStatus =
addMediaCodecFromAttributes(true /* encoder */, attrs);
mCurrentSection = SECTION_ENCODER;
@@ -298,13 +329,14 @@
case SECTION_DECODER:
case SECTION_ENCODER:
{
- if (!strcmp(name, "Quirk")) {
- mInitCheck = addQuirk(attrs);
- } else if (!strcmp(name, "Type")) {
- mInitCheck = addTypeFromAttributes(attrs, (mCurrentSection == SECTION_ENCODER));
+ if (strEq(name, "Quirk")) {
+ mParsingStatus = addQuirk(attrs);
+ } else if (strEq(name, "Type")) {
+ mParsingStatus = addTypeFromAttributes(attrs,
+ (mCurrentSection == SECTION_ENCODER));
mCurrentSection =
- (mCurrentSection == SECTION_DECODER
- ? SECTION_DECODER_TYPE : SECTION_ENCODER_TYPE);
+ (mCurrentSection == SECTION_DECODER ?
+ SECTION_DECODER_TYPE : SECTION_ENCODER_TYPE);
}
}
inType = false;
@@ -314,13 +346,15 @@
case SECTION_ENCODER_TYPE:
{
// ignore limits and features specified outside of type
- bool outside = !inType && mCurrentType == mCodecInfos[mCurrentName].mTypes.end();
- if (outside && (!strcmp(name, "Limit") || !strcmp(name, "Feature"))) {
+ bool outside = !inType &&
+ mCurrentType == mCurrentCodec->second.typeMap.end();
+ if (outside &&
+ (strEq(name, "Limit") || strEq(name, "Feature"))) {
ALOGW("ignoring %s specified outside of a Type", name);
- } else if (!strcmp(name, "Limit")) {
- mInitCheck = addLimit(attrs);
- } else if (!strcmp(name, "Feature")) {
- mInitCheck = addFeature(attrs);
+ } else if (strEq(name, "Limit")) {
+ mParsingStatus = addLimit(attrs);
+ } else if (strEq(name, "Feature")) {
+ mParsingStatus = addFeature(attrs);
}
break;
}
@@ -329,18 +363,17 @@
break;
}
- ++mDepth;
}
void MediaCodecsXmlParser::endElementHandler(const char *name) {
- if (mInitCheck != OK) {
+ if (mParsingStatus != OK) {
return;
}
switch (mCurrentSection) {
case SECTION_SETTINGS:
{
- if (!strcmp(name, "Settings")) {
+ if (strEq(name, "Settings")) {
mCurrentSection = SECTION_TOPLEVEL;
}
break;
@@ -348,7 +381,7 @@
case SECTION_DECODERS:
{
- if (!strcmp(name, "Decoders")) {
+ if (strEq(name, "Decoders")) {
mCurrentSection = SECTION_TOPLEVEL;
}
break;
@@ -356,7 +389,7 @@
case SECTION_ENCODERS:
{
- if (!strcmp(name, "Encoders")) {
+ if (strEq(name, "Encoders")) {
mCurrentSection = SECTION_TOPLEVEL;
}
break;
@@ -365,19 +398,19 @@
case SECTION_DECODER_TYPE:
case SECTION_ENCODER_TYPE:
{
- if (!strcmp(name, "Type")) {
+ if (strEq(name, "Type")) {
mCurrentSection =
- (mCurrentSection == SECTION_DECODER_TYPE
- ? SECTION_DECODER : SECTION_ENCODER);
+ (mCurrentSection == SECTION_DECODER_TYPE ?
+ SECTION_DECODER : SECTION_ENCODER);
- mCurrentType = mCodecInfos[mCurrentName].mTypes.end();
+ mCurrentType = mCurrentCodec->second.typeMap.end();
}
break;
}
case SECTION_DECODER:
{
- if (!strcmp(name, "MediaCodec")) {
+ if (strEq(name, "MediaCodec")) {
mCurrentSection = SECTION_DECODERS;
mCurrentName.clear();
}
@@ -386,7 +419,7 @@
case SECTION_ENCODER:
{
- if (!strcmp(name, "MediaCodec")) {
+ if (strEq(name, "MediaCodec")) {
mCurrentSection = SECTION_ENCODERS;
mCurrentName.clear();
}
@@ -395,9 +428,9 @@
case SECTION_INCLUDE:
{
- if (!strcmp(name, "Include") && mPastSections.size() > 0) {
- mCurrentSection = mPastSections.top();
- mPastSections.pop();
+ if (strEq(name, "Include") && (mSectionStack.size() > 0)) {
+ mCurrentSection = mSectionStack.back();
+ mSectionStack.pop_back();
}
break;
}
@@ -406,253 +439,282 @@
break;
}
- --mDepth;
}
status_t MediaCodecsXmlParser::addSettingFromAttributes(const char **attrs) {
- const char *name = NULL;
- const char *value = NULL;
- const char *update = NULL;
+ const char *name = nullptr;
+ const char *value = nullptr;
+ const char *update = nullptr;
size_t i = 0;
- while (attrs[i] != NULL) {
- if (!strcmp(attrs[i], "name")) {
- if (attrs[i + 1] == NULL) {
+ while (attrs[i] != nullptr) {
+ if (strEq(attrs[i], "name")) {
+ if (attrs[++i] == nullptr) {
ALOGE("addSettingFromAttributes: name is null");
return -EINVAL;
}
- name = attrs[i + 1];
- ++i;
- } else if (!strcmp(attrs[i], "value")) {
- if (attrs[i + 1] == NULL) {
+ name = attrs[i];
+ } else if (strEq(attrs[i], "value")) {
+ if (attrs[++i] == nullptr) {
ALOGE("addSettingFromAttributes: value is null");
return -EINVAL;
}
- value = attrs[i + 1];
- ++i;
- } else if (!strcmp(attrs[i], "update")) {
- if (attrs[i + 1] == NULL) {
+ value = attrs[i];
+ } else if (strEq(attrs[i], "update")) {
+ if (attrs[++i] == nullptr) {
ALOGE("addSettingFromAttributes: update is null");
return -EINVAL;
}
- update = attrs[i + 1];
- ++i;
+ update = attrs[i];
} else {
ALOGE("addSettingFromAttributes: unrecognized attribute: %s", attrs[i]);
return -EINVAL;
}
-
++i;
}
- if (name == NULL || value == NULL) {
+ if (name == nullptr || value == nullptr) {
ALOGE("addSettingFromAttributes: name or value unspecified");
return -EINVAL;
}
- mUpdate = (update != NULL) && ParseBoolean(update);
- if (mUpdate != (mGlobalSettings.count(name) > 0)) {
- ALOGE("addSettingFromAttributes: updating non-existing setting");
- return -EINVAL;
+ // Boolean values are converted to "0" or "1".
+ if (strHasPrefix(name, "supports-")) {
+ value = parseBoolean(value) ? "1" : "0";
}
- mGlobalSettings[name] = value;
+
+ mUpdate = (update != nullptr) && parseBoolean(update);
+ auto attribute = mServiceAttributeMap.find(name);
+ if (attribute == mServiceAttributeMap.end()) { // New attribute name
+ if (mUpdate) {
+ ALOGE("addSettingFromAttributes: updating non-existing setting");
+ return -EINVAL;
+ }
+ mServiceAttributeMap.insert(Attribute(name, value));
+ } else { // Existing attribute name
+ if (!mUpdate) {
+ ALOGE("addSettingFromAttributes: adding existing setting");
+ }
+ attribute->second = value;
+ }
return OK;
}
status_t MediaCodecsXmlParser::addMediaCodecFromAttributes(
bool encoder, const char **attrs) {
- const char *name = NULL;
- const char *type = NULL;
- const char *update = NULL;
+ const char *name = nullptr;
+ const char *type = nullptr;
+ const char *update = nullptr;
size_t i = 0;
- while (attrs[i] != NULL) {
- if (!strcmp(attrs[i], "name")) {
- if (attrs[i + 1] == NULL) {
+ while (attrs[i] != nullptr) {
+ if (strEq(attrs[i], "name")) {
+ if (attrs[++i] == nullptr) {
ALOGE("addMediaCodecFromAttributes: name is null");
return -EINVAL;
}
- name = attrs[i + 1];
- ++i;
- } else if (!strcmp(attrs[i], "type")) {
- if (attrs[i + 1] == NULL) {
+ name = attrs[i];
+ } else if (strEq(attrs[i], "type")) {
+ if (attrs[++i] == nullptr) {
ALOGE("addMediaCodecFromAttributes: type is null");
return -EINVAL;
}
- type = attrs[i + 1];
- ++i;
- } else if (!strcmp(attrs[i], "update")) {
- if (attrs[i + 1] == NULL) {
+ type = attrs[i];
+ } else if (strEq(attrs[i], "update")) {
+ if (attrs[++i] == nullptr) {
ALOGE("addMediaCodecFromAttributes: update is null");
return -EINVAL;
}
- update = attrs[i + 1];
- ++i;
+ update = attrs[i];
} else {
ALOGE("addMediaCodecFromAttributes: unrecognized attribute: %s", attrs[i]);
return -EINVAL;
}
-
++i;
}
- if (name == NULL) {
+ if (name == nullptr) {
ALOGE("addMediaCodecFromAttributes: name not found");
return -EINVAL;
}
- mUpdate = (update != NULL) && ParseBoolean(update);
- if (mUpdate != (mCodecInfos.count(name) > 0)) {
- ALOGE("addMediaCodecFromAttributes: updating non-existing codec or vice versa");
- return -EINVAL;
- }
-
- CodecInfo *info = &mCodecInfos[name];
- if (mUpdate) {
- // existing codec
- mCurrentName = name;
- mCurrentType = info->mTypes.begin();
- if (type != NULL) {
- // existing type
- mCurrentType = findTypeInfo(*info, type);
- if (mCurrentType == info->mTypes.end()) {
+ mUpdate = (update != nullptr) && parseBoolean(update);
+ mCurrentCodec = mCodecMap.find(name);
+ if (mCurrentCodec == mCodecMap.end()) { // New codec name
+ if (mUpdate) {
+ ALOGE("addMediaCodecFromAttributes: updating non-existing codec");
+ return -EINVAL;
+ }
+ // Create a new codec in mCodecMap
+ mCurrentCodec = mCodecMap.insert(
+ Codec(name, CodecProperties())).first;
+ if (type != nullptr) {
+ mCurrentType = mCurrentCodec->second.typeMap.insert(
+ Type(type, AttributeMap())).first;
+ } else {
+ mCurrentType = mCurrentCodec->second.typeMap.end();
+ }
+ mCurrentCodec->second.isEncoder = encoder;
+ mCurrentCodec->second.order = mCodecCounter++;
+ } else { // Existing codec name
+ if (!mUpdate) {
+ ALOGE("addMediaCodecFromAttributes: adding existing codec");
+ return -EINVAL;
+ }
+ if (type != nullptr) {
+ mCurrentType = mCurrentCodec->second.typeMap.find(type);
+ if (mCurrentType == mCurrentCodec->second.typeMap.end()) {
ALOGE("addMediaCodecFromAttributes: updating non-existing type");
return -EINVAL;
}
+ } else {
+ // This should happen only when the codec has at most one type.
+ mCurrentType = mCurrentCodec->second.typeMap.begin();
}
- } else {
- // new codec
- mCurrentName = name;
- mQuirks[name].clear();
- info->mTypes.clear();
- info->mTypes.emplace_back();
- mCurrentType = --info->mTypes.end();
- mCurrentType->mName = type;
- info->mIsEncoder = encoder;
}
return OK;
}
status_t MediaCodecsXmlParser::addQuirk(const char **attrs) {
- const char *name = NULL;
+ const char *name = nullptr;
size_t i = 0;
- while (attrs[i] != NULL) {
- if (!strcmp(attrs[i], "name")) {
- if (attrs[i + 1] == NULL) {
+ while (attrs[i] != nullptr) {
+ if (strEq(attrs[i], "name")) {
+ if (attrs[++i] == nullptr) {
ALOGE("addQuirk: name is null");
return -EINVAL;
}
- name = attrs[i + 1];
- ++i;
+ name = attrs[i];
} else {
ALOGE("addQuirk: unrecognized attribute: %s", attrs[i]);
return -EINVAL;
}
-
++i;
}
- if (name == NULL) {
+ if (name == nullptr) {
ALOGE("addQuirk: name not found");
return -EINVAL;
}
- mQuirks[mCurrentName].emplace_back(name);
+ mCurrentCodec->second.quirkSet.emplace(name);
return OK;
}
status_t MediaCodecsXmlParser::addTypeFromAttributes(const char **attrs, bool encoder) {
- const char *name = NULL;
- const char *update = NULL;
+ const char *name = nullptr;
+ const char *update = nullptr;
size_t i = 0;
- while (attrs[i] != NULL) {
- if (!strcmp(attrs[i], "name")) {
- if (attrs[i + 1] == NULL) {
+ while (attrs[i] != nullptr) {
+ if (strEq(attrs[i], "name")) {
+ if (attrs[++i] == nullptr) {
ALOGE("addTypeFromAttributes: name is null");
return -EINVAL;
}
- name = attrs[i + 1];
- ++i;
- } else if (!strcmp(attrs[i], "update")) {
- if (attrs[i + 1] == NULL) {
+ name = attrs[i];
+ } else if (strEq(attrs[i], "update")) {
+ if (attrs[++i] == nullptr) {
ALOGE("addTypeFromAttributes: update is null");
return -EINVAL;
}
- update = attrs[i + 1];
- ++i;
+ update = attrs[i];
} else {
ALOGE("addTypeFromAttributes: unrecognized attribute: %s", attrs[i]);
return -EINVAL;
}
-
++i;
}
- if (name == NULL) {
+ if (name == nullptr) {
return -EINVAL;
}
- CodecInfo *info = &mCodecInfos[mCurrentName];
- info->mIsEncoder = encoder;
- mCurrentType = findTypeInfo(*info, name);
+ mCurrentCodec->second.isEncoder = encoder;
+ mCurrentType = mCurrentCodec->second.typeMap.find(name);
if (!mUpdate) {
- if (mCurrentType != info->mTypes.end()) {
+ if (mCurrentType != mCurrentCodec->second.typeMap.end()) {
ALOGE("addTypeFromAttributes: re-defining existing type without update");
return -EINVAL;
}
- info->mTypes.emplace_back();
- mCurrentType = --info->mTypes.end();
- } else if (mCurrentType == info->mTypes.end()) {
+ mCurrentType = mCurrentCodec->second.typeMap.insert(
+ Type(name, AttributeMap())).first;
+ } else if (mCurrentType == mCurrentCodec->second.typeMap.end()) {
ALOGE("addTypeFromAttributes: updating non-existing type");
- return -EINVAL;
}
-
return OK;
}
-static status_t limitFoundMissingAttr(const AString &name, const char *attr, bool found = true) {
- ALOGE("limit '%s' with %s'%s' attribute", name.c_str(),
- (found ? "" : "no "), attr);
- return -EINVAL;
-}
-
-static status_t limitError(const AString &name, const char *msg) {
- ALOGE("limit '%s' %s", name.c_str(), msg);
- return -EINVAL;
-}
-
-static status_t limitInvalidAttr(const AString &name, const char *attr, const AString &value) {
- ALOGE("limit '%s' with invalid '%s' attribute (%s)", name.c_str(),
- attr, value.c_str());
- return -EINVAL;
-}
-
status_t MediaCodecsXmlParser::addLimit(const char **attrs) {
- sp<AMessage> msg = new AMessage();
+ const char* a_name = nullptr;
+ const char* a_default = nullptr;
+ const char* a_in = nullptr;
+ const char* a_max = nullptr;
+ const char* a_min = nullptr;
+ const char* a_range = nullptr;
+ const char* a_ranges = nullptr;
+ const char* a_scale = nullptr;
+ const char* a_value = nullptr;
size_t i = 0;
- while (attrs[i] != NULL) {
- if (attrs[i + 1] == NULL) {
- ALOGE("addLimit: limit is not given");
- return -EINVAL;
- }
-
- // attributes with values
- if (!strcmp(attrs[i], "name")
- || !strcmp(attrs[i], "default")
- || !strcmp(attrs[i], "in")
- || !strcmp(attrs[i], "max")
- || !strcmp(attrs[i], "min")
- || !strcmp(attrs[i], "range")
- || !strcmp(attrs[i], "ranges")
- || !strcmp(attrs[i], "scale")
- || !strcmp(attrs[i], "value")) {
- msg->setString(attrs[i], attrs[i + 1]);
- ++i;
+ while (attrs[i] != nullptr) {
+ if (strEq(attrs[i], "name")) {
+ if (attrs[++i] == nullptr) {
+ ALOGE("addLimit: name is null");
+ return -EINVAL;
+ }
+ a_name = attrs[i];
+ } else if (strEq(attrs[i], "default")) {
+ if (attrs[++i] == nullptr) {
+ ALOGE("addLimit: default is null");
+ return -EINVAL;
+ }
+ a_default = attrs[i];
+ } else if (strEq(attrs[i], "in")) {
+ if (attrs[++i] == nullptr) {
+ ALOGE("addLimit: in is null");
+ return -EINVAL;
+ }
+ a_in = attrs[i];
+ } else if (strEq(attrs[i], "max")) {
+ if (attrs[++i] == nullptr) {
+ ALOGE("addLimit: max is null");
+ return -EINVAL;
+ }
+ a_max = attrs[i];
+ } else if (strEq(attrs[i], "min")) {
+ if (attrs[++i] == nullptr) {
+ ALOGE("addLimit: min is null");
+ return -EINVAL;
+ }
+ a_min = attrs[i];
+ } else if (strEq(attrs[i], "range")) {
+ if (attrs[++i] == nullptr) {
+ ALOGE("addLimit: range is null");
+ return -EINVAL;
+ }
+ a_range = attrs[i];
+ } else if (strEq(attrs[i], "ranges")) {
+ if (attrs[++i] == nullptr) {
+ ALOGE("addLimit: ranges is null");
+ return -EINVAL;
+ }
+ a_ranges = attrs[i];
+ } else if (strEq(attrs[i], "scale")) {
+ if (attrs[++i] == nullptr) {
+ ALOGE("addLimit: scale is null");
+ return -EINVAL;
+ }
+ a_scale = attrs[i];
+ } else if (strEq(attrs[i], "value")) {
+ if (attrs[++i] == nullptr) {
+ ALOGE("addLimit: value is null");
+ return -EINVAL;
+ }
+ a_value = attrs[i];
} else {
ALOGE("addLimit: unrecognized limit: %s", attrs[i]);
return -EINVAL;
@@ -660,8 +722,7 @@
++i;
}
- AString name;
- if (!msg->findString("name", &name)) {
+ if (a_name == nullptr) {
ALOGE("limit with no 'name' attribute");
return -EINVAL;
}
@@ -670,109 +731,148 @@
// measured-frame-rate, measured-blocks-per-second: range
// quality: range + default + [scale]
// complexity: range + default
- bool found;
- if (mCurrentType == mCodecInfos[mCurrentName].mTypes.end()) {
+ if (mCurrentType == mCurrentCodec->second.typeMap.end()) {
ALOGW("ignoring null type");
return OK;
}
- if (name == "aspect-ratio" || name == "bitrate" || name == "block-count"
- || name == "blocks-per-second" || name == "complexity"
- || name == "frame-rate" || name == "quality" || name == "size"
- || name == "measured-blocks-per-second" || name.startsWith("measured-frame-rate-")) {
- AString min, max;
- if (msg->findString("min", &min) && msg->findString("max", &max)) {
- min.append("-");
- min.append(max);
- if (msg->contains("range") || msg->contains("value")) {
- return limitError(name, "has 'min' and 'max' as well as 'range' or "
+ std::string range;
+ if (strEq(a_name, "aspect-ratio") ||
+ strEq(a_name, "bitrate") ||
+ strEq(a_name, "block-count") ||
+ strEq(a_name, "blocks-per-second") ||
+ strEq(a_name, "complexity") ||
+ strEq(a_name, "frame-rate") ||
+ strEq(a_name, "quality") ||
+ strEq(a_name, "size") ||
+ strEq(a_name, "measured-blocks-per-second") ||
+ strHasPrefix(a_name, "measured-frame-rate-")) {
+ // "range" is specified in exactly one of the following forms:
+ // 1) min-max
+ // 2) value-value
+ // 3) range
+ if (a_min != nullptr && a_max != nullptr) {
+ // min-max
+ if (a_range != nullptr || a_value != nullptr) {
+ return limitError(a_name, "has 'min' and 'max' as well as 'range' or "
"'value' attributes");
}
- msg->setString("range", min);
- } else if (msg->contains("min") || msg->contains("max")) {
- return limitError(name, "has only 'min' or 'max' attribute");
- } else if (msg->findString("value", &max)) {
- min = max;
- min.append("-");
- min.append(max);
- if (msg->contains("range")) {
- return limitError(name, "has both 'range' and 'value' attributes");
+ range = a_min;
+ range += '-';
+ range += a_max;
+ } else if (a_min != nullptr || a_max != nullptr) {
+ return limitError(a_name, "has only 'min' or 'max' attribute");
+ } else if (a_value != nullptr) {
+ // value-value
+ if (a_range != nullptr) {
+ return limitError(a_name, "has both 'range' and 'value' attributes");
}
- msg->setString("range", min);
- }
-
- AString range, scale = "linear", def, in_;
- if (!msg->findString("range", &range)) {
- return limitError(name, "with no 'range', 'value' or 'min'/'max' attributes");
- }
-
- if ((name == "quality" || name == "complexity") ^
- (found = msg->findString("default", &def))) {
- return limitFoundMissingAttr(name, "default", found);
- }
- if (name != "quality" && msg->findString("scale", &scale)) {
- return limitFoundMissingAttr(name, "scale");
- }
- if ((name == "aspect-ratio") ^ (found = msg->findString("in", &in_))) {
- return limitFoundMissingAttr(name, "in", found);
- }
-
- if (name == "aspect-ratio") {
- if (!(in_ == "pixels") && !(in_ == "blocks")) {
- return limitInvalidAttr(name, "in", in_);
- }
- in_.erase(5, 1); // (pixel|block)-aspect-ratio
- in_.append("-");
- in_.append(name);
- name = in_;
- }
- if (name == "quality") {
- mCurrentType->mDetails["quality-scale"] = scale;
- }
- if (name == "quality" || name == "complexity") {
- AString tag = name;
- tag.append("-default");
- mCurrentType->mDetails[tag] = def;
- }
- AString tag = name;
- tag.append("-range");
- mCurrentType->mDetails[tag] = range;
- } else {
- AString max, value, ranges;
- if (msg->contains("default")) {
- return limitFoundMissingAttr(name, "default");
- } else if (msg->contains("in")) {
- return limitFoundMissingAttr(name, "in");
- } else if ((name == "channel-count" || name == "concurrent-instances") ^
- (found = msg->findString("max", &max))) {
- return limitFoundMissingAttr(name, "max", found);
- } else if (msg->contains("min")) {
- return limitFoundMissingAttr(name, "min");
- } else if (msg->contains("range")) {
- return limitFoundMissingAttr(name, "range");
- } else if ((name == "sample-rate") ^
- (found = msg->findString("ranges", &ranges))) {
- return limitFoundMissingAttr(name, "ranges", found);
- } else if (msg->contains("scale")) {
- return limitFoundMissingAttr(name, "scale");
- } else if ((name == "alignment" || name == "block-size") ^
- (found = msg->findString("value", &value))) {
- return limitFoundMissingAttr(name, "value", found);
- }
-
- if (max.size()) {
- AString tag = "max-";
- tag.append(name);
- mCurrentType->mDetails[tag] = max;
- } else if (value.size()) {
- mCurrentType->mDetails[name] = value;
- } else if (ranges.size()) {
- AString tag = name;
- tag.append("-ranges");
- mCurrentType->mDetails[tag] = ranges;
+ range = a_value;
+ range += '-';
+ range += a_value;
+ } else if (a_range == nullptr) {
+ return limitError(a_name, "with no 'range', 'value' or 'min'/'max' attributes");
} else {
- ALOGW("Ignoring unrecognized limit '%s'", name.c_str());
+ // range
+ range = a_range;
}
+
+ // "aspect-ratio" requires some special treatment.
+ if (strEq(a_name, "aspect-ratio")) {
+ // "aspect-ratio" must have "in".
+ if (a_in == nullptr) {
+ return limitFoundMissingAttr(a_name, "in", false);
+ }
+ // "in" must be either "pixels" or "blocks".
+ if (!strEq(a_in, "pixels") && !strEq(a_in, "blocks")) {
+ return limitInvalidAttr(a_name, "in", a_in);
+ }
+ // name will be "pixel-aspect-ratio-range" or
+ // "block-aspect-ratio-range".
+ mCurrentType->second[
+ std::string(a_in).substr(0, strlen(a_in) - 1) +
+ "-aspect-ratio-range"] = range;
+ } else {
+ // For everything else (apart from "aspect-ratio"), simply append
+ // "-range" to the name for the range-type property.
+ mCurrentType->second[std::string(a_name) + "-range"] = range;
+
+ // Only "quality" may have "scale".
+ if (!strEq(a_name, "quality") && a_scale != nullptr) {
+ return limitFoundMissingAttr(a_name, "scale");
+ } else if (strEq(a_name, "quality")) {
+ // The default value of "quality-scale" is "linear".
+ mCurrentType->second["quality-scale"] = a_scale == nullptr ?
+ "linear" : a_scale;
+ }
+
+ // "quality" and "complexity" must have "default".
+ // Other limits must not have "default".
+ if (strEq(a_name, "quality") || strEq(a_name, "complexity")) {
+ if (a_default == nullptr) {
+ return limitFoundMissingAttr(a_name, "default", false);
+ }
+ // name will be "quality-default" or "complexity-default".
+ mCurrentType->second[std::string(a_name) + "-default"] = a_default;
+ } else if (a_default != nullptr) {
+ return limitFoundMissingAttr(a_name, "default", true);
+ }
+ }
+ } else {
+ if (a_default != nullptr) {
+ return limitFoundMissingAttr(a_name, "default");
+ }
+ if (a_in != nullptr) {
+ return limitFoundMissingAttr(a_name, "in");
+ }
+ if (a_scale != nullptr) {
+ return limitFoundMissingAttr(a_name, "scale");
+ }
+ if (a_range != nullptr) {
+ return limitFoundMissingAttr(a_name, "range");
+ }
+ if (a_min != nullptr) {
+ return limitFoundMissingAttr(a_name, "min");
+ }
+
+ if (a_max != nullptr) {
+ // "max" must exist if and only if name is "channel-count" or
+ // "concurrent-instances".
+ // "min" is not ncessary.
+ if (strEq(a_name, "channel-count") ||
+ strEq(a_name, "concurrent-instances")) {
+ mCurrentType->second[std::string("max-") + a_name] = a_max;
+ } else {
+ return limitFoundMissingAttr(a_name, "max", false);
+ }
+ } else if (strEq(a_name, "channel-count") ||
+ strEq(a_name, "concurrent-instances")) {
+ return limitFoundMissingAttr(a_name, "max");
+ }
+
+ if (a_ranges != nullptr) {
+ // "ranges" must exist if and only if name is "sample-rate".
+ if (strEq(a_name, "sample-rate")) {
+ mCurrentType->second["sample-rate-ranges"] = a_ranges;
+ } else {
+ return limitFoundMissingAttr(a_name, "ranges", false);
+ }
+ } else if (strEq(a_name, "sample-rate")) {
+ return limitFoundMissingAttr(a_name, "ranges");
+ }
+
+ if (a_value != nullptr) {
+ // "value" must exist if and only if name is "alignment" or
+ // "block-size".
+ if (strEq(a_name, "alignment") || strEq(a_name, "block-size")) {
+ mCurrentType->second[a_name] = a_value;
+ } else {
+ return limitFoundMissingAttr(a_name, "value", false);
+ }
+ } else if (strEq(a_name, "alignment") || strEq(a_name, "block-size")) {
+ return limitFoundMissingAttr(a_name, "value", false);
+ }
+
}
return OK;
@@ -780,83 +880,169 @@
status_t MediaCodecsXmlParser::addFeature(const char **attrs) {
size_t i = 0;
- const char *name = NULL;
+ const char *name = nullptr;
int32_t optional = -1;
int32_t required = -1;
- const char *value = NULL;
+ const char *value = nullptr;
- while (attrs[i] != NULL) {
- if (attrs[i + 1] == NULL) {
- ALOGE("addFeature: feature is not given");
- return -EINVAL;
- }
-
- // attributes with values
- if (!strcmp(attrs[i], "name")) {
- name = attrs[i + 1];
- ++i;
- } else if (!strcmp(attrs[i], "optional") || !strcmp(attrs[i], "required")) {
- int value = (int)ParseBoolean(attrs[i + 1]);
- if (!strcmp(attrs[i], "optional")) {
- optional = value;
- } else {
- required = value;
+ while (attrs[i] != nullptr) {
+ if (strEq(attrs[i], "name")) {
+ if (attrs[++i] == nullptr) {
+ ALOGE("addFeature: name is null");
+ return -EINVAL;
}
- ++i;
- } else if (!strcmp(attrs[i], "value")) {
- value = attrs[i + 1];
- ++i;
+ name = attrs[i];
+ } else if (strEq(attrs[i], "optional")) {
+ if (attrs[++i] == nullptr) {
+ ALOGE("addFeature: optional is null");
+ return -EINVAL;
+ }
+ optional = parseBoolean(attrs[i]) ? 1 : 0;
+ } else if (strEq(attrs[i], "required")) {
+ if (attrs[++i] == nullptr) {
+ ALOGE("addFeature: required is null");
+ return -EINVAL;
+ }
+ required = parseBoolean(attrs[i]) ? 1 : 0;
+ } else if (strEq(attrs[i], "value")) {
+ if (attrs[++i] == nullptr) {
+ ALOGE("addFeature: value is null");
+ return -EINVAL;
+ }
+ value = attrs[i];
} else {
ALOGE("addFeature: unrecognized attribute: %s", attrs[i]);
return -EINVAL;
}
++i;
}
- if (name == NULL) {
+
+ // Every feature must have a name.
+ if (name == nullptr) {
ALOGE("feature with no 'name' attribute");
return -EINVAL;
}
- if (optional == required && optional != -1) {
- ALOGE("feature '%s' is both/neither optional and required", name);
- return -EINVAL;
- }
-
- if (mCurrentType == mCodecInfos[mCurrentName].mTypes.end()) {
+ if (mCurrentType == mCurrentCodec->second.typeMap.end()) {
ALOGW("ignoring null type");
return OK;
}
- if (value != NULL) {
- mCurrentType->mStringFeatures[name] = value;
- } else {
- mCurrentType->mBoolFeatures[name] = (required == 1) || (optional == 0);
+
+ if ((optional != -1) || (required != -1)) {
+ if (optional == required) {
+ ALOGE("feature '%s' is both/neither optional and required", name);
+ return -EINVAL;
+ }
+ if ((optional == 1) || (required == 1)) {
+ if (value != nullptr) {
+ ALOGE("feature '%s' cannot have extra 'value'", name);
+ return -EINVAL;
+ }
+ mCurrentType->second[std::string("feature-") + name] =
+ optional == 1 ? "0" : "1";
+ return OK;
+ }
}
+ mCurrentType->second[std::string("feature-") + name] = value == nullptr ?
+ "0" : value;
return OK;
}
-void MediaCodecsXmlParser::getGlobalSettings(
- std::map<AString, AString> *settings) const {
- settings->clear();
- settings->insert(mGlobalSettings.begin(), mGlobalSettings.end());
+const MediaCodecsXmlParser::AttributeMap&
+ MediaCodecsXmlParser::getServiceAttributeMap() const {
+ return mServiceAttributeMap;
}
-status_t MediaCodecsXmlParser::getCodecInfo(const char *name, CodecInfo *info) const {
- if (mCodecInfos.count(name) == 0) {
- ALOGE("Codec not found with name '%s'", name);
- return NAME_NOT_FOUND;
+const MediaCodecsXmlParser::CodecMap&
+ MediaCodecsXmlParser::getCodecMap() const {
+ return mCodecMap;
+}
+
+const MediaCodecsXmlParser::RoleMap&
+ MediaCodecsXmlParser::getRoleMap() const {
+ if (mRoleMap.empty()) {
+ generateRoleMap();
}
- *info = mCodecInfos.at(name);
- return OK;
+ return mRoleMap;
}
-status_t MediaCodecsXmlParser::getQuirks(const char *name, std::vector<AString> *quirks) const {
- if (mQuirks.count(name) == 0) {
- ALOGE("Codec not found with name '%s'", name);
- return NAME_NOT_FOUND;
+const char* MediaCodecsXmlParser::getCommonPrefix() const {
+ if (mCommonPrefix.empty()) {
+ generateCommonPrefix();
}
- quirks->clear();
- quirks->insert(quirks->end(), mQuirks.at(name).begin(), mQuirks.at(name).end());
- return OK;
+ return mCommonPrefix.data();
}
-} // namespace android
+status_t MediaCodecsXmlParser::getParsingStatus() const {
+ return mParsingStatus;
+}
+
+void MediaCodecsXmlParser::generateRoleMap() const {
+ for (const auto& codec : mCodecMap) {
+ const auto& codecName = codec.first;
+ bool isEncoder = codec.second.isEncoder;
+ size_t order = codec.second.order;
+ const auto& typeMap = codec.second.typeMap;
+ for (const auto& type : typeMap) {
+ const auto& typeName = type.first;
+ const char* roleName = GetComponentRole(isEncoder, typeName.data());
+ const auto& typeAttributeMap = type.second;
+
+ auto roleIterator = mRoleMap.find(roleName);
+ std::multimap<size_t, NodeInfo>* nodeList;
+ if (roleIterator == mRoleMap.end()) {
+ RoleProperties roleProperties;
+ roleProperties.type = typeName;
+ roleProperties.isEncoder = isEncoder;
+ auto insertResult = mRoleMap.insert(
+ std::make_pair(roleName, roleProperties));
+ if (!insertResult.second) {
+ ALOGE("Cannot add role %s", roleName);
+ continue;
+ }
+ nodeList = &insertResult.first->second.nodeList;
+ } else {
+ if (roleIterator->second.type != typeName) {
+ ALOGE("Role %s has mismatching types: %s and %s",
+ roleName,
+ roleIterator->second.type.data(),
+ typeName.data());
+ continue;
+ }
+ if (roleIterator->second.isEncoder != isEncoder) {
+ ALOGE("Role %s cannot be both an encoder and a decoder",
+ roleName);
+ continue;
+ }
+ nodeList = &roleIterator->second.nodeList;
+ }
+
+ NodeInfo nodeInfo;
+ nodeInfo.name = codecName;
+ nodeInfo.attributeList.reserve(typeAttributeMap.size());
+ for (const auto& attribute : typeAttributeMap) {
+ nodeInfo.attributeList.push_back(
+ Attribute{attribute.first, attribute.second});
+ }
+ nodeList->insert(std::make_pair(
+ std::move(order), std::move(nodeInfo)));
+ }
+ }
+}
+
+void MediaCodecsXmlParser::generateCommonPrefix() const {
+ if (mCodecMap.empty()) {
+ return;
+ }
+ auto i = mCodecMap.cbegin();
+ auto first = i->first.cbegin();
+ auto last = i->first.cend();
+ for (++i; i != mCodecMap.cend(); ++i) {
+ last = std::mismatch(
+ first, last, i->first.cbegin(), i->first.cend()).first;
+ }
+ mCommonPrefix.insert(mCommonPrefix.begin(), first, last);
+}
+
+} // namespace android
+
diff --git a/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h b/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h
index b324cd8..cc69e52 100644
--- a/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h
+++ b/media/libstagefright/xmlparser/include/media/stagefright/xmlparser/MediaCodecsXmlParser.h
@@ -14,65 +14,107 @@
* limitations under the License.
*/
-#ifndef MEDIA_CODECS_XML_PARSER_H_
-
-#define MEDIA_CODECS_XML_PARSER_H_
-
-#include <map>
-#include <vector>
-
-#include <media/stagefright/foundation/ABase.h>
-#include <media/stagefright/foundation/AString.h>
+#ifndef MEDIA_STAGEFRIGHT_XMLPARSER_H_
+#define MEDIA_STAGEFRIGHT_XMLPARSER_H_
#include <sys/types.h>
#include <utils/Errors.h>
#include <utils/Vector.h>
#include <utils/StrongPointer.h>
+#include <string>
+#include <set>
+#include <map>
+#include <vector>
+
namespace android {
-struct AMessage;
-
-// Quirk still supported, even though deprecated
-enum Quirks {
- kRequiresAllocateBufferOnInputPorts = 1,
- kRequiresAllocateBufferOnOutputPorts = 2,
-
- kQuirksMask = kRequiresAllocateBufferOnInputPorts
- | kRequiresAllocateBufferOnOutputPorts,
-};
-
-// Lightweight struct for querying components.
-struct TypeInfo {
- AString mName;
- std::map<AString, AString> mStringFeatures;
- std::map<AString, bool> mBoolFeatures;
- std::map<AString, AString> mDetails;
-};
-
-struct ProfileLevel {
- uint32_t mProfile;
- uint32_t mLevel;
-};
-
-struct CodecInfo {
- std::vector<TypeInfo> mTypes;
- std::vector<ProfileLevel> mProfileLevels;
- std::vector<uint32_t> mColorFormats;
- uint32_t mFlags;
- bool mIsEncoder;
-};
-
class MediaCodecsXmlParser {
public:
- MediaCodecsXmlParser();
+
+ // Treblized media codec list will be located in /odm/etc or /vendor/etc.
+ static constexpr char const* defaultSearchDirs[] =
+ {"/odm/etc", "/vendor/etc", "/etc", nullptr};
+ static constexpr char const* defaultMainXmlName =
+ "media_codecs.xml";
+ static constexpr char const* defaultPerformanceXmlName =
+ "media_codecs_performance.xml";
+ static constexpr char const* defaultProfilingResultsXmlPath =
+ "/data/misc/media/media_codecs_profiling_results.xml";
+
+ MediaCodecsXmlParser(
+ const char* const* searchDirs = defaultSearchDirs,
+ const char* mainXmlName = defaultMainXmlName,
+ const char* performanceXmlName = defaultPerformanceXmlName,
+ const char* profilingResultsXmlPath = defaultProfilingResultsXmlPath);
~MediaCodecsXmlParser();
- void getGlobalSettings(std::map<AString, AString> *settings) const;
+ typedef std::pair<std::string, std::string> Attribute;
+ typedef std::map<std::string, std::string> AttributeMap;
- status_t getCodecInfo(const char *name, CodecInfo *info) const;
+ typedef std::pair<std::string, AttributeMap> Type;
+ typedef std::map<std::string, AttributeMap> TypeMap;
- status_t getQuirks(const char *name, std::vector<AString> *quirks) const;
+ typedef std::set<std::string> QuirkSet;
+
+ /**
+ * Properties of a codec (node)
+ */
+ struct CodecProperties {
+ bool isEncoder; ///< Whether this codec is an encoder or a decoder
+ size_t order; ///< Order of appearance in the file (starting from 0)
+ QuirkSet quirkSet; ///< Set of quirks requested by this codec
+ TypeMap typeMap; ///< Map of types supported by this codec
+ };
+
+ typedef std::pair<std::string, CodecProperties> Codec;
+ typedef std::map<std::string, CodecProperties> CodecMap;
+
+ /**
+ * Properties of a node (for IOmxStore)
+ */
+ struct NodeInfo {
+ std::string name;
+ std::vector<Attribute> attributeList;
+ };
+
+ /**
+ * Properties of a role (for IOmxStore)
+ */
+ struct RoleProperties {
+ std::string type;
+ bool isEncoder;
+ std::multimap<size_t, NodeInfo> nodeList;
+ };
+
+ typedef std::pair<std::string, RoleProperties> Role;
+ typedef std::map<std::string, RoleProperties> RoleMap;
+
+ /**
+ * Return a map for attributes that are service-specific.
+ */
+ const AttributeMap& getServiceAttributeMap() const;
+
+ /**
+ * Return a map for codecs and their properties.
+ */
+ const CodecMap& getCodecMap() const;
+
+ /**
+ * Return a map for roles and their properties.
+ * This map is generated from the CodecMap.
+ */
+ const RoleMap& getRoleMap() const;
+
+ /**
+ * Return a common prefix of all node names.
+ *
+ * The prefix is not provided in the xml, so it has to be computed by taking
+ * the longest common prefix of all node names.
+ */
+ const char* getCommonPrefix() const;
+
+ status_t getParsingStatus() const;
private:
enum Section {
@@ -87,23 +129,31 @@
SECTION_INCLUDE,
};
- status_t mInitCheck;
+ status_t mParsingStatus;
Section mCurrentSection;
bool mUpdate;
- Vector<Section> mPastSections;
- int32_t mDepth;
- AString mHrefBase;
+ std::vector<Section> mSectionStack;
+ std::string mHrefBase;
- std::map<AString, AString> mGlobalSettings;
+ // Service attributes
+ AttributeMap mServiceAttributeMap;
- // name -> CodecInfo
- std::map<AString, CodecInfo> mCodecInfos;
- std::map<AString, std::vector<AString>> mQuirks;
- AString mCurrentName;
- std::vector<TypeInfo>::iterator mCurrentType;
+ // Codec attributes
+ std::string mCurrentName;
+ std::set<std::string> mCodecSet;
+ Codec mCodecListTemp[2048];
+ CodecMap mCodecMap;
+ size_t mCodecCounter;
+ CodecMap::iterator mCurrentCodec;
+ TypeMap::iterator mCurrentType;
- status_t initCheck() const;
- void parseTopLevelXMLFile(const char *path, bool ignore_errors = false);
+ // Role map
+ mutable RoleMap mRoleMap;
+
+ // Computed longest common prefix
+ mutable std::string mCommonPrefix;
+
+ bool parseTopLevelXMLFile(const char *path, bool ignore_errors = false);
void parseXMLFile(const char *path);
@@ -118,7 +168,8 @@
status_t includeXMLFile(const char **attrs);
status_t addSettingFromAttributes(const char **attrs);
status_t addMediaCodecFromAttributes(bool encoder, const char **attrs);
- void addMediaCodec(bool encoder, const char *name, const char *type = NULL);
+ void addMediaCodec(bool encoder, const char *name,
+ const char *type = nullptr);
status_t addQuirk(const char **attrs);
status_t addTypeFromAttributes(const char **attrs, bool encoder);
@@ -126,10 +177,14 @@
status_t addFeature(const char **attrs);
void addType(const char *name);
- DISALLOW_EVIL_CONSTRUCTORS(MediaCodecsXmlParser);
+ void generateRoleMap() const;
+ void generateCommonPrefix() const;
+
+ MediaCodecsXmlParser(const MediaCodecsXmlParser&) = delete;
+ MediaCodecsXmlParser& operator=(const MediaCodecsXmlParser&) = delete;
};
-} // namespace android
+} // namespace android
-#endif // MEDIA_CODECS_XML_PARSER_H_
+#endif // MEDIA_STAGEFRIGHT_XMLPARSER_H_
diff --git a/services/mediacodec/Android.mk b/services/mediacodec/Android.mk
index 6997b5a..faeb0a7 100644
--- a/services/mediacodec/Android.mk
+++ b/services/mediacodec/Android.mk
@@ -9,13 +9,8 @@
libgui \
libutils \
liblog \
- libstagefright_omx
-LOCAL_C_INCLUDES := \
- frameworks/av/include \
- frameworks/av/media/libstagefright \
- frameworks/av/media/libstagefright/include \
- frameworks/native/include \
- frameworks/native/include/media/openmax
+ libstagefright_omx \
+ libstagefright_xmlparser
LOCAL_MODULE:= libmediacodecservice
LOCAL_VENDOR_MODULE := true
LOCAL_32_BIT_ONLY := true
@@ -38,15 +33,10 @@
libhwbinder \
libhidltransport \
libstagefright_omx \
+ libstagefright_xmlparser \
android.hardware.media.omx@1.0 \
android.hidl.memory@1.0
-LOCAL_C_INCLUDES := \
- frameworks/av/include \
- frameworks/av/media/libstagefright \
- frameworks/av/media/libstagefright/include \
- frameworks/native/include \
- frameworks/native/include/media/openmax
LOCAL_MODULE := android.hardware.media.omx@1.0-service
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_VENDOR_MODULE := true
diff --git a/services/mediacodec/MediaCodecService.cpp b/services/mediacodec/MediaCodecService.cpp
index fc1e5d9..6b510c6 100644
--- a/services/mediacodec/MediaCodecService.cpp
+++ b/services/mediacodec/MediaCodecService.cpp
@@ -24,15 +24,25 @@
sp<IOMX> MediaCodecService::getOMX() {
- Mutex::Autolock autoLock(mLock);
+ Mutex::Autolock autoLock(mOMXLock);
if (mOMX.get() == NULL) {
- mOMX = new OMX;
+ mOMX = new OMX();
}
return mOMX;
}
+sp<IOMXStore> MediaCodecService::getOMXStore() {
+
+ Mutex::Autolock autoLock(mOMXStoreLock);
+
+ if (mOMXStore.get() == NULL) {
+ mOMXStore = new OMXStore();
+ }
+
+ return mOMXStore;
+}
status_t MediaCodecService::onTransact(uint32_t code, const Parcel& data, Parcel* reply,
uint32_t flags)
diff --git a/services/mediacodec/MediaCodecService.h b/services/mediacodec/MediaCodecService.h
index 0d2c9d8..9301135 100644
--- a/services/mediacodec/MediaCodecService.h
+++ b/services/mediacodec/MediaCodecService.h
@@ -20,10 +20,12 @@
#include <binder/BinderService.h>
#include <media/IMediaCodecService.h>
#include <media/stagefright/omx/OMX.h>
+#include <media/stagefright/omx/OMXStore.h>
namespace android {
-class MediaCodecService : public BinderService<MediaCodecService>, public BnMediaCodecService
+class MediaCodecService : public BinderService<MediaCodecService>,
+ public BnMediaCodecService
{
friend class BinderService<MediaCodecService>; // for MediaCodecService()
public:
@@ -31,16 +33,20 @@
virtual ~MediaCodecService() { }
virtual void onFirstRef() { }
- static const char* getServiceName() { return "media.codec"; }
+ static const char* getServiceName() { return "media.codec"; }
- virtual sp<IOMX> getOMX();
+ virtual sp<IOMX> getOMX();
- virtual status_t onTransact(uint32_t code, const Parcel& data, Parcel* reply,
- uint32_t flags);
+ virtual sp<IOMXStore> getOMXStore();
+
+ virtual status_t onTransact(uint32_t code, const Parcel& data,
+ Parcel* reply, uint32_t flags);
private:
- Mutex mLock;
- sp<IOMX> mOMX;
+ Mutex mOMXLock;
+ sp<IOMX> mOMX;
+ Mutex mOMXStoreLock;
+ sp<IOMXStore> mOMXStore;
};
} // namespace android
