Nicolas Cannasse 10 anni fa
parent
commit
e09ed5e38f
33 ha cambiato i file con 177 aggiunte e 13 eliminazioni
  1. 1 0
      std/flash/display/Stage.hx
  2. 7 1
      std/flash/display3D/Context3D.hx
  3. 1 1
      std/flash/display3D/Context3DBufferUsage.hx
  4. 9 0
      std/flash/display3D/textures/VideoTexture.hx
  5. 8 0
      std/flash/events/AVDictionaryDataEvent.hx
  6. 9 0
      std/flash/events/AVHTTPStatusEvent.hx
  7. 7 0
      std/flash/events/AVPauseAtPeriodEndEvent.hx
  8. 2 0
      std/flash/events/AVStatusEvent.hx
  9. 2 1
      std/flash/events/AVStreamSwitchEvent.hx
  10. 7 0
      std/flash/events/DRMLicenseRequestEvent.hx
  11. 1 0
      std/flash/events/Event.hx
  12. 1 0
      std/flash/events/StageVideoAvailabilityEvent.hx
  13. 9 0
      std/flash/events/VideoTextureEvent.hx
  14. 3 1
      std/flash/media/AVABRProfileInfo.hx
  15. 8 0
      std/flash/media/AVNetworkingParams.hx
  16. 4 1
      std/flash/media/AVPeriodInfo.hx
  17. 17 0
      std/flash/media/AVResult.hx
  18. 23 1
      std/flash/media/AVSegmentedSource.hx
  19. 2 0
      std/flash/media/AVStream.hx
  20. 7 0
      std/flash/media/AVTagData.hx
  21. 3 1
      std/flash/media/AVTrackInfo.hx
  22. 7 0
      std/flash/media/AVURLLoader.hx
  23. 6 0
      std/flash/media/AVURLStream.hx
  24. 6 0
      std/flash/net/drm/DRMAddToDeviceGroupContext.hx
  25. 1 0
      std/flash/net/drm/DRMDeviceGroup.hx
  26. 4 0
      std/flash/net/drm/DRMManager.hx
  27. 2 1
      std/flash/net/drm/DRMManagerSession.hx
  28. 6 0
      std/flash/net/drm/DRMRemoveFromDeviceGroupContext.hx
  29. 7 0
      std/flash/net/drm/DRMResetContext.hx
  30. 1 1
      std/flash/net/drm/DRMURLDownloadContext.hx
  31. 1 0
      std/flash/net/drm/VoucherAccessInfo.hx
  32. 2 0
      std/flash/system/AuthorizedFeatures.hx
  33. 3 4
      std/flash/system/ConnexionsClient.hx

+ 1 - 0
std/flash/display/Stage.hx

