Packman Build Service PMBS

lightspark.spec Changed

lightspark.tar.xz/src/backends/builtindecoder.cpp Changed

lightspark.tar.xz/src/backends/decoder.cpp Changed

lightspark.tar.xz/src/scripting/flash/display/flashdisplay.cpp Changed

lightspark.tar.xz/src/scripting/flash/net/flashnet.cpp Changed

@@ -353,6 +353,7 @@
 	bool success=false;
 	if(!downloader->hasFailed())
 	{
+		loader->incRef();
 		getVm()->addEvent(loader,_MR(Class<Event>::getInstanceS("open")));
 
 		cache->waitForTermination();
@@ -610,7 +611,7 @@
 }
 
 std::map<tiny_string, SharedObject* > SharedObject::sharedobjectmap;
-SharedObject::SharedObject(Class_base* c):EventDispatcher(c)
+SharedObject::SharedObject(Class_base* c):EventDispatcher(c),client(this),objectEncoding(ObjectEncoding::AMF3)
 {
 	data=_MR(new_asobject());
 }
@@ -619,12 +620,47 @@
 {
 	CLASS_SETUP_NO_CONSTRUCTOR(c, EventDispatcher, CLASS_SEALED);
 	c->setDeclaredMethodByQName("getLocal","",Class<IFunction>::getFunction(getLocal),NORMAL_METHOD,false);
+	c->setDeclaredMethodByQName("getRemote","",Class<IFunction>::getFunction(getRemote),NORMAL_METHOD,false);
 	c->setDeclaredMethodByQName("flush","",Class<IFunction>::getFunction(flush),NORMAL_METHOD,true);
 	c->setDeclaredMethodByQName("clear","",Class<IFunction>::getFunction(clear),NORMAL_METHOD,true);
+	c->setDeclaredMethodByQName("close","",Class<IFunction>::getFunction(close),NORMAL_METHOD,true);
+	c->setDeclaredMethodByQName("connect","",Class<IFunction>::getFunction(connect),NORMAL_METHOD,true);
+	REGISTER_GETTER_SETTER(c,client);
 	REGISTER_GETTER(c,data);
+	c->setDeclaredMethodByQName("defaultObjectEncoding","",Class<IFunction>::getFunction(_getDefaultObjectEncoding),GETTER_METHOD,false);
+	c->setDeclaredMethodByQName("defaultObjectEncoding","",Class<IFunction>::getFunction(_setDefaultObjectEncoding),SETTER_METHOD,false);
+	REGISTER_SETTER(c,fps);
+	REGISTER_GETTER_SETTER(c,objectEncoding);
+	c->setDeclaredMethodByQName("preventBackup","",Class<IFunction>::getFunction(_getPreventBackup),GETTER_METHOD,false);
+	c->setDeclaredMethodByQName("preventBackup","",Class<IFunction>::getFunction(_setPreventBackup),SETTER_METHOD,false);
+	c->setDeclaredMethodByQName("size","",Class<IFunction>::getFunction(_getSize),GETTER_METHOD,true);
+
+	getSys()->staticSharedObjectDefaultObjectEncoding = ObjectEncoding::AMF3;
+	getSys()->staticSharedObjectPreventBackup = false;
 }
 
+ASFUNCTIONBODY_GETTER_SETTER(SharedObject,client);
 ASFUNCTIONBODY_GETTER(SharedObject,data);
+ASFUNCTIONBODY_SETTER(SharedObject,fps);
+ASFUNCTIONBODY_GETTER_SETTER(SharedObject,objectEncoding);
+
+ASFUNCTIONBODY(SharedObject,_getDefaultObjectEncoding)
+{
+	return abstract_ui(getSys()->staticSharedObjectDefaultObjectEncoding);
+}
+
+ASFUNCTIONBODY(SharedObject,_setDefaultObjectEncoding)
+{
+	assert_and_throw(argslen == 1);
+	uint32_t value = args[0]->toUInt();
+	if(value == 0)
+	    getSys()->staticSharedObjectDefaultObjectEncoding = ObjectEncoding::AMF0;
+	else if(value == 3)
+	    getSys()->staticSharedObjectDefaultObjectEncoding = ObjectEncoding::AMF3;
+	else
+	    throw RunTimeException("Invalid shared object encoding");
+	return NULL;
+}
 
 ASFUNCTIONBODY(SharedObject,getLocal)
 {
@@ -648,11 +684,19 @@
 	it->second->incRef();
 	return it->second;
 }
