Snap for 5606075 from 66d63602547712b3a64c0485ee976d05b15e3109 to qt-c2f2-release (d8db0afb) · Commits · e / os / android_frameworks_av

media/bufferpool/1.0/BufferPoolClient.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -528,6 +528,10 @@ void BufferPoolClient::Impl::trySyncFromRemote() {
		(void) outStatus;
		(void) outBuffer;
		});
		if(!transResult.isOk()) {
		ALOGD("sync from client %lld failed: bufferpool process died.",
		(long long)mConnectionId);
		}
		}
		mRemoteSyncLock.unlock();
		}

media/bufferpool/2.0/AccessorImpl.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -261,14 +261,20 @@ void Accessor::Impl::handleInvalidateAck() {
		mBufferPool.mInvalidation.onHandleAck(&observers, &invalidationId);
		}
		// Do not hold lock for send invalidations
		size_t deadClients = 0;
		for (auto it = observers.begin(); it != observers.end(); ++it) {
		const sp<IObserver> observer = it->second;
		if (observer) {
		Return<void> transResult = observer->onMessage(it->first, invalidationId);
		(void) transResult;
		if (!transResult.isOk()) {
		++deadClients;
		}
		}
		}
		if (deadClients > 0) {
		ALOGD("During invalidation found %zu dead clients", deadClients);
		}
		}

		bool Accessor::Impl::isValid() {
		return mBufferPool.isValid();

media/bufferpool/2.0/BufferPoolClient.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -582,6 +582,10 @@ void BufferPoolClient::Impl::trySyncFromRemote() {
		(void) outStatus;
		(void) outBuffer;
		});
		if (!transResult.isOk()) {
		ALOGD("sync from client %lld failed: bufferpool process died.",
		(long long)mConnectionId);
		}
		}
		mRemoteSyncLock.unlock();
		}

media/libeffects/dynamicsproc/dsp/DPFrequency.cpp

+10 −5

Original line number	Diff line number	Diff line
		@@ -62,11 +62,6 @@ void ChannelBuffer::initBuffers(unsigned int blockSize, unsigned int overlapSize
		cBInput.resize(mBlockSize * CIRCULAR_BUFFER_UPSAMPLE);
		cBOutput.resize(mBlockSize * CIRCULAR_BUFFER_UPSAMPLE);

		//fill input with half block size...
		for (unsigned int k = 0; k < mBlockSize/2; k++) {
		cBInput.write(0);
		}

		//temp vectors
		input.resize(mBlockSize);
		output.resize(mBlockSize);
		@@ -170,6 +165,11 @@ void DPFrequency::configure(size_t blockSize, size_t overlapSize,

		fill_window(mVWindow, RDSP_WINDOW_HANNING_FLAT_TOP, mBlockSize, mOverlapSize);

		//split window into analysis and synthesis. Both are the sqrt() of original
		//window
		Eigen::Map<Eigen::VectorXf> eWindow(&mVWindow[0], mVWindow.size());
		eWindow = eWindow.array().sqrt();

		//compute window rms for energy compensation
		mWindowRms = 0;
		for (size_t i = 0; i < mVWindow.size(); i++) {
		@@ -666,6 +666,11 @@ size_t DPFrequency::processLastStages(ChannelBuffer &cb) {
		//##ifft directly to output.
		Eigen::Map<Eigen::VectorXf> eOutput(&cb.output[0], cb.output.size());
		mFftServer.inv(eOutput, cb.complexTemp);

		//apply rest of window for resynthesis
		Eigen::Map<Eigen::VectorXf> eWindow(&mVWindow[0], mVWindow.size());
		eOutput = eOutput.cwiseProduct(eWindow);

		return mBlockSize;
		}

media/libstagefright/xmlparser/api/current.txt

+23 −1

Original line number	Diff line number	Diff line
		@@ -68,16 +68,26 @@ package media.codecs {
		public class MediaCodec {
		ctor public MediaCodec();
		method public java.util.List<media.codecs.Alias> getAlias_optional();
		method public java.util.List<media.codecs.Quirk> getAttribute_optional();
		method public String getDomain();
		method public String getEnabled();
		method public java.util.List<media.codecs.Feature> getFeature_optional();
		method public java.util.List<media.codecs.Limit> getLimit_optional();
		method public String getName();
		method public java.util.List<media.codecs.Quirk> getQuirk_optional();
		method public String getRank();
		method public String getType();
		method public java.util.List<media.codecs.Type> getType_optional();
		method public String getUpdate();
		method public String getVariant();
		method public java.util.List<media.codecs.Variant> getVariant_optional();
		method public void setDomain(String);
		method public void setEnabled(String);
		method public void setName(String);
		method public void setRank(String);
		method public void setType(String);
		method public void setUpdate(String);
		method public void setVariant(String);
		}

		public class MediaCodecs {
		@@ -91,14 +101,18 @@ package media.codecs {
		public class Quirk {
		ctor public Quirk();
		method public String getName();
		method public String getValue();
		method public void setName(String);
		method public void setValue(String);
		}

		public class Setting {
		ctor public Setting();
		method public String getEnabled();
		method public String getName();
		method public String getUpdate();
		method public String getValue();
		method public void setEnabled(String);
		method public void setName(String);
		method public void setUpdate(String);
		method public void setValue(String);
		@@ -106,7 +120,9 @@ package media.codecs {

		public class Settings {
		ctor public Settings();
		method public java.util.List<media.codecs.Setting> getSetting();
		method public java.util.List<media.codecs.Setting> getDomain_optional();
		method public java.util.List<media.codecs.Setting> getSetting_optional();
		method public java.util.List<media.codecs.Setting> getVariant_optional();
		}

		public class Type {
		@@ -120,6 +136,12 @@ package media.codecs {
		method public void setUpdate(String);
		}

		public class Variant {
		ctor public Variant();
		method public String getName();
		method public void setName(String);
		}

		public class XmlParser {
		ctor public XmlParser();
		method public static media.codecs.Included readIncluded(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;