@@ -4,6 +4,7 @@ extern class Stage extends DisplayObjectContainer {
 	var align : StageAlign;
 	@:require(flash10_2) var allowsFullScreen(default,null) : Bool;
 	@:require(flash11_3) var allowsFullScreenInteractive(default,null) : Bool;
+	@:require(flash15) var browserZoomFactor(default,null) : Float;
 	@:require(flash10_2) var color : UInt;
 	@:require(flash10) var colorCorrection : ColorCorrection;
 	@:require(flash10) var colorCorrectionSupport(default,null) : ColorCorrectionSupport;

+ 7 - 1
std/flash/display3D/Context3D.hx

@@ -1,17 +1,22 @@
 package flash.display3D;
 
 @:final extern class Context3D extends flash.events.EventDispatcher {
+	@:require(flash15) var backBufferHeight(default,null) : Int;
+	@:require(flash15) var backBufferWidth(default,null) : Int;
 	var driverInfo(default,null) : String;
 	var enableErrorChecking : Bool;
+	@:require(flash15) var maxBackBufferHeight : Int;
+	@:require(flash15) var maxBackBufferWidth : Int;
 	@:require(flash12) var profile(default,null) : String;
 	function clear(red : Float = 0, green : Float = 0, blue : Float = 0, alpha : Float = 1, depth : Float = 1, stencil : UInt = 0, mask : UInt = 0xFFFFFFFF) : Void;
-	function configureBackBuffer(width : Int, height : Int, antiAlias : Int, enableDepthAndStencil : Bool = true, wantsBestResolution : Bool = false) : Void;
+	function configureBackBuffer(width : Int, height : Int, antiAlias : Int, enableDepthAndStencil : Bool = true, wantsBestResolution : Bool = false, wantsBestResolutionOnBrowserZoom : Bool = false) : Void;
 	function createCubeTexture(size : Int, format : Context3DTextureFormat, optimizeForRenderToTexture : Bool, streamingLevels : Int = 0) : flash.display3D.textures.CubeTexture;
 	function createIndexBuffer(numIndices : Int, ?bufferUsage : Context3DBufferUsage) : IndexBuffer3D;
 	function createProgram() : Program3D;
 	@:require(flash11_8) function createRectangleTexture(width : Int, height : Int, format : Context3DTextureFormat, optimizeForRenderToTexture : Bool) : flash.display3D.textures.RectangleTexture;
 	function createTexture(width : Int, height : Int, format : Context3DTextureFormat, optimizeForRenderToTexture : Bool, streamingLevels : Int = 0) : flash.display3D.textures.Texture;
 	function createVertexBuffer(numVertices : Int, data32PerVertex : Int, ?bufferUsage : Context3DBufferUsage) : VertexBuffer3D;
+	@:require(flash15) function createVideoTexture() : flash.display3D.textures.VideoTexture;
 	function dispose(recreate : Bool = true) : Void;
 	function drawToBitmapData(destination : flash.display.BitmapData) : Void;
 	function drawTriangles(indexBuffer : IndexBuffer3D, firstIndex : Int = 0, numTriangles : Int = -1) : Void;
@@ -32,4 +37,5 @@ package flash.display3D;
 	function setStencilReferenceValue(referenceValue : UInt, readMask : UInt = 255, writeMask : UInt = 255) : Void;
 	function setTextureAt(sampler : Int, texture : flash.display3D.textures.TextureBase) : Void;
 	function setVertexBufferAt(index : Int, buffer : VertexBuffer3D, bufferOffset : Int = 0, ?format : Context3DVertexBufferFormat) : Void;
+	@:require(flash15) static var supportsVideoTexture(default,null) : Bool;
 }

+ 1 - 1
std/flash/display3D/Context3DBufferUsage.hx

@@ -1,6 +1,6 @@
 package flash.display3D;
 
-@:require(flash12) @:fakeEnum(String) extern enum Context3DBufferUsage {
+@:fakeEnum(String) @:require(flash12) extern enum Context3DBufferUsage {
 	DYNAMIC_DRAW;
 	STATIC_DRAW;
 }

+ 9 - 0
std/flash/display3D/textures/VideoTexture.hx

@@ -0,0 +1,9 @@
+package flash.display3D.textures;
+
+@:final extern class VideoTexture extends TextureBase {
+	var videoHeight(default,null) : Int;
+	var videoWidth(default,null) : Int;
+	function new() : Void;
+	function attachCamera(theCamera : flash.media.Camera) : Void;
+	function attachNetStream(netStream : flash.net.NetStream) : Void;
+}

+ 8 - 0
std/flash/events/AVDictionaryDataEvent.hx

@@ -0,0 +1,8 @@
+package flash.events;
+
+extern class AVDictionaryDataEvent extends Event {
+	var dictionary(default,null) : flash.utils.Dictionary;
+	var time(default,null) : Float;
+	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, ?init_dictionary : flash.utils.Dictionary, init_dataTime : Float = 0) : Void;
+	static var AV_DICTIONARY_DATA : String;
+}

+ 9 - 0
std/flash/events/AVHTTPStatusEvent.hx

@@ -0,0 +1,9 @@
+package flash.events;
+
+extern class AVHTTPStatusEvent extends Event {
+	var responseHeaders : Array<Dynamic>;
+	var responseURL : String;
+	var status(default,null) : Int;
+	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, status : Int = 0, ?responseUrl : String, ?responseHeaders : Array<Dynamic>) : Void;
+	static var AV_HTTP_RESPONSE_STATUS : String;
+}

