-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #98 from Azure/dev
Azure Media Services Release 3.1.0.0
- Loading branch information
Showing
90 changed files
with
3,207 additions
and
1,436 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,53 @@ | ||
| # Windows Azure Media Services SDK .NET 4 | ||
|
|
||
| Windows Azure Media Services allows you to build a media distribution solution that can stream audio and video to Windows, iOS, Android, and other devices and platforms.To learn more, visit our [Developer Center](http://www.windowsazure.com/en-us/develop/media-services/). | ||
|
|
||
| # Windows Azure Media Services SDK .NET 4.5 | ||
|
|
||
| Windows Azure Media Services allows you to build a media distribution solution that can stream audio and video to Windows, iOS, Android, and other devices and platforms.To learn more, visit our [Developer Center](http://www.windowsazure.com/en-us/develop/media-services/). | ||
|
|
||
| ## Release Notes | ||
|
|
||
| Please read the latest note here: https://github.com/Azure/azure-sdk-for-media-services/releases. | ||
|
|
||
| ## Getting Started | ||
|
|
||
| If you are new to Media Services, you can get started by following our [tutorials](http://www.windowsazure.com/en-us/develop/media-services/tutorials/get-started/). You could be able to bring media into Azure, encoded it, package it into stream-able format and make it available for streaming. | ||
|
|
||
| ## Download Source Code | ||
|
|
||
| To get the source code of our SDKs and samples via **git** just type: | ||
|
|
||
| git clone https://github.com/WindowsAzure/azure-sdk-for-media-services.git | ||
| cd ./azure-sdk-for-media-services/ | ||
|
|
||
| ## .NET SDK | ||
|
|
||
| ### Prerequisites | ||
|
|
||
| 1. A Media Services account in a new or existing Windows Azure subscription. See the topic [How to Create a Media Services Account](http://www.windowsazure.com/en-us/manage/services/media-services/how-to-create-a-media-services-account/). | ||
| 2. Operating Systems: Windows 7, Windows 2008 R2, or Windows 8. | ||
| 3. .NET Framework 4.5 or .NET Framework 4. | ||
| 4. Visual Studio 2012 or Visual Studio 2010 SP1 (Professional, Premium, Ultimate, or Express). | ||
|
|
||
| ### Building and Referencing the SDK | ||
|
|
||
| To build sdk sources and tests type following commands: | ||
|
|
||
| cd ./azure-sdk-for-media-services/ | ||
| msbuild ./SDK.Client.sln | ||
|
|
||
|
|
||
| ### Running the Tests | ||
|
|
||
| This set of test allows you to verify Windows Azure Media Services .Net SDK functionality using your existing Windows Azure Media Services account. Please check out [Test instruction](https://github.com/WindowsAzure/azure-sdk-for-media-services/tree/master/test) on how to use it. | ||
|
|
||
|
|
||
| ## Need Help? | ||
|
|
||
| Be sure to check out the Mobile Services [Developer Forum](http://social.msdn.microsoft.com/Forums/en-US/MediaServices/threads) if you are having trouble. The Media Services product team actively monitors the forum and will be more than happy to assist you. | ||
|
|
||
| ## Contribute Code or Provide Feedback | ||
|
|
||
| If you would like to become an active contributor to this project please follow the instructions provided in [Windows Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html). | ||
|
|
||
| If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/WindowsAzure/azure-media-services/issues) section of the project. | ||
|
|
||
| ## Learn More | ||
| [Windows Azure Media Services Developer Center](http://www.windowsazure.com/en-us/develop/media-services/) | ||
| ## Getting Started | ||
|
|
||
| If you are new to Media Services, you can get started by following our [tutorials](http://www.windowsazure.com/en-us/develop/media-services/tutorials/get-started/). You could be able to bring media into Azure, encoded it, package it into stream-able format and make it available for streaming. | ||
|
|
||
| ## Download Source Code | ||
|
|
||
| To get the source code of our SDKs and samples via **git** just type: | ||
|
|
||
| git clone https://github.com/WindowsAzure/azure-sdk-for-media-services.git | ||
| cd ./azure-sdk-for-media-services/ | ||
|
|
||
| ## .NET SDK | ||
|
|
||
| ### Prerequisites | ||
|
|
||
| 1. A Media Services account in a new or existing Windows Azure subscription. See the topic [How to Create a Media Services Account](http://www.windowsazure.com/en-us/manage/services/media-services/how-to-create-a-media-services-account/). | ||
| 2. Operating Systems: Windows 7, Windows 2008 R2, or Windows 8. | ||
| 3. .NET Framework 4.5. | ||
| 4. Visual Studio 2012 or Visual Studio 2010 SP1 (Professional, Premium, Ultimate, or Express). | ||
|
|
||
| ### Building and Referencing the SDK | ||
|
|
||
| To build sdk sources and tests type following commands: | ||
|
|
||
| cd ./azure-sdk-for-media-services/ | ||
| msbuild ./SDK.Client.sln | ||
|
|
||
|
|
||
| ### Running the Tests | ||
|
|
||
| This set of test allows you to verify Windows Azure Media Services .Net SDK functionality using your existing Windows Azure Media Services account. Please check out [Test instruction](https://github.com/WindowsAzure/azure-sdk-for-media-services/tree/master/test) on how to use it. | ||
|
|
||
|
|
||
| ## Need Help? | ||
|
|
||
| Be sure to check out the Mobile Services [Developer Forum](http://social.msdn.microsoft.com/Forums/en-US/MediaServices/threads) if you are having trouble. The Media Services product team actively monitors the forum and will be more than happy to assist you. | ||
|
|
||
| ## Contribute Code or Provide Feedback | ||
|
|
||
| If you would like to become an active contributor to this project please follow the instructions provided in [Windows Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html). | ||
|
|
||
| If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/WindowsAzure/azure-media-services/issues) section of the project. | ||
|
|
||
| ## Learn More | ||
| [Windows Azure Media Services Developer Center](http://www.windowsazure.com/en-us/develop/media-services/) |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,46 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-5.6.0.0" newVersion="5.6.0.0" /> | ||
| </dependentAssembly> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.3.0" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-5.6.0.0" newVersion="5.6.0.0" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-5.6.0.0" newVersion="5.6.0.0" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-5.6.0.0" newVersion="5.6.0.0" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-3.0.3.0" newVersion="3.0.3.0" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Microsoft.Practices.TransientFaultHandling.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-5.1.1209.1" newVersion="5.1.1209.1" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
|
|
||
| </runtime> | ||
| </configuration> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" /> | ||
| </dependentAssembly> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Microsoft.Practices.TransientFaultHandling.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-5.1.1209.1" newVersion="5.1.1209.1" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
|
|
||
| </runtime> | ||
| <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
src/net/Client/Collections/EncodingReservedUnitCollection.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| //----------------------------------------------------------------------- | ||
| // <copyright file="EncodingReservedUnitCollection.cs" company="Microsoft">Copyright 2014 Microsoft Corporation</copyright> | ||
| // <license> | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // </license> | ||
|
|
||
|
|
||
| namespace Microsoft.WindowsAzure.MediaServices.Client | ||
| { | ||
| public class EncodingReservedUnitCollection : CloudBaseCollection<IEncodingReservedUnit> | ||
| { | ||
| /// <summary> | ||
| /// The name of the storage account processor set. | ||
| /// </summary> | ||
| public const string EncodingReservedUnitSet = "EncodingReservedUnitTypes"; | ||
| /// <summary> | ||
| /// Initializes a new instance of the <see cref="EncodingReservedUnitCollection"/> class | ||
| /// </summary> | ||
| public EncodingReservedUnitCollection() | ||
| : base(null) | ||
| { | ||
|
|
||
| } | ||
| /// <summary> | ||
| /// Initializes a new instance of the <see cref="EncodingReservedUnitCollection"/> class. | ||
| /// </summary> | ||
| /// <param name="mediaContext">The media context.</param> | ||
| internal EncodingReservedUnitCollection(MediaContextBase mediaContext) | ||
| : base(mediaContext) | ||
| { | ||
| MediaContext = mediaContext; | ||
| MediaServicesClassFactory factory = MediaContext.MediaServicesClassFactory; | ||
| this.Queryable = factory.CreateDataServiceContext().CreateQuery<IEncodingReservedUnit, EncodingReservedUnitData>(EncodingReservedUnitSet); | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.