OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Set SVN Properties

0.6.3-post-fixes
Teravus Ovares 2009-01-19 18:33:25 +00:00
parent 96e15058d5
commit 4823f2ae8e
3 changed files with 919 additions and 919 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1328
OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
View File

File diff suppressed because it is too large Load Diff

80
OpenSim/Region/Environment/Interfaces/IJ2KDecoder.cs
View File

@ -1,40 +1,40 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Imaging; using OpenMetaverse.Imaging;
namespace OpenSim.Region.Environment.Interfaces namespace OpenSim.Region.Environment.Interfaces
{ {
public delegate void DecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers); public delegate void DecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers);
public interface IJ2KDecoder public interface IJ2KDecoder
{ {
void decode(UUID AssetId, byte[] assetData, DecodedCallback decodedReturn); void decode(UUID AssetId, byte[] assetData, DecodedCallback decodedReturn);
} }
} }

430
OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs
View File

@ -1,215 +1,215 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using System.Collections.Generic; using System.Collections.Generic;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Imaging; using OpenMetaverse.Imaging;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Modules.Agent.TextureSender namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
{ {
public class J2KDecoderModule : IRegionModule, IJ2KDecoder public class J2KDecoderModule : IRegionModule, IJ2KDecoder
{ {
#region IRegionModule Members #region IRegionModule Members
private static readonly ILog m_log private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary> /// <summary>
/// Cached Decoded Layers /// Cached Decoded Layers
/// </summary> /// </summary>
private readonly Dictionary<UUID, OpenJPEG.J2KLayerInfo[]> m_cacheddecode = new Dictionary<UUID, OpenJPEG.J2KLayerInfo[]>(); private readonly Dictionary<UUID, OpenJPEG.J2KLayerInfo[]> m_cacheddecode = new Dictionary<UUID, OpenJPEG.J2KLayerInfo[]>();
/// <summary> /// <summary>
/// List of client methods to notify of results of decode /// List of client methods to notify of results of decode
/// </summary> /// </summary>
private readonly Dictionary<UUID, List<DecodedCallback>> m_notifyList = new Dictionary<UUID, List<DecodedCallback>>(); private readonly Dictionary<UUID, List<DecodedCallback>> m_notifyList = new Dictionary<UUID, List<DecodedCallback>>();
public void Initialise(Scene scene, IConfigSource source) public void Initialise(Scene scene, IConfigSource source)
{ {
scene.RegisterModuleInterface<IJ2KDecoder>(this); scene.RegisterModuleInterface<IJ2KDecoder>(this);
} }
public void PostInitialise() public void PostInitialise()
{ {
} }
public void Close() public void Close()
{ {
} }
public string Name public string Name
{ {
get { return "J2KDecoderModule"; } get { return "J2KDecoderModule"; }
} }
public bool IsSharedModule public bool IsSharedModule
{ {
get { return true; } get { return true; }
} }
#endregion #endregion
#region IJ2KDecoder Members #region IJ2KDecoder Members
public void decode(UUID AssetId, byte[] assetData, DecodedCallback decodedReturn) public void decode(UUID AssetId, byte[] assetData, DecodedCallback decodedReturn)
{ {
// Dummy for if decoding fails. // Dummy for if decoding fails.
OpenJPEG.J2KLayerInfo[] result = new OpenJPEG.J2KLayerInfo[0]; OpenJPEG.J2KLayerInfo[] result = new OpenJPEG.J2KLayerInfo[0];
// Check if it's cached // Check if it's cached
bool cached = false; bool cached = false;
lock (m_cacheddecode) lock (m_cacheddecode)
{ {
if (m_cacheddecode.ContainsKey(AssetId)) if (m_cacheddecode.ContainsKey(AssetId))
{ {
cached = true; cached = true;
result = m_cacheddecode[AssetId]; result = m_cacheddecode[AssetId];
} }
} }
// If it's cached, return the cached results // If it's cached, return the cached results
if (cached) if (cached)
{ {
decodedReturn(AssetId, result); decodedReturn(AssetId, result);
} }
else else
{ {
// not cached, so we need to decode it // not cached, so we need to decode it
// Add to notify list and start decoding. // Add to notify list and start decoding.
// Next request for this asset while it's decoding will only be added to the notify list // Next request for this asset while it's decoding will only be added to the notify list
// once this is decoded, requests will be served from the cache and all clients in the notifylist will be updated // once this is decoded, requests will be served from the cache and all clients in the notifylist will be updated
bool decode = false; bool decode = false;
lock (m_notifyList) lock (m_notifyList)
{ {
if (m_notifyList.ContainsKey(AssetId)) if (m_notifyList.ContainsKey(AssetId))
{ {
m_notifyList[AssetId].Add(decodedReturn); m_notifyList[AssetId].Add(decodedReturn);
} }
else else
{ {
List<DecodedCallback> notifylist = new List<DecodedCallback>(); List<DecodedCallback> notifylist = new List<DecodedCallback>();
notifylist.Add(decodedReturn); notifylist.Add(decodedReturn);
m_notifyList.Add(AssetId, notifylist); m_notifyList.Add(AssetId, notifylist);
decode = true; decode = true;
} }
} }
// Do Decode! // Do Decode!
if (decode) if (decode)
{ {
doJ2kDecode(AssetId, assetData); doJ2kDecode(AssetId, assetData);
} }
} }
} }
#endregion #endregion
/// <summary> /// <summary>
/// Decode Jpeg2000 Asset Data /// Decode Jpeg2000 Asset Data
/// </summary> /// </summary>
/// <param name="AssetId">UUID of Asset</param> /// <param name="AssetId">UUID of Asset</param>
/// <param name="j2kdata">Byte Array Asset Data </param> /// <param name="j2kdata">Byte Array Asset Data </param>
private void doJ2kDecode(UUID AssetId, byte[] j2kdata) private void doJ2kDecode(UUID AssetId, byte[] j2kdata)
{ {
int DecodeTime = 0; int DecodeTime = 0;
DecodeTime = System.Environment.TickCount; DecodeTime = System.Environment.TickCount;
OpenJPEG.J2KLayerInfo[] layers = new OpenJPEG.J2KLayerInfo[0]; // Dummy result for if it fails. Informs that there's only full quality OpenJPEG.J2KLayerInfo[] layers = new OpenJPEG.J2KLayerInfo[0]; // Dummy result for if it fails. Informs that there's only full quality
try try
{ {
AssetTexture texture = new AssetTexture(AssetId, j2kdata); AssetTexture texture = new AssetTexture(AssetId, j2kdata);
if (texture.DecodeLayerBoundaries()) if (texture.DecodeLayerBoundaries())
{ {
bool sane = true; bool sane = true;
// Sanity check all of the layers // Sanity check all of the layers
for (int i = 0; i < texture.LayerInfo.Length; i++) for (int i = 0; i < texture.LayerInfo.Length; i++)
{ {
if (texture.LayerInfo[i].End > texture.AssetData.Length) if (texture.LayerInfo[i].End > texture.AssetData.Length)
{ {
sane = false; sane = false;
break; break;
} }
} }
if (sane) if (sane)
{ {
layers = texture.LayerInfo; layers = texture.LayerInfo;
} }
else else
{ {
m_log.WarnFormat("[J2KDecoderModule]: JPEG2000 texture decoding succeeded, but sanity check failed for {0}", m_log.WarnFormat("[J2KDecoderModule]: JPEG2000 texture decoding succeeded, but sanity check failed for {0}",
AssetId); AssetId);
} }
} }
else else
{ {
m_log.WarnFormat("[J2KDecoderModule]: JPEG2000 texture decoding failed for {0}", AssetId); m_log.WarnFormat("[J2KDecoderModule]: JPEG2000 texture decoding failed for {0}", AssetId);
} }
texture = null; // dereference and dispose of ManagedImage texture = null; // dereference and dispose of ManagedImage
} }
catch (Exception ex) catch (Exception ex)
{ {
m_log.WarnFormat("[J2KDecoderModule]: JPEG2000 texture decoding threw an exception for {0}, {1}", AssetId, ex); m_log.WarnFormat("[J2KDecoderModule]: JPEG2000 texture decoding threw an exception for {0}, {1}", AssetId, ex);
} }
// Write out decode time // Write out decode time
m_log.InfoFormat("[J2KDecoderModule]: {0} Decode Time: {1}", System.Environment.TickCount - DecodeTime, AssetId); m_log.InfoFormat("[J2KDecoderModule]: {0} Decode Time: {1}", System.Environment.TickCount - DecodeTime, AssetId);
// Cache Decoded layers // Cache Decoded layers
lock (m_cacheddecode) lock (m_cacheddecode)
{ {
m_cacheddecode.Add(AssetId, layers); m_cacheddecode.Add(AssetId, layers);
} }
// Notify Interested Parties // Notify Interested Parties
lock (m_notifyList) lock (m_notifyList)
{ {
if (m_notifyList.ContainsKey(AssetId)) if (m_notifyList.ContainsKey(AssetId))
{ {
foreach (DecodedCallback d in m_notifyList[AssetId]) foreach (DecodedCallback d in m_notifyList[AssetId])
{ {
if (d != null) if (d != null)
d.DynamicInvoke(AssetId, layers); d.DynamicInvoke(AssetId, layers);
} }
m_notifyList.Remove(AssetId); m_notifyList.Remove(AssetId);
} }
} }
} }
} }
} }