+ 7 - 0
std/flash/events/AVPauseAtPeriodEndEvent.hx

@@ -0,0 +1,7 @@
+package flash.events;
+
+extern class AVPauseAtPeriodEndEvent extends Event {
+	var userData(default,null) : Int;
+	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, userData : Int = 0) : Void;
+	static var AV_PAUSE_AT_PERIOD_END : String;
+}

+ 2 - 0
std/flash/events/AVStatusEvent.hx

@@ -6,6 +6,8 @@ extern class AVStatusEvent extends Event {
 	var result(default,null) : flash.media.AVResult;
 	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, ?inNotificationType : String, inResult : Int = 0, ?inDescription : String) : Void;
 	static var AV_STATUS : String;
+	static var BACKGROUND_MANIFEST_ERROR : String;
+	static var BACKGROUND_MANIFEST_WARNING : String;
 	static var BUFFER_STATE : String;
 	static var DECODER_TYPE : String;
 	static var DIMENSION_CHANGE : String;

+ 2 - 1
std/flash/events/AVStreamSwitchEvent.hx

@@ -2,10 +2,11 @@ package flash.events;
 
 extern class AVStreamSwitchEvent extends Event {
 	var bitrate(default,null) : Int;
+	var description(default,null) : String;
 	var switchType(default,null) : Int;
 	var time(default,null) : Float;
 	var userData(default,null) : Int;
-	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, time : Float = 0, switchType : Int = 0, bitrate : Int = 0, userData : Int = 0) : Void;
+	function new(?type : String, bubbles : Bool = false, cancelable : Bool = false, time : Float = 0, switchType : Int = 0, bitrate : Int = 0, ?description : String, userData : Int = 0) : Void;
 	static var ABR_SWITCH : Int;
 	static var AV_STREAM_SWITCH : String;
 	static var PERIOD_SWITCH : Int;

+ 7 - 0
std/flash/events/DRMLicenseRequestEvent.hx

@@ -0,0 +1,7 @@
+package flash.events;
+
+extern class DRMLicenseRequestEvent extends Event {
+	var serverURL : String;
+	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?inServerURL : String) : Void;
+	static var LICENSE_REQUEST : String;
+}

+ 1 - 0
std/flash/events/Event.hx

