update rawdata plugin

CavanSu · CavanSu · commit 149ec3243665 · 2020-08-18T10:44:58.000+08:00
Former-commit-id: 0ae7401
diff --git a/iOS/APIExample/Common/RawDataApi/AgoraMediaDataPlugin.mm b/iOS/APIExample/Common/RawDataApi/AgoraMediaDataPlugin.mm
@@ -225,62 +225,53 @@ void modifiedPacketWithNewPacketRawData(Packet& packet, AgoraPacketRawData *rawD
     virtual bool onSendAudioPacket(Packet& packet)
     {
         if (!mediaDataPlugin && ((mediaDataPlugin.observerPacketType >> 0) == 0)) return true;
-        @synchronized(mediaDataPlugin) {
-            @autoreleasepool {
-                if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:willSendAudioPacket:)]) {
-                    AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);
-                    AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin willSendAudioPacket:data];
-                    modifiedPacketWithNewPacketRawData(packet, newData);
-                }
+        @autoreleasepool {
+            if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:willSendAudioPacket:)]) {
+                AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);
+                AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin willSendAudioPacket:data];
+                modifiedPacketWithNewPacketRawData(packet, newData);
             }
-            return true;
         }
+        return true;
     }
     
     virtual bool onSendVideoPacket(Packet& packet)
     {
-        
         if (!mediaDataPlugin && ((mediaDataPlugin.observerPacketType >> 1) == 0)) return true;
-        @synchronized(mediaDataPlugin) {
-            @autoreleasepool {
-                if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:willSendVideoPacket:)]) {
-                    AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);
-                    AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin willSendVideoPacket:data];
-                    modifiedPacketWithNewPacketRawData(packet, newData);
-                }
+        @autoreleasepool {
+            if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:willSendVideoPacket:)]) {
+                AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);
+                AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin willSendVideoPacket:data];
+                modifiedPacketWithNewPacketRawData(packet, newData);
             }
-            return true;
         }
+        return true;
     }
     
     virtual bool onReceiveAudioPacket(Packet& packet)
     {
         if (!mediaDataPlugin && ((mediaDataPlugin.observerPacketType >> 2) == 0)) return true;
-        @synchronized(mediaDataPlugin) {
-            @autoreleasepool {
-                if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:didReceivedAudioPacket:)]) {
-                    AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);
-                    AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin didReceivedAudioPacket:data];
-                    modifiedPacketWithNewPacketRawData(packet, newData);
-                }
+        @autoreleasepool {
+            if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:didReceivedAudioPacket:)]) {
+                AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);
+                AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin didReceivedAudioPacket:data];
+                modifiedPacketWithNewPacketRawData(packet, newData);
             }
-            return true;
         }
+        return true;
     }
     
     virtual bool onReceiveVideoPacket(Packet& packet)
     {
         if (!mediaDataPlugin && ((mediaDataPlugin.observerPacketType >> 3) == 0)) return true;
-        @synchronized(mediaDataPlugin) {
-            @autoreleasepool {
-                if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:didReceivedVideoPacket:)]) {
-                    AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);
-                    AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin didReceivedVideoPacket:data];
-                    modifiedPacketWithNewPacketRawData(packet, newData);
-                }
+        @autoreleasepool {
+            if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:didReceivedVideoPacket:)]) {
+                AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);
+                AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin didReceivedVideoPacket:data];
+                modifiedPacketWithNewPacketRawData(packet, newData);
             }
-            return true;
         }