+
+ASFUNCTIONBODY(SharedObject,getRemote)
+{
+	LOG(LOG_NOT_IMPLEMENTED,"SharedObject.getRemote not implemented");
+	return NULL;
+}
+
 ASFUNCTIONBODY(SharedObject,flush)
 {
 	LOG(LOG_NOT_IMPLEMENTED,"SharedObject.flush not implemented");
 	return NULL;
 }
+
 ASFUNCTIONBODY(SharedObject,clear)
 {
 	SharedObject* th=static_cast<SharedObject*>(obj);
@@ -660,6 +704,39 @@
 	return NULL;
 }
 
+ASFUNCTIONBODY(SharedObject,close)
+{
+	LOG(LOG_NOT_IMPLEMENTED, "SharedObject.close not implemented");
+	return NULL;
+}
+
+ASFUNCTIONBODY(SharedObject,connect)
+{
+	LOG(LOG_NOT_IMPLEMENTED, "SharedObject.connect not implemented");
+	return NULL;
+}
+
+ASFUNCTIONBODY(SharedObject,_getPreventBackup)
+{
+	return abstract_b(getSys()->staticSharedObjectPreventBackup);
+}
+
+ASFUNCTIONBODY(SharedObject,_setPreventBackup)
+{
+	assert_and_throw(argslen == 1);
+	assert_and_throw(args[0]->getObjectType()==T_BOOLEAN);
+	bool value = Class<Boolean>::cast(args[0])->val;
+	getSys()->staticSharedObjectPreventBackup = value;
+	return NULL;
+}
+
+ASFUNCTIONBODY(SharedObject,_getSize)
+{
+	/* Get the size of the objects in the sharedobjectmap */
+	LOG(LOG_NOT_IMPLEMENTED, "SharedObject.size not implemented");
+	return abstract_ui(0);
+}
+
 void ObjectEncoding::sinit(Class_base* c)
 {
 	CLASS_SETUP(c, ASObject, _constructorNotInstantiatable, CLASS_FINAL | CLASS_SEALED);
@@ -1416,7 +1493,7 @@
 	NetStream* th=Class<NetStream>::cast(obj);
 	_NR<ByteArray> bytearray;
 	ARG_UNPACK(bytearray);
-	
+
 	if(!bytearray.isNull())
 	{
 		if (th->datagenerationfile)
@@ -1555,6 +1632,7 @@
 			}
 			if (!th->datagenerationthreadstarted && th->datagenerationfile->getReceivedLength() >= 8192)
 			{
+				th->closed = false;
 				th->datagenerationthreadstarted = true;
 				th->incRef();
 				getSys()->addJob(th);
@@ -1573,7 +1651,6 @@
 	if (val == "resetBegin")
 	{
 		th->threadAbort();
-		th->closed = false;
 		LOG(LOG_INFO,"resetBegin");
 		if (th->datagenerationfile)
 			delete th->datagenerationfile;
@@ -1700,7 +1777,7 @@
 	}
 	istream s(sbuf);
 	s.exceptions(istream::goodbit);
-	
+
 	ThreadProfile* profile=getSys()->allocateProfiler(RGB(0,0,200));
 	profile->setTag("NetStream");
 	bool waitForFlush=true;
@@ -1717,11 +1794,14 @@
 		{
 			streamDecoder=new BuiltinStreamDecoder(s,this);
 			if (!streamDecoder->isValid()) // not FLV stream, so we try ffmpeg detection
+			{
+				s.seekg(0);
 				streamDecoder=new FFMpegStreamDecoder(s);
+			}
 			if(!streamDecoder->isValid())
 				threadAbort();
 		}
-		
+
 		
 		countermutex.lock();
 		framesdecoded = 0;
@@ -1743,6 +1823,12 @@
 			bool decodingSuccess= bufferfull && streamDecoder->decodeNextFrame();
 			if(!decodingSuccess && bufferfull)
 			{
+				if (s.tellg() == -1)
+				{
+					done = true;
+					continue;
+				}
+
 				LOG(LOG_INFO,"decoding failed:"<<s.tellg()<<" "<<this->getReceivedLength());
 				bufferfull = false;
 			}

lightspark.tar.xz/src/scripting/flash/net/flashnet.h Changed

lightspark.tar.xz/src/scripting/flash/utils/Timer.cpp Changed

lightspark.tar.xz/src/scripting/toplevel/XML.cpp Changed

lightspark.tar.xz/src/swf.h Changed

Changes of Revision 90