Merge "AssetManager: Cache a pre-filtered list of configurations" into nyc-dev (960b9441) · Commits · e / os / android_frameworks_base

include/androidfw/ResourceTypes.h

+31 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,8 @@

		#include <android/configuration.h>

		#include <memory>

		namespace android {

		/**
		@@ -1876,9 +1878,30 @@ private:
		struct Entry;
		struct Package;
		struct PackageGroup;
		struct bag_set;
		typedef Vector<Type*> TypeList;

		struct bag_set {
		size_t numAttrs; // number in array
		size_t availAttrs; // total space in array
		uint32_t typeSpecFlags;
		// Followed by 'numAttr' bag_entry structures.
		};

		/**
		* Configuration dependent cached data. This must be cleared when the configuration is
		* changed (setParameters).
		*/
		struct TypeCacheEntry {
		TypeCacheEntry() : cachedBags(NULL) {}

		// Computed attribute bags for this type.
		bag_set** cachedBags;

		// Pre-filtered list of configurations (per asset path) that match the parameters set on this
		// ResTable.
		Vector<std::shared_ptr<Vector<const ResTable_type*>>> filteredConfigs;
		};

		status_t addInternal(const void* data, size_t size, const void* idmapData, size_t idmapDataSize,
		bool appAsLib, const int32_t cookie, bool copyData, bool isSystemAsset=false);

		@@ -1900,6 +1923,13 @@ private:

		mutable Mutex mLock;

		// Mutex that controls access to the list of pre-filtered configurations
		// to check when looking up entries.
		// When iterating over a bag, the mLock mutex is locked. While mLock is locked,
		// we do resource lookups.
		// Mutex is not reentrant, so we must use a different lock than mLock.
		mutable Mutex mFilteredConfigLock;

		status_t mError;

		ResTable_config mParams;

libs/androidfw/ResourceTypes.cpp

+115 −62

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@
		#include <string.h>

		#include <limits>
		#include <memory>
		#include <type_traits>

		#include <androidfw/ByteBucketArray.h>
		@@ -3193,7 +3194,6 @@ struct ResTable::PackageGroup
		, name(_name)
		, id(_id)
		, largestTypeId(0)
		, bags(NULL)
		, dynamicRefTable(static_cast<uint8_t>(_id), appAsLib)
		, isSystemAsset(_isSystemAsset)
		{ }
		@@ -3220,36 +3220,41 @@ struct ResTable::PackageGroup
		}
		}

		/**
		* Clear all cache related data that depends on parameters/configuration.
		* This includes the bag caches and filtered types.
		*/
		void clearBagCache() {
		if (bags) {
		if (kDebugTableNoisy) {
		printf("bags=%p\n", bags);
		}
		for (size_t i = 0; i < bags->size(); i++) {
		for (size_t i = 0; i < typeCacheEntries.size(); i++) {
		if (kDebugTableNoisy) {
		printf("type=%zu\n", i);
		}
		const TypeList& typeList = types[i];
		if (!typeList.isEmpty()) {
		bag_set** typeBags = bags->get(i);
		TypeCacheEntry& cacheEntry = typeCacheEntries.editItemAt(i);

		// Reset the filtered configurations.
		cacheEntry.filteredConfigs.clear();

		bag_set** typeBags = cacheEntry.cachedBags;
		if (kDebugTableNoisy) {
		printf("typeBags=%p\n", typeBags);
		}

		if (typeBags) {
		const size_t N = typeList[0]->entryCount;
		if (kDebugTableNoisy) {
		printf("type->entryCount=%zu\n", N);
		}
		for (size_t j = 0; j < N; j++) {
		if (typeBags[j] && typeBags[j] != (bag_set*)0xFFFFFFFF)
		if (typeBags[j] && typeBags[j] != (bag_set*)0xFFFFFFFF) {
		free(typeBags[j]);
		}
		free(typeBags);
		}
		free(typeBags);
		cacheEntry.cachedBags = NULL;
		}
		}
		delete bags;
		bags = NULL;
		}
		}

		@@ -3277,9 +3282,11 @@ struct ResTable::PackageGroup

		uint8_t largestTypeId;

		// Computed attribute bags, first indexed by the type and second
		// by the entry in that type.
		ByteBucketArray<bag_set*> bags;
		// Cached objects dependent on the parameters/configuration of this ResTable.
		// Gets cleared whenever the parameters/configuration changes.
		// These are stored here in a parallel structure because the data in `types` may
		// be shared by other ResTable's (framework resources are shared this way).
		ByteBucketArray<TypeCacheEntry> typeCacheEntries;

		// The table mapping dynamic references to resolved references for
		// this package group.
		@@ -3293,14 +3300,6 @@ struct ResTable::PackageGroup
		const bool isSystemAsset;
		};

		struct ResTable::bag_set
		{
		size_t numAttrs; // number in array
		size_t availAttrs; // total space in array
		uint32_t typeSpecFlags;
		// Followed by 'numAttr' bag_entry structures.
		};

		ResTable::Theme::Theme(const ResTable& table)
		: mTable(table)
		, mTypeSpecFlags(0)
		@@ -4192,8 +4191,8 @@ ssize_t ResTable::getBagLocked(uint32_t resID, const bag_entry** outBag,
		}

		// First see if we've already computed this bag...
		if (grp->bags) {
		bag_set** typeSet = grp->bags->get(t);
		TypeCacheEntry& cacheEntry = grp->typeCacheEntries.editItemAt(t);
		bag_set** typeSet = cacheEntry.cachedBags;
		if (typeSet) {
		bag_set* set = typeSet[e];
		if (set) {
		@@ -4212,19 +4211,12 @@ ssize_t ResTable::getBagLocked(uint32_t resID, const bag_entry** outBag,
		return BAD_INDEX;
		}
		}
		}

		// Bag not found, we need to compute it!
		if (!grp->bags) {
		grp->bags = new ByteBucketArray<bag_set**>();
		if (!grp->bags) return NO_MEMORY;
		}

		bag_set** typeSet = grp->bags->get(t);
		if (!typeSet) {
		typeSet = (bag_set*)calloc(NENTRY, sizeof(bag_set));
		if (!typeSet) return NO_MEMORY;
		grp->bags->set(t, typeSet);
		cacheEntry.cachedBags = typeSet;
		}

		// Mark that we are currently working on this one.
		@@ -4430,18 +4422,56 @@ ssize_t ResTable::getBagLocked(uint32_t resID, const bag_entry** outBag,

		void ResTable::setParameters(const ResTable_config* params)
		{
		mLock.lock();
		AutoMutex _lock(mLock);
		AutoMutex _lock2(mFilteredConfigLock);

		if (kDebugTableGetEntry) {
		ALOGI("Setting parameters: %s\n", params->toString().string());
		}
		mParams = *params;
		for (size_t i=0; i<mPackageGroups.size(); i++) {
		for (size_t p = 0; p < mPackageGroups.size(); p++) {
		PackageGroup* packageGroup = mPackageGroups.editItemAt(p);
		if (kDebugTableNoisy) {
		ALOGI("CLEARING BAGS FOR GROUP %zu!", i);
		ALOGI("CLEARING BAGS FOR GROUP %zu!", p);
		}
		packageGroup->clearBagCache();

		// Find which configurations match the set of parameters. This allows for a much
		// faster lookup in getEntry() if the set of values is narrowed down.
		for (size_t t = 0; t < packageGroup->types.size(); t++) {
		if (packageGroup->types[t].isEmpty()) {
		continue;
		}

		TypeList& typeList = packageGroup->types.editItemAt(t);

		// Retrieve the cache entry for this type.
		TypeCacheEntry& cacheEntry = packageGroup->typeCacheEntries.editItemAt(t);

		for (size_t ts = 0; ts < typeList.size(); ts++) {
		Type* type = typeList.editItemAt(ts);

		std::shared_ptr<Vector<const ResTable_type*>> newFilteredConfigs =
		std::make_shared<Vector<const ResTable_type*>>();

		for (size_t ti = 0; ti < type->configs.size(); ti++) {
		ResTable_config config;
		config.copyFromDtoH(type->configs[ti]->config);

		if (config.match(mParams)) {
		newFilteredConfigs->add(type->configs[ti]);
		}
		}

		if (kDebugTableNoisy) {
		ALOGD("Updating pkg=%zu type=%zu with %zu filtered configs",
		p, t, newFilteredConfigs->size());
		}

		cacheEntry.filteredConfigs.add(newFilteredConfigs);
		}
		}
		mPackageGroups[i]->clearBagCache();
		}
		mLock.unlock();
		}

		void ResTable::getParameters(ResTable_config* params) const
		@@ -5974,9 +6004,32 @@ status_t ResTable::getEntry(
		specFlags = -1;
		}

		const size_t numConfigs = typeSpec->configs.size();
		const Vector<const ResTable_type> candidateConfigs = &typeSpec->configs;

		std::shared_ptr<Vector<const ResTable_type*>> filteredConfigs;
		if (config && memcmp(&mParams, config, sizeof(mParams)) == 0) {
		// Grab the lock first so we can safely get the current filtered list.
		AutoMutex _lock(mFilteredConfigLock);

		// This configuration is equal to the one we have previously cached for,
		// so use the filtered configs.

		const TypeCacheEntry& cacheEntry = packageGroup->typeCacheEntries[typeIndex];
		if (i < cacheEntry.filteredConfigs.size()) {
		if (cacheEntry.filteredConfigs[i]) {
		// Grab a reference to the shared_ptr so it doesn't get destroyed while
		// going through this list.
		filteredConfigs = cacheEntry.filteredConfigs[i];

		// Use this filtered list.
		candidateConfigs = filteredConfigs.get();
		}
		}
		}

		const size_t numConfigs = candidateConfigs->size();
		for (size_t c = 0; c < numConfigs; c++) {
		const ResTable_type* const thisType = typeSpec->configs[c];
		const ResTable_type* const thisType = candidateConfigs->itemAt(c);
		if (thisType == NULL) {
		continue;
		}

libs/androidfw/tests/ResTable_test.cpp

+42 −0

Original line number	Diff line number	Diff line
		@@ -282,4 +282,46 @@ TEST(ResTableTest, U16StringToInt) {
		testU16StringToInt(u"0x1ffffffff", 0U, false, true);
		}

		TEST(ResTableTest, ShareButDontModifyResTable) {
		ResTable sharedTable;
		ASSERT_EQ(NO_ERROR, sharedTable.add(basic_arsc, basic_arsc_len));

		ResTable_config param;
		memset(&param, 0, sizeof(param));
		param.language[0] = 'v';
		param.language[1] = 's';
		sharedTable.setParameters(&param);

		// Check that we get the default value for @integer:number1
		Res_value val;
		ssize_t block = sharedTable.getResource(base::R::integer::number1, &val, MAY_NOT_BE_BAG);
		ASSERT_GE(block, 0);
		ASSERT_EQ(Res_value::TYPE_INT_DEC, val.dataType);
		ASSERT_EQ(uint32_t(600), val.data);

		// Create a new table that shares the entries of the shared table.
		ResTable table;
		ASSERT_EQ(NO_ERROR, table.add(&sharedTable, false));

		// Set a new configuration on the new table.
		memset(&param, 0, sizeof(param));
		param.language[0] = 's';
		param.language[1] = 'v';
		param.country[0] = 'S';
		param.country[1] = 'E';
		table.setParameters(&param);

		// Check that we get a new value in the new table.
		block = table.getResource(base::R::integer::number1, &val, MAY_NOT_BE_BAG);
		ASSERT_GE(block, 0);
		ASSERT_EQ(Res_value::TYPE_INT_DEC, val.dataType);
		ASSERT_EQ(uint32_t(400), val.data);

		// Check that we still get the old value in the shared table.
		block = sharedTable.getResource(base::R::integer::number1, &val, MAY_NOT_BE_BAG);
		ASSERT_GE(block, 0);
		ASSERT_EQ(Res_value::TYPE_INT_DEC, val.dataType);
		ASSERT_EQ(uint32_t(600), val.data);
		}

		} // namespace

libs/androidfw/tests/data/basic/R.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ namespace string {

		namespace integer {
		enum {
		number1 = 0x7f040000, // default, sv
		number1 = 0x7f040000, // default, sv, vs
		number2 = 0x7f040001, // default

		test3 = 0x7f090000, // default (in feature)

libs/androidfw/tests/data/basic/basic_arsc.h

+64 −50

Original line number	Diff line number	Diff line
		unsigned char basic_arsc[] = {
		0x02, 0x00, 0x0c, 0x00, 0x68, 0x07, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
		0x02, 0x00, 0x0c, 0x00, 0x0c, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
		0x01, 0x00, 0x1c, 0x00, 0xbc, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00,
		@@ -16,7 +16,7 @@ unsigned char basic_arsc[] = {
		0x00, 0x00, 0x05, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00,
		0x31, 0x00, 0x00, 0x00, 0x05, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00,
		0x74, 0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x20, 0x01,
		0xa0, 0x06, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x63, 0x00, 0x6f, 0x00,
		0x44, 0x07, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x63, 0x00, 0x6f, 0x00,
		0x6d, 0x00, 0x2e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x72, 0x00,
		0x6f, 0x00, 0x69, 0x00, 0x64, 0x00, 0x2e, 0x00, 0x74, 0x00, 0x65, 0x00,
		0x73, 0x00, 0x74, 0x00, 0x2e, 0x00, 0x62, 0x00, 0x61, 0x00, 0x73, 0x00,
		@@ -73,68 +73,81 @@ unsigned char basic_arsc[] = {
		0x41, 0x00, 0x72, 0x00, 0x72, 0x00, 0x61, 0x00, 0x79, 0x00, 0x31, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x10, 0x00, 0x18, 0x00, 0x00, 0x00,
		0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x44, 0x00, 0x84, 0x00, 0x00, 0x00,
		0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00,
		0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x4c, 0x00, 0x8c, 0x00, 0x00, 0x00,
		0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00,
		0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x10, 0x05, 0x00, 0x00, 0x00,
		0x10, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x10,
		0x05, 0x00, 0x00, 0x00, 0x02, 0x02, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00,
		0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x24, 0x00, 0x00,
		0x01, 0x02, 0x44, 0x00, 0x58, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
		0x01, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x1c, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
		0x08, 0x00, 0x00, 0x10, 0x05, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00,
		0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x10, 0x05, 0x00, 0x00, 0x00,
		0x02, 0x02, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
		0x01, 0x00, 0x00, 0x00, 0x04, 0x24, 0x00, 0x00, 0x01, 0x02, 0x4c, 0x00,
		0x60, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
		0x50, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x08, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x03,
		0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x44, 0x00, 0x58, 0x00, 0x00, 0x00,
		0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00,
		0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x72, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x02, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
		0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x4c, 0x00,
		0x60, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
		0x50, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x66, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x02,
		0x00, 0x00, 0x00, 0x00, 0x4c, 0x61, 0x74, 0x6e, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
		0x08, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x02, 0x02, 0x10, 0x00,
		0x1c, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x01, 0x02, 0x44, 0x00, 0x70, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
		0x03, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
		0x01, 0x02, 0x4c, 0x00, 0x78, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
		0x03, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x10, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x08, 0x00, 0x00, 0x00,
		0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x03, 0x02, 0x00, 0x00, 0x00,
		0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x03,
		0x03, 0x00, 0x00, 0x00, 0x02, 0x02, 0x10, 0x00, 0x18, 0x00, 0x00, 0x00,
		0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x44, 0x00, 0x6c, 0x00, 0x00, 0x00,
		0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00,
		0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
		0xff, 0xff, 0xff, 0xff, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
		0x08, 0x00, 0x00, 0x03, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
		0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00,
		0x02, 0x02, 0x10, 0x00, 0x18, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
		0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x01, 0x02, 0x4c, 0x00, 0x74, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
		0x02, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
		0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x10, 0xc8, 0x00, 0x00, 0x00,
		0x08, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x01,
		0x00, 0x00, 0x06, 0x7f, 0x01, 0x02, 0x44, 0x00, 0x5c, 0x00, 0x00, 0x00,
		0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00,
		0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x76, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
		0x08, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x10,
		0xc8, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
		0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x06, 0x7f, 0x01, 0x02, 0x4c, 0x00,
		0x64, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
		0x54, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x76, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x08, 0x00, 0x00, 0x00,
		0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x10, 0x90, 0x01, 0x00, 0x00,
		0x02, 0x02, 0x10, 0x00, 0x18, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
		0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x01, 0x02, 0x44, 0x00, 0x90, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
		0x02, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
		0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x10, 0x58, 0x02, 0x00, 0x00,
		0x01, 0x02, 0x4c, 0x00, 0x64, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
		0x02, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x61, 0x74, 0x6e,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
		0x08, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x10,
		0x90, 0x01, 0x00, 0x00, 0x02, 0x02, 0x10, 0x00, 0x18, 0x00, 0x00, 0x00,
		0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x4c, 0x00, 0x98, 0x00, 0x00, 0x00,
		0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00,
		0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		@@ -146,16 +159,17 @@ unsigned char basic_arsc[] = {
		0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x7f, 0x01, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x01, 0x7f, 0x08, 0x00, 0x00, 0x10, 0x2c, 0x01, 0x00, 0x00,
		0x02, 0x02, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
		0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x44, 0x00,
		0x7c, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
		0x48, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x4c, 0x00,
		0x84, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
		0x50, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00,
		0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x02, 0x08, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00, 0x00,
		0x01, 0x00, 0x00, 0x02, 0x08, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 0x00,
		0x02, 0x00, 0x00, 0x02, 0x08, 0x00, 0x00, 0x10, 0x03, 0x00, 0x00, 0x00
		0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00, 0x09, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
		0x08, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02,
		0x08, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02,
		0x08, 0x00, 0x00, 0x10, 0x03, 0x00, 0x00, 0x00
		};
		unsigned int basic_arsc_len = 1896;
		unsigned int basic_arsc_len = 2060;