@@ -18,6 +18,7 @@ extern class Event {
 	static var ACTIVATE : String;
 	static var ADDED : String;
 	static var ADDED_TO_STAGE : String;
+	@:require(flash15) static var BROWSER_ZOOM_CHANGE : String;
 	static var CANCEL : String;
 	static var CHANGE : String;
 	static var CHANNEL_MESSAGE : String;

+ 1 - 0
std/flash/events/StageVideoAvailabilityEvent.hx

@@ -2,6 +2,7 @@ package flash.events;
 
 extern class StageVideoAvailabilityEvent extends Event {
 	var availability(default,null) : String;
+	var driver : String;
 	var reason : String;
 	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?availability : String) : Void;
 	static var STAGE_VIDEO_AVAILABILITY : String;

+ 9 - 0
std/flash/events/VideoTextureEvent.hx

@@ -0,0 +1,9 @@
+package flash.events;
+
+extern class VideoTextureEvent extends Event {
+	var codecInfo : String;
+	var colorSpace(default,null) : String;
+	var status(default,null) : String;
+	function new(type : String, bubbles : Bool = false, cancelable : Bool = false, ?status : String, ?colorSpace : String) : Void;
+	static var RENDER_STATE : String;
+}

+ 3 - 1
std/flash/media/AVABRProfileInfo.hx

@@ -2,5 +2,7 @@ package flash.media;
 
 extern class AVABRProfileInfo {
 	var bitsPerSecond(default,null) : Int;
-	function new(init_bitsPerSecond : Int) : Void;
+	var height(default,null) : Int;
+	var width(default,null) : Int;
+	function new(init_bitsPerSecond : Int, init_width : Int, init_height : Int) : Void;
 }

+ 8 - 0
std/flash/media/AVNetworkingParams.hx

@@ -0,0 +1,8 @@
+package flash.media;
+
+extern class AVNetworkingParams {
+	var forceNativeNetworking : Bool;
+	var readSetCookieHeader : Bool;
+	var useCookieHeaderForAllRequests : Bool;
+	function new(init_forceNativeNetworking : Bool = false, init_readSetCookieHeader : Bool = true, init_useCookieHeaderForAllRequests : Bool = false) : Void;
+}

+ 4 - 1
std/flash/media/AVPeriodInfo.hx

@@ -3,10 +3,13 @@ package flash.media;
 extern class AVPeriodInfo {
 	var duration(default,null) : Float;
 	var firstCuePointIndex(default,null) : Int;
+	var firstSubscribedTagIndex(default,null) : Int;
 	var lastCuePointIndex(default,null) : Int;
+	var lastSubscribedTagIndex(default,null) : Int;
 	var localStartTime(default,null) : Float;
 	var supportsTrickPlay(default,null) : Bool;
+	var targetDuration(default,null) : Float;
 	var userData(default,null) : Int;
 	var virtualStartTime(default,null) : Float;
-	function new(init_localStartTime : Float, init_virtualStartTime : Float, init_duration : Float, init_firstCuePointIndex : Int, init_lastCuePointIndex : Int, init_userData : Int, init_supportsTrickPlay : Bool) : Void;
+	function new(init_localStartTime : Float, init_virtualStartTime : Float, init_duration : Float, init_firstCuePointIndex : Int, init_lastCuePointIndex : Int, init_firstSubscribedTagIndex : Int, init_lastSubscribedTagIndex : Int, init_userData : Int, init_supportsTrickPlay : Bool, init_targetDuration : Float) : Void;
 }

+ 17 - 0
std/flash/media/AVResult.hx

@@ -4,6 +4,8 @@ extern class AVResult {
 	var result(default,null) : Int;
 	function new(inResult : Int) : Void;
 	static var ASYNC_OPERATION_IN_PROGRESS : Int;
+	static var AUDIO_ONLY_STREAM_END : Int;
+	static var AUDIO_ONLY_STREAM_START : Int;
 	static var AUDIO_START_ERROR : Int;
 	static var BAD_MANIFEST_SIGNATURE : Int;
 	static var BAD_MEDIASAMPLE_FOUND : Int;
@@ -11,12 +13,21 @@ extern class AVResult {
 	static var CALLED_FROM_WRONG_THREAD : Int;
 	static var CANNOT_ERASE_TIMELINE : Int;
 	static var CANNOT_FAIL_OVER : Int;
+	static var CANNOT_HANDLE_MAIN_MANIFEST_UPDATE : Int;
 	static var CANNOT_LOAD_PLAY_LIST : Int;
 	static var CANNOT_SPLIT_TIMELINE : Int;
 	static var CODEC_NOT_SUPPORTED : Int;
 	static var COMPONENT_CREATION_FAILURE : Int;
 	static var CONTAINER_NOT_SUPPORTED : Int;
 	static var CONTENT_LENGTH_MISMATCH : Int;
+	static var CRYPTO_ALGORITHM_NOT_SUPPORTED : Int;
+	static var CRYPTO_ERROR_BAD_CERTIFICATE : Int;
+	static var CRYPTO_ERROR_BAD_PARAMETER : Int;
+	static var CRYPTO_ERROR_BUFFER_TOO_SMALL : Int;
+	static var CRYPTO_ERROR_CORRUPTED_DATA : Int;
+	static var CRYPTO_ERROR_DIGEST_FINISH : Int;
+	static var CRYPTO_ERROR_DIGEST_UPDATE : Int;
+	static var CRYPTO_ERROR_UNKNOWN : Int;
 	static var CURRENT_PERIOD_EXPIRED : Int;
 	static var DECODER_FAILED : Int;
 	static var DEVICE_OPEN_ERROR : Int;
@@ -33,15 +44,19 @@ extern class AVResult {
 	static var FRAGMENT_READ_ERROR : Int;
 	static var GENERIC_ERROR : Int;
 	static var HTTP_TIME_OUT : Int;
+	static var ID3_PARSE_ERROR : Int;
 	static var INCOMPATIBLE_RENDER_MODE : Int;
 	static var INCOMPATIBLE_VERSION : Int;
 	static var INTERNAL_ERROR : Int;
+	static var INVALID_KEY : Int;
 	static var INVALID_OPERATION : Int;
 	static var INVALID_PARAMETER : Int;
 	static var INVALID_REPLACE_DURATION : Int;
 	static var INVALID_SEEK_TIME : Int;
 	static var INVALID_WITH_AUDIO_ONLY_FILE : Int;
 	static var IRRECOVERABLE_ERROR : Int;
+	static var KEY_NOT_FOUND : Int;
+	static var KEY_SERVER_NOT_FOUND : Int;
 	static var LISTENER_NOT_FOUND : Int;
 	static var LIVE_HOLD : Int;
 	static var LIVE_WINDOW_MOVED_BACKWARD : Int;
@@ -73,12 +88,14 @@ extern class AVResult {
 	static var RENDITION_M3U8_ERROR : Int;
 	static var REPLACEMENT_FAILED : Int;
 	static var RESOURCE_NOT_SPECIFIED : Int;
+	static var SECURITY_ERROR : Int;
 	static var SEEK_FAILED : Int;
 	static var SEGMENT_SKIPPED_ON_FAILURE : Int;
 	static var SIZE_UNKNOWN : Int;
 	static var SPS_PPS_FOUND_OUTSIDE_AVCC : Int;
 	static var SUCCESS : Int;
 	static var SWITCH_TO_ASYMMETRIC_PROFILE : Int;
+	static var TIMELINE_TOO_SHORT : Int;
 	static var UNDERFLOW : Int;
 	static var UNSUPPORTED_CONFIGURATION : Int;
 	static var UNSUPPORTED_HLS_VERSION : Int;

+ 23 - 1
std/flash/media/AVSegmentedSource.hx

@@ -1,11 +1,21 @@
 package flash.media;
 
 extern class AVSegmentedSource extends AVSource {
+	var cookieHeader(null,default) : String;
+	var masterUpdateInterval(null,default) : Int;
+	var networkingParams : AVNetworkingParams;
+	var useRedirectedUrl(null,default) : Bool;
 	function new() : Void;
+	function clearPauseAtPeriodEnd(periodIndex : Int) : AVResult;
 	function getABRProfileCount(periodIndex : Int) : Int;
 	function getABRProfileInfoAtIndex(periodIndex : Int, abrProfileIndex : Int) : AVABRProfileInfo;
+	function getBackgroundPeriodInfo(periodIndex : Int) : AVPeriodInfo;
+	function getBackgroundTimeline() : AVTimeline;
 	function getCuePoint(periodIndex : Int, cuePointIndex : Int) : AVCuePoint;
+	function getPerceivedBandwidth() : UInt;
 	function getPeriodInfo(periodIndex : Int) : AVPeriodInfo;
+	function getSubscribedTag(periodIndex : Int, tagDataIndex : Int) : AVTagData;
+	function getSubscribedTagForBackgroundManifest(periodIndex : Int, tagDataIndex : Int) : AVTagData;
 	function getTimeline() : AVTimeline;
 	function getTrackCount(periodIndex : Int, payloadType : String) : Int;
 	function getTrackInfo(periodIndex : Int, payloadType : String, trackIndex : Int) : AVTrackInfo;
@@ -13,15 +23,27 @@ extern class AVSegmentedSource extends AVSource {
 	function insertByVirtualTime(insertionTime : Float, handle : Int, userData : Int = 0, replaceDuration : Float = 0) : AVInsertionResult;
 	function load(url : String, ?containerType : String, userData : Int = 0) : AVResult;
 	function loadManifest(uri : String, userData : Int = 0, ?containerType : String) : AVResult;
+	function loadWithBackgroundManifest(url : String, containerType : String, userData : Int, backgroundManifest : String) : AVResult;
 	function releaseManifest(handle : Int) : AVResult;
-	function removeByLocalTime(periodIndex : Int, timeStart : Float, timeEnd : Float) : AVResult;
+	function removeByLocalTime(periodIndex : Int, timeStart : Float, timeEnd : Float, replaceWithMainMedia : Bool) : AVResult;
 	function removeByVirtualTime(virtualTimeStart : Float, virtualTimeEnd : Float) : AVResult;
 	function selectTrack(periodIndex : Int, payloadType : String, trackIndex : Int) : AVResult;
+	function selectTrackString(periodIndex : Int, payloadType : String, trackString : String) : AVResult;
 	function setABRParameters(params : AVABRParameters) : AVResult;
 	function setBandwidth(bitsPerSecond : Int) : AVResult;
+	function setCuePointTags(tagArray : Array<Dynamic>) : AVResult;
 	function setHoldAt(time : Float) : AVResult;
+	function setPauseAtPeriodEnd(periodIndex : Int, userData : Int = 0) : AVResult;
+	function setSubscribedTags(tagArray : Array<Dynamic>) : AVResult;
+	function setSubscribedTagsForBackgroundManifest(tagArray : Array<Dynamic>) : AVResult;
 	static var AUDIO : String;
+	static var AUDIO_DESCRIPTION : String;
+	static var AUDIO_LANGUAGE : String;
+	static var AUDIO_PID : String;
+	static var DASH : String;
 	static var DATA : String;
+	static var DATA_DESCRIPTION : String;
 	static var HLS : String;
 	static var VIDEO : String;
+	static var VIDEO_DESCRIPTION : String;
 }

+ 2 - 0
std/flash/media/AVStream.hx

@@ -7,6 +7,7 @@ extern class AVStream extends flash.events.EventDispatcher {
 	var bufferTime(null,default) : Float;
 	var captionStyle(null,default) : AVCaptionStyle;
 	var captionsEnabled : Bool;
+	var clientLivePoint(default,null) : Float;
 	var currentFPS(default,null) : Float;
 	var decoderType(default,null) : String;
 	var droppedFrames(default,null) : Int;
@@ -25,6 +26,7 @@ extern class AVStream extends flash.events.EventDispatcher {
 	function resume() : Bool;
 	function rewind(rate : Float) : AVResult;
 	function seek(offset : Float, inBufferSeek : Bool = true) : AVResult;
+	function seekToKeyFrame(offset : Float, inBufferSeek : Bool = true) : AVResult;
 	function seekToLivePoint() : AVResult;
 	function seekToLocalTime(periodIndex : Int, time : Float) : AVResult;
 	function setPlaySpeed(speed : Float, reserved : Float) : Void;

+ 7 - 0
std/flash/media/AVTagData.hx

@@ -0,0 +1,7 @@
+package flash.media;
+
+extern class AVTagData {
+	var data(default,null) : String;
+	var localTime(default,null) : Float;
+	function new(init_data : String, init_localTime : Float) : Void;
+}

+ 3 - 1
std/flash/media/AVTrackInfo.hx

@@ -8,7 +8,9 @@ extern class AVTrackInfo {
 	var description(default,null) : String;
 	var forced(default,null) : Bool;
 	var language(default,null) : String;
-	function new(init_description : String, init_language : String, init_defaultTrack : Bool, init_autoSelect : Bool, init_forced : Bool, init_activity : Bool, init_dataTrackInfoServiceType : String) : Void;
+	var pid(default,null) : Int;
+	function new(init_description : String, init_language : String, init_defaultTrack : Bool, init_autoSelect : Bool, init_forced : Bool, init_activity : Bool, init_dataTrackInfoServiceType : String, init_pid : Int) : Void;
 	static var DTI_608_CAPTIONS : String;
 	static var DTI_708_CAPTIONS : String;
+	static var DTI_WEBVTT_CAPTIONS : String;
 }

+ 7 - 0
std/flash/media/AVURLLoader.hx

@@ -0,0 +1,7 @@
+package flash.media;
+
+extern class AVURLLoader extends flash.net.URLLoader {
+	var cookieHeader(null,default) : String;
+	var stream : AVURLStream;
+	function new(?request : flash.net.URLRequest) : Void;
+}

+ 6 - 0
std/flash/media/AVURLStream.hx

@@ -0,0 +1,6 @@
+package flash.media;
+
+extern class AVURLStream extends flash.net.URLStream {
+	var cookieHeader(null,default) : String;
+	function new() : Void;
+}

+ 6 - 0
std/flash/net/drm/DRMAddToDeviceGroupContext.hx

@@ -0,0 +1,6 @@
+package flash.net.drm;
+
+extern class DRMAddToDeviceGroupContext extends DRMManagerSession {
+	function new() : Void;
+	function addToDeviceGroup(deviceGroup : DRMDeviceGroup, forceRefresh : Bool) : Void;
+}

+ 1 - 0
std/flash/net/drm/DRMDeviceGroup.hx

@@ -3,6 +3,7 @@ package flash.net.drm;
 @:final extern class DRMDeviceGroup {
 	var authenticationMethod(default,null) : String;
 	var domain(default,null) : String;
+	var name : String;
 	var serverURL(default,null) : String;
 	function new() : Void;
 }

+ 4 - 0
std/flash/net/drm/DRMManager.hx

@@ -2,14 +2,18 @@ package flash.net.drm;
 
 extern class DRMManager extends flash.events.EventDispatcher {
 	function new() : Void;
+	function addToDeviceGroup(deviceGroup : DRMDeviceGroup, forceRefresh : Bool = false) : Void;
 	function authenticate(serverURL : String, domain : String, username : String, password : String) : Void;
 	function loadPreviewVoucher(contentData : DRMContentData) : Void;
 	function loadVoucher(contentData : DRMContentData, setting : String) : Void;
+	function removeFromDeviceGroup(deviceGroup : DRMDeviceGroup) : Void;
 	function resetDRMVouchers() : Void;
+	function resetDRMVouchersInternal(isAutoReset : Bool) : Void;
 	function returnVoucher(inServerURL : String, immediateCommit : Bool, licenseID : String, policyID : String) : Void;
 	function setAuthenticationToken(serverUrl : String, domain : String, token : flash.utils.ByteArray) : Void;
 	function storeVoucher(voucher : flash.utils.ByteArray) : Void;
 	static var isSupported(default,null) : Bool;
 	static var networkIdleTimeout : Float;
 	static function getDRMManager() : DRMManager;
+	static function getDRMManagerInternal() : DRMManager;
 }

+ 2 - 1
std/flash/net/drm/DRMManagerSession.hx

@@ -7,8 +7,9 @@ extern class DRMManagerSession extends flash.events.EventDispatcher {
 	function checkStatus() : UInt;
 	function errorCodeToThrow(errorCode : UInt) : Void;
 	function getLastError() : UInt;
+	function getLastServerErrorString() : String;
 	function getLastSubErrorID() : UInt;
-	function issueDRMErrorEvent(metadata : DRMContentData, errorID : Int, subErrorID : Int, ?eventType : String) : Void;
+	function issueDRMErrorEvent(metadata : DRMContentData, errorID : Int, subErrorID : Int, serverErrorString : String) : Void;
 	function issueDRMStatusEvent(inMetadata : DRMContentData, voucher : DRMVoucher) : Dynamic;
 	function onSessionComplete() : Void;
 	function onSessionError() : Void;

+ 6 - 0
std/flash/net/drm/DRMRemoveFromDeviceGroupContext.hx

@@ -0,0 +1,6 @@
+package flash.net.drm;
+
+extern class DRMRemoveFromDeviceGroupContext extends DRMManagerSession {
+	function new() : Void;
+	function removeFromDeviceGroup(deviceGroup : DRMDeviceGroup) : Void;
+}

+ 7 - 0
std/flash/net/drm/DRMResetContext.hx

@@ -0,0 +1,7 @@
+package flash.net.drm;
+
+extern class DRMResetContext extends DRMManagerSession {
+	var m_isAutoReset : Bool;
+	function new(isAutoReset : Bool) : Void;
+	function doReset() : Void;
+}

+ 1 - 1
std/flash/net/drm/DRMURLDownloadContext.hx

@@ -3,5 +3,5 @@ package flash.net.drm;
 extern class DRMURLDownloadContext extends flash.events.EventDispatcher {
 	function new() : Void;
 	function httpGetASync(url : String) : Void;
-	function httpPostAndReceiveASync(url : String, headerName : String, headerValue : String, data : flash.utils.ByteArray) : Void;
+	function httpPostAndReceiveASync(url : String, headerName : String, headerValue : String, data : flash.utils.ByteArray, serverType : UInt) : Void;
 }

+ 1 - 0
std/flash/net/drm/VoucherAccessInfo.hx

@@ -2,6 +2,7 @@ package flash.net.drm;
 
 @:final extern class VoucherAccessInfo {
 	var authenticationMethod(default,null) : String;
+	var deviceGroup(default,null) : DRMDeviceGroup;
 	var displayName(default,null) : String;
 	var domain(default,null) : String;
 	var policyID(default,null) : String;

+ 2 - 0
std/flash/system/AuthorizedFeatures.hx

@@ -3,6 +3,8 @@ package flash.system;
 @:final @:require(flash11_3) extern class AuthorizedFeatures {
 	function new() : Void;
 	function createApplicationInstaller(strings : flash.xml.XML, icon : flash.utils.ByteArray) : ApplicationInstaller;
+	function enableAVURLLoader(loader : flash.media.AVURLLoader) : Bool;
+	function enableAVURLStream(stream : flash.media.AVURLStream) : Bool;
 	@:require(flash11_4) function enableDiskCache(stream : flash.net.URLStream) : Bool;
 	@:require(flash11_7) function enableHLSPlayback(stream : flash.media.AVStream) : Bool;
 	@:require(flash11_4) function isFeatureEnabled(feature : String, ?data : String) : Bool;

+ 3 - 4
std/flash/system/ConnexionsClient.hx

@@ -1,10 +1,9 @@
 package flash.system;
 
 @:final extern class ConnexionsClient {
-	var enabled(default,null) : Bool;
 	function new() : Void;
 	function Connexions() : Dynamic;
-	function _init(port : Int, secret : String, topLocation : String, documentReferrer : String, windowLocation : String, movie : String, userAgent : String) : Void;
-	function autoAdd() : Dynamic;
-	function manualAdd() : Dynamic;
+	function _init(topLocation : String, documentReferrer : String, windowLocation : String, movie : String, userAgent : String, timeout : UInt) : Void;
+	function autoAdd(port : Int) : Dynamic;
+	function manualAdd(port : Int) : Dynamic;
 }