Merge "Add getObjectPropValue function to MtpDevice." into nyc-dev
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h
index bc11da2..fab92bd 100644
--- a/include/media/stagefright/ACodec.h
+++ b/include/media/stagefright/ACodec.h
@@ -506,7 +506,10 @@
void notifyOfRenderedFrames(
bool dropIncomplete = false, FrameRenderTracker::Info *until = NULL);
- void onOutputFormatChanged();
+ // Pass |expectedFormat| to print a warning if the format differs from it.
+ // Using sp<> instead of const sp<>& because expectedFormat is likely the current mOutputFormat
+ // which will get updated inside.
+ void onOutputFormatChanged(sp<const AMessage> expectedFormat = NULL);
void addKeyFormatChangesToRenderBufferNotification(sp<AMessage> ¬ify);
void sendFormatChange();
diff --git a/include/media/stagefright/MediaCodecSource.h b/include/media/stagefright/MediaCodecSource.h
index 5f10487..035e8ae 100644
--- a/include/media/stagefright/MediaCodecSource.h
+++ b/include/media/stagefright/MediaCodecSource.h
@@ -56,7 +56,7 @@
virtual status_t start(MetaData *params = NULL);
virtual status_t stop();
virtual status_t pause();
- virtual sp<MetaData> getFormat() { return mMeta; }
+ virtual sp<MetaData> getFormat();
virtual status_t read(
MediaBuffer **buffer,
const ReadOptions *options = NULL);
@@ -105,7 +105,7 @@
sp<ALooper> mCodecLooper;
sp<AHandlerReflector<MediaCodecSource> > mReflector;
sp<AMessage> mOutputFormat;
- sp<MetaData> mMeta;
+ Mutexed<sp<MetaData>> mMeta;
sp<Puller> mPuller;
sp<MediaCodec> mEncoder;
uint32_t mFlags;
diff --git a/include/media/stagefright/NuMediaExtractor.h b/include/media/stagefright/NuMediaExtractor.h
index b8bb824..6606c58 100644
--- a/include/media/stagefright/NuMediaExtractor.h
+++ b/include/media/stagefright/NuMediaExtractor.h
@@ -84,6 +84,10 @@
kIsVorbis = 1,
};
+ enum {
+ kMaxTrackCount = 16384,
+ };
+
struct TrackInfo {
sp<IMediaSource> mSource;
size_t mTrackIndex;
@@ -113,7 +117,7 @@
void releaseTrackSamples();
bool getTotalBitrate(int64_t *bitRate) const;
- void updateDurationAndBitrate();
+ status_t updateDurationAndBitrate();
status_t appendVorbisNumPageSamples(TrackInfo *info, const sp<ABuffer> &buffer);
DISALLOW_EVIL_CONSTRUCTORS(NuMediaExtractor);
diff --git a/include/media/stagefright/foundation/AMessage.h b/include/media/stagefright/foundation/AMessage.h
index 83b9444..09d2ad8 100644
--- a/include/media/stagefright/foundation/AMessage.h
+++ b/include/media/stagefright/foundation/AMessage.h
@@ -127,6 +127,15 @@
// their refcount incremented.
sp<AMessage> dup() const;
+ // Performs a shallow or deep comparison of |this| and |other| and returns
+ // an AMessage with the differences.
+ // Warning: RefBase items, i.e. "objects" are _not_ copied but only have
+ // their refcount incremented.
+ // This is true for AMessages that have no corresponding AMessage equivalent in |other|.
+ // (E.g. there is no such key or the type is different.) On the other hand, changes in
+ // the AMessage (or AMessages if deep is |false|) are returned in new objects.
+ sp<AMessage> changesFrom(const sp<const AMessage> &other, bool deep = false) const;
+
AString debugString(int32_t indent = 0) const;
enum Type {
diff --git a/include/media/stagefright/foundation/Mutexed.h b/include/media/stagefright/foundation/Mutexed.h
index d4fd905..e905d86 100644
--- a/include/media/stagefright/foundation/Mutexed.h
+++ b/include/media/stagefright/foundation/Mutexed.h
@@ -110,6 +110,11 @@
inline T* operator->() const { return mLocked ? &mTreasure : nullptr; }
inline T& operator*() const { return mLocked ? mTreasure : *(T*)nullptr; }
+ // same as *
+ inline T& get() const { return mLocked ? mTreasure : *(T*)nullptr; }
+ // sets structure. this will abort if mLocked is false.
+ inline void set(T& o) const { get() = o; }
+
// Wait on the condition variable using lock. Must be locked.
inline status_t waitForCondition(Condition &cond) { return cond.wait(mLock); }
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 87625d5..d6a9f53 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -5019,7 +5019,7 @@
transfer, asString((ColorTransfer)transfer));
}
-void ACodec::onOutputFormatChanged() {
+void ACodec::onOutputFormatChanged(sp<const AMessage> expectedFormat) {
// store new output format, at the same time mark that this is no longer the first frame
mOutputFormat = mBaseOutputFormat->dup();
@@ -5028,6 +5028,16 @@
return;
}
+ if (expectedFormat != NULL) {
+ sp<const AMessage> changes = expectedFormat->changesFrom(mOutputFormat);
+ sp<const AMessage> to = mOutputFormat->changesFrom(expectedFormat);
+ if (changes->countEntries() != 0 || to->countEntries() != 0) {
+ ALOGW("[%s] BAD CODEC: Output format changed unexpectedly from (diff) %s to (diff) %s",
+ mComponentName.c_str(),
+ changes->debugString(4).c_str(), to->debugString(4).c_str());
+ }
+ }
+
if (!mIsVideo && !mIsEncoder) {
AudioEncoding pcmEncoding = kAudioEncodingPcm16bit;
(void)mConfigFormat->findInt32("pcm-encoding", (int32_t*)&pcmEncoding);
@@ -5805,7 +5815,7 @@
if (mCodec->mOutputFormat != mCodec->mLastOutputFormat && rangeLength > 0) {
// pretend that output format has changed on the first frame (we used to do this)
if (mCodec->mBaseOutputFormat == mCodec->mOutputFormat) {
- mCodec->onOutputFormatChanged();
+ mCodec->onOutputFormatChanged(mCodec->mOutputFormat);
}
mCodec->addKeyFormatChangesToRenderBufferNotification(reply);
mCodec->sendFormatChange();
diff --git a/media/libstagefright/MediaCodecSource.cpp b/media/libstagefright/MediaCodecSource.cpp
index 0a052d2..1acfca0 100644
--- a/media/libstagefright/MediaCodecSource.cpp
+++ b/media/libstagefright/MediaCodecSource.cpp
@@ -358,6 +358,11 @@
return OK;
}
+sp<MetaData> MediaCodecSource::getFormat() {
+ Mutexed<sp<MetaData>>::Locked meta(mMeta);
+ return *meta;
+}
+
sp<IGraphicBufferProducer> MediaCodecSource::getGraphicBufferProducer() {
CHECK(mFlags & FLAG_USE_SURFACE_INPUT);
return mGraphicBufferProducer;
@@ -493,7 +498,9 @@
}
mEncoder->getOutputFormat(&mOutputFormat);
- convertMessageToMetaData(mOutputFormat, mMeta);
+ sp<MetaData> meta = new MetaData;
+ convertMessageToMetaData(mOutputFormat, meta);
+ mMeta.lock().set(meta);
if (mFlags & FLAG_USE_SURFACE_INPUT) {
CHECK(mIsVideo);
@@ -787,7 +794,9 @@
signalEOS(err);
break;
}
- convertMessageToMetaData(mOutputFormat, mMeta);
+ sp<MetaData> meta = new MetaData;
+ convertMessageToMetaData(mOutputFormat, meta);
+ mMeta.lock().set(meta);
} else if (cbID == MediaCodec::CB_OUTPUT_AVAILABLE) {
int32_t index;
size_t offset;
diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp
index dd7f6b9..6d1a460 100644
--- a/media/libstagefright/NuMediaExtractor.cpp
+++ b/media/libstagefright/NuMediaExtractor.cpp
@@ -121,9 +121,10 @@
return ERROR_UNSUPPORTED;
}
- mDataSource = dataSource;
-
- updateDurationAndBitrate();
+ status_t err = updateDurationAndBitrate();
+ if (err == OK) {
+ mDataSource = dataSource;
+ }
return OK;
}
@@ -152,9 +153,10 @@
return ERROR_UNSUPPORTED;
}
- mDataSource = fileSource;
-
- updateDurationAndBitrate();
+ err = updateDurationAndBitrate();
+ if (err == OK) {
+ mDataSource = fileSource;
+ }
return OK;
}
@@ -177,14 +179,19 @@
return ERROR_UNSUPPORTED;
}
- mDataSource = source;
+ err = updateDurationAndBitrate();
+ if (err == OK) {
+ mDataSource = source;
+ }
- updateDurationAndBitrate();
-
- return OK;
+ return err;
}
-void NuMediaExtractor::updateDurationAndBitrate() {
+status_t NuMediaExtractor::updateDurationAndBitrate() {
+ if (mImpl->countTracks() > kMaxTrackCount) {
+ return ERROR_UNSUPPORTED;
+ }
+
mTotalBitrate = 0ll;
mDurationUs = -1ll;
@@ -212,6 +219,7 @@
mDurationUs = durationUs;
}
}
+ return OK;
}
size_t NuMediaExtractor::countTracks() const {
@@ -235,6 +243,12 @@
}
sp<MetaData> meta = mImpl->getTrackMetaData(index);
+ // Extractors either support trackID-s or not, so either all tracks have trackIDs or none.
+ // Generate trackID if missing.
+ int32_t trackID;
+ if (meta != NULL && !meta->findInt32(kKeyTrackID, &trackID)) {
+ meta->setInt32(kKeyTrackID, (int32_t)index + 1);
+ }
return convertMetaDataToMessage(meta, format);
}
diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp
index dc4acda..7daae20 100644
--- a/media/libstagefright/Utils.cpp
+++ b/media/libstagefright/Utils.cpp
@@ -167,6 +167,12 @@
msg->setInt32("is-sync-frame", 1);
}
+ // this only needs to be translated from meta to message as it is an extractor key
+ int32_t trackID;
+ if (meta->findInt32(kKeyTrackID, &trackID)) {
+ msg->setInt32("track-id", trackID);
+ }
+
if (!strncasecmp("video/", mime, 6)) {
int32_t width, height;
if (!meta->findInt32(kKeyWidth, &width)
diff --git a/media/libstagefright/foundation/AMessage.cpp b/media/libstagefright/foundation/AMessage.cpp
index 725a574..855ac95 100644
--- a/media/libstagefright/foundation/AMessage.cpp
+++ b/media/libstagefright/foundation/AMessage.cpp
@@ -749,6 +749,126 @@
}
}
+sp<AMessage> AMessage::changesFrom(const sp<const AMessage> &other, bool deep) const {
+ if (other == NULL) {
+ return const_cast<AMessage*>(this);
+ }
+
+ sp<AMessage> diff = new AMessage;
+ if (mWhat != other->mWhat) {
+ diff->setWhat(mWhat);
+ }
+ if (mHandler != other->mHandler) {
+ diff->setTarget(mHandler.promote());
+ }
+
+ for (size_t i = 0; i < mNumItems; ++i) {
+ const Item &item = mItems[i];
+ const Item *oitem = other->findItem(item.mName, item.mType);
+ switch (item.mType) {
+ case kTypeInt32:
+ if (oitem == NULL || item.u.int32Value != oitem->u.int32Value) {
+ diff->setInt32(item.mName, item.u.int32Value);
+ }
+ break;
+
+ case kTypeInt64:
+ if (oitem == NULL || item.u.int64Value != oitem->u.int64Value) {
+ diff->setInt64(item.mName, item.u.int64Value);
+ }
+ break;
+
+ case kTypeSize:
+ if (oitem == NULL || item.u.sizeValue != oitem->u.sizeValue) {
+ diff->setSize(item.mName, item.u.sizeValue);
+ }
+ break;
+
+ case kTypeFloat:
+ if (oitem == NULL || item.u.floatValue != oitem->u.floatValue) {
+ diff->setFloat(item.mName, item.u.sizeValue);
+ }
+ break;
+
+ case kTypeDouble:
+ if (oitem == NULL || item.u.doubleValue != oitem->u.doubleValue) {
+ diff->setDouble(item.mName, item.u.sizeValue);
+ }
+ break;
+
+ case kTypeString:
+ if (oitem == NULL || *item.u.stringValue != *oitem->u.stringValue) {
+ diff->setString(item.mName, *item.u.stringValue);
+ }
+ break;
+
+ case kTypeRect:
+ if (oitem == NULL || memcmp(&item.u.rectValue, &oitem->u.rectValue, sizeof(Rect))) {
+ diff->setRect(
+ item.mName, item.u.rectValue.mLeft, item.u.rectValue.mTop,
+ item.u.rectValue.mRight, item.u.rectValue.mBottom);
+ }
+ break;
+
+ case kTypePointer:
+ if (oitem == NULL || item.u.ptrValue != oitem->u.ptrValue) {
+ diff->setPointer(item.mName, item.u.ptrValue);
+ }
+ break;
+
+ case kTypeBuffer:
+ {
+ sp<ABuffer> myBuf = static_cast<ABuffer *>(item.u.refValue);
+ if (myBuf == NULL) {
+ if (oitem == NULL || oitem->u.refValue != NULL) {
+ diff->setBuffer(item.mName, NULL);
+ }
+ break;
+ }
+ sp<ABuffer> oBuf = oitem == NULL ? NULL : static_cast<ABuffer *>(oitem->u.refValue);
+ if (oBuf == NULL
+ || myBuf->size() != oBuf->size()
+ || (!myBuf->data() ^ !oBuf->data()) // data nullness differs
+ || (myBuf->data() && memcmp(myBuf->data(), oBuf->data(), myBuf->size()))) {
+ diff->setBuffer(item.mName, myBuf);
+ }
+ break;
+ }
+
+ case kTypeMessage:
+ {
+ sp<AMessage> myMsg = static_cast<AMessage *>(item.u.refValue);
+ if (myMsg == NULL) {
+ if (oitem == NULL || oitem->u.refValue != NULL) {
+ diff->setMessage(item.mName, NULL);
+ }
+ break;
+ }
+ sp<AMessage> oMsg =
+ oitem == NULL ? NULL : static_cast<AMessage *>(oitem->u.refValue);
+ sp<AMessage> changes = myMsg->changesFrom(oMsg, deep);
+ if (changes->countEntries()) {
+ diff->setMessage(item.mName, deep ? changes : myMsg);
+ }
+ break;
+ }
+
+ case kTypeObject:
+ if (oitem == NULL || item.u.refValue != oitem->u.refValue) {
+ diff->setObject(item.mName, item.u.refValue);
+ }
+ break;
+
+ default:
+ {
+ ALOGE("Unknown type %d", item.mType);
+ TRESPASS();
+ }
+ }
+ }
+ return diff;
+}
+
size_t AMessage::countEntries() const {
return mNumItems;
}
diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp
index 4af3d54..7ee98b6 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define LOG_TAG "APM::AudioPolicyMix"
+#define LOG_TAG "APM_AudioPolicyMix"
//#define LOG_NDEBUG 0
#include "AudioPolicyMix.h"
@@ -107,6 +107,7 @@
status_t AudioPolicyMixCollection::getOutputForAttr(audio_attributes_t attributes, uid_t uid,
sp<SwAudioOutputDescriptor> &desc)
{
+ ALOGV("getOutputForAttr() querying %zu mixes:", size());
desc = 0;
for (size_t i = 0; i < size(); i++) {
sp<AudioPolicyMix> policyMix = valueAt(i);
@@ -129,7 +130,8 @@
// iterate over all mix criteria to list what rules this mix contains
for (size_t j = 0; j < mix->mCriteria.size(); j++) {
- ALOGV("getOutputForAttr: inspecting mix %zu of %zu", i, mix->mCriteria.size());
+ ALOGV(" getOutputForAttr: mix %zu: inspecting mix criteria %zu of %zu",
+ i, j, mix->mCriteria.size());
// if there is an address match, prioritize that match
if (strncmp(attributes.tags, "addr=", strlen("addr=")) == 0 &&
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 6f52e35..51df203 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define LOG_TAG "AudioPolicyManager"
+#define LOG_TAG "APM_AudioPolicyManager"
//#define LOG_NDEBUG 0
//#define VERY_VERBOSE_LOGGING
@@ -2051,7 +2051,7 @@
String8 address = mixes[i].mDeviceAddress;
if (mPolicyMixes.registerMix(address, mixes[i], 0 /*output desc*/) != NO_ERROR) {
- ALOGE(" Error regisering mix %zu for address %s", i, address.string());
+ ALOGE(" Error registering mix %zu for address %s", i, address.string());
res = INVALID_OPERATION;
break;
}
@@ -2076,21 +2076,25 @@
address.string(), "remote-submix");
}
} else if ((mixes[i].mRouteFlags & MIX_ROUTE_FLAG_RENDER) == MIX_ROUTE_FLAG_RENDER) {
- ALOGV("registerPolicyMixes() mix %zu of %zu is RENDER", i, mixes.size());
String8 address = mixes[i].mDeviceAddress;
-
audio_devices_t device = mixes[i].mDeviceType;
+ ALOGV(" registerPolicyMixes() mix %zu of %zu is RENDER, dev=0x%X addr=%s",
+ i, mixes.size(), device, address.string());
+ bool foundOutput = false;
for (size_t j = 0 ; j < mOutputs.size() ; j++) {
sp<SwAudioOutputDescriptor> desc = mOutputs.valueAt(j);
sp<AudioPatch> patch = mAudioPatches.valueFor(desc->getPatchHandle());
if ((patch != 0) && (patch->mPatch.num_sinks != 0)
&& (patch->mPatch.sinks[0].type == AUDIO_PORT_TYPE_DEVICE)
&& (patch->mPatch.sinks[0].ext.device.type == device)
- && (patch->mPatch.sinks[0].ext.device.address == address)) {
+ && (strncmp(patch->mPatch.sinks[0].ext.device.address, address.string(),
+ AUDIO_DEVICE_MAX_ADDRESS_LEN) == 0)) {
if (mPolicyMixes.registerMix(address, mixes[i], desc) != NO_ERROR) {
res = INVALID_OPERATION;
+ } else {
+ foundOutput = true;
}
break;
}
@@ -2098,7 +2102,12 @@
if (res != NO_ERROR) {
ALOGE(" Error registering mix %zu for device 0x%X addr %s",
- i,device, address.string());
+ i, device, address.string());
+ res = INVALID_OPERATION;
+ break;
+ } else if (!foundOutput) {
+ ALOGE(" Output not found for mix %zu for device 0x%X addr %s",
+ i, device, address.string());
res = INVALID_OPERATION;
break;
}