+        return true;
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -225,62 +225,53 @@ void modifiedPacketWithNewPacketRawData(Packet& packet, AgoraPacketRawData *rawD`
`225`	`225`	`virtual bool onSendAudioPacket(Packet& packet)`
`226`	`226`	`{`
`227`	`227`	`if (!mediaDataPlugin && ((mediaDataPlugin.observerPacketType >> 0) == 0)) return true;`
`228`		`- @synchronized(mediaDataPlugin) {`
`229`		`- @autoreleasepool {`
`230`		`- if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:willSendAudioPacket:)]) {`
`231`		`- AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);`
`232`		`- AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin willSendAudioPacket:data];`
`233`		`- modifiedPacketWithNewPacketRawData(packet, newData);`
`234`		`- }`
	`228`	`+ @autoreleasepool {`
	`229`	`+ if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:willSendAudioPacket:)]) {`
	`230`	`+ AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);`
	`231`	`+ AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin willSendAudioPacket:data];`
	`232`	`+ modifiedPacketWithNewPacketRawData(packet, newData);`
`235`	`233`	`}`
`236`		`- return true;`
`237`	`234`	`}`
	`235`	`+ return true;`
`238`	`236`	`}`
`239`	`237`
`240`	`238`	`virtual bool onSendVideoPacket(Packet& packet)`
`241`	`239`	`{`
`242`		`-`
`243`	`240`	`if (!mediaDataPlugin && ((mediaDataPlugin.observerPacketType >> 1) == 0)) return true;`
`244`		`- @synchronized(mediaDataPlugin) {`
`245`		`- @autoreleasepool {`
`246`		`- if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:willSendVideoPacket:)]) {`
`247`		`- AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);`
`248`		`- AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin willSendVideoPacket:data];`
`249`		`- modifiedPacketWithNewPacketRawData(packet, newData);`
`250`		`- }`
	`241`	`+ @autoreleasepool {`
	`242`	`+ if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:willSendVideoPacket:)]) {`
	`243`	`+ AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);`
	`244`	`+ AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin willSendVideoPacket:data];`
	`245`	`+ modifiedPacketWithNewPacketRawData(packet, newData);`
`251`	`246`	`}`
`252`		`- return true;`
`253`	`247`	`}`
	`248`	`+ return true;`
`254`	`249`	`}`
`255`	`250`
`256`	`251`	`virtual bool onReceiveAudioPacket(Packet& packet)`
`257`	`252`	`{`
`258`	`253`	`if (!mediaDataPlugin && ((mediaDataPlugin.observerPacketType >> 2) == 0)) return true;`
`259`		`- @synchronized(mediaDataPlugin) {`
`260`		`- @autoreleasepool {`
`261`		`- if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:didReceivedAudioPacket:)]) {`
`262`		`- AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);`
`263`		`- AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin didReceivedAudioPacket:data];`
`264`		`- modifiedPacketWithNewPacketRawData(packet, newData);`
`265`		`- }`
	`254`	`+ @autoreleasepool {`
	`255`	`+ if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:didReceivedAudioPacket:)]) {`
	`256`	`+ AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);`
	`257`	`+ AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin didReceivedAudioPacket:data];`
	`258`	`+ modifiedPacketWithNewPacketRawData(packet, newData);`
`266`	`259`	`}`
`267`		`- return true;`
`268`	`260`	`}`
	`261`	`+ return true;`
`269`	`262`	`}`
`270`	`263`
`271`	`264`	`virtual bool onReceiveVideoPacket(Packet& packet)`
`272`	`265`	`{`
`273`	`266`	`if (!mediaDataPlugin && ((mediaDataPlugin.observerPacketType >> 3) == 0)) return true;`
`274`		`- @synchronized(mediaDataPlugin) {`
`275`		`- @autoreleasepool {`
`276`		`- if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:didReceivedVideoPacket:)]) {`
`277`		`- AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);`
`278`		`- AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin didReceivedVideoPacket:data];`
`279`		`- modifiedPacketWithNewPacketRawData(packet, newData);`
`280`		`- }`
	`267`	`+ @autoreleasepool {`
	`268`	`+ if ([mediaDataPlugin.packetDelegate respondsToSelector:@selector(mediaDataPlugin:didReceivedVideoPacket:)]) {`
	`269`	`+ AgoraPacketRawData *data = getPacketRawDataWithPacket(packet);`
	`270`	`+ AgoraPacketRawData *newData = [mediaDataPlugin.packetDelegate mediaDataPlugin:mediaDataPlugin didReceivedVideoPacket:data];`
	`271`	`+ modifiedPacketWithNewPacketRawData(packet, newData);`
`281`	`272`	`}`
`282`		`- return true;`
`283`	`273`	`}`
	`274`	`+ return true;`
`284`	`275`	`}`
`285`	`276`	`};`
`286`	`277`