Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class EncoderNamedPreset(str, Enum):
h264_single_bitrate_sd = "H264SingleBitrateSD" #: Produces an MP4 file where the video is encoded with H.264 codec at 2200 kbps and a picture height of 480 pixels, and the stereo audio is encoded with AAC-LC codec at 64 kbps.
h264_single_bitrate720p = "H264SingleBitrate720p" #: Produces an MP4 file where the video is encoded with H.264 codec at 4500 kbps and a picture height of 720 pixels, and the stereo audio is encoded with AAC-LC codec at 64 kbps.
h264_single_bitrate1080p = "H264SingleBitrate1080p" #: Produces an MP4 file where the video is encoded with H.264 codec at 6750 kbps and a picture height of 1080 pixels, and the stereo audio is encoded with AAC-LC codec at 64 kbps.
adaptive_streaming = "AdaptiveStreaming" #: Produces a set of GOP aligned MP4 files with H.264 video and stereo AAC audio. Auto-generates a bitrate ladder based on the input resolution and bitrate. The auto-generated preset will never exceed the input resolution and bitrate. For example, if the input is 720p at 3 Mbps, output will remain 720p at best, and will start at rates lower than 3 Mbps. The output will will have video and audio in separate MP4 files, which is optimal for adaptive streaming.
adaptive_streaming = "AdaptiveStreaming" #: Produces a set of GOP aligned MP4 files with H.264 video and stereo AAC audio. Auto-generates a bitrate ladder based on the input resolution and bitrate. The auto-generated preset will never exceed the input resolution and bitrate. For example, if the input is 720p at 3 Mbps, output will remain 720p at best, and will start at rates lower than 3 Mbps. The output will have video and audio in separate MP4 files, which is optimal for adaptive streaming.
aac_good_quality_audio = "AACGoodQualityAudio" #: Produces a single MP4 file containing only stereo audio encoded at 192 kbps.
h264_multiple_bitrate1080p = "H264MultipleBitrate1080p" #: Produces a set of 8 GOP-aligned MP4 files, ranging from 6000 kbps to 400 kbps, and stereo AAC audio. Resolution starts at 1080p and goes down to 360p.
h264_multiple_bitrate720p = "H264MultipleBitrate720p" #: Produces a set of 6 GOP-aligned MP4 files, ranging from 3400 kbps to 400 kbps, and stereo AAC audio. Resolution starts at 720p and goes down to 360p.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class EnvelopeEncryption(Model):
:param content_keys: Representing default content key for each encryption
scheme and separate content keys for specific tracks
:type content_keys: ~azure.mgmt.media.models.StreamingPolicyContentKeys
:param custom_key_acquisition_url_template: KeyAcquistionUrlTemplate is
:param custom_key_acquisition_url_template: KeyAcquisitionUrlTemplate is
used to point to user specified service to delivery content keys
:type custom_key_acquisition_url_template: str
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class EnvelopeEncryption(Model):
:param content_keys: Representing default content key for each encryption
scheme and separate content keys for specific tracks
:type content_keys: ~azure.mgmt.media.models.StreamingPolicyContentKeys
:param custom_key_acquisition_url_template: KeyAcquistionUrlTemplate is
:param custom_key_acquisition_url_template: KeyAcquisitionUrlTemplate is
used to point to user specified service to delivery content keys
:type custom_key_acquisition_url_template: str
"""
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/job_inputs.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class JobInputs(JobInput):
"""Describes a list of of inputs to a Job.
"""Describes a list of inputs to a Job.

All required parameters must be populated in order to send to Azure.

Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/job_inputs_py3.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class JobInputs(JobInput):
"""Describes a list of of inputs to a Job.
"""Describes a list of inputs to a Job.

All required parameters must be populated in order to send to Azure.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class StreamingLocatorContentKey(Model):
:param label_reference_in_streaming_policy: Label of Content Key as
specified in the Streaming Policy
:type label_reference_in_streaming_policy: str
:param value: Value of of Content Key
:param value: Value of Content Key
:type value: str
:ivar policy_name: ContentKeyPolicy used by Content Key
:vartype policy_name: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class StreamingLocatorContentKey(Model):
:param label_reference_in_streaming_policy: Label of Content Key as
specified in the Streaming Policy
:type label_reference_in_streaming_policy: str
:param value: Value of of Content Key
:param value: Value of Content Key
:type value: str
:ivar policy_name: ContentKeyPolicy used by Content Key
:vartype policy_name: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class VideoAnalyzerPreset(AudioAnalyzerPreset):
:type audio_language: str
:param insights_to_extract: The type of insights to be extracted. If not
set then based on the content the type will selected. If the content is
audi only then only audio insights are extraced and if it is video only.
audio only then only audio insights are extracted and if it is video only.
Possible values include: 'AudioInsightsOnly', 'VideoInsightsOnly',
'AllInsights'
:type insights_to_extract: str or ~azure.mgmt.media.models.InsightsType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class VideoAnalyzerPreset(AudioAnalyzerPreset):
:type audio_language: str
:param insights_to_extract: The type of insights to be extracted. If not
set then based on the content the type will selected. If the content is
audi only then only audio insights are extraced and if it is video only.
audio only then only audio insights are extracted and if it is video only.
Possible values include: 'AudioInsightsOnly', 'VideoInsightsOnly',
'AllInsights'
:type insights_to_extract: str or ~azure.mgmt.media.models.InsightsType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def list(
of items returned from a collection. The service returns the number of
available items up to but not greater than the specified value n.
:type top: int
:param orderby: Specifies the the key by which the result collection
:param orderby: Specifies the key by which the result collection
should be ordered.
:type orderby: str
:param dict custom_headers: headers that will be added to the request
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def list(
of items returned from a collection. The service returns the number of
available items up to but not greater than the specified value n.
:type top: int
:param orderby: Specifies the the key by which the result collection
:param orderby: Specifies the key by which the result collection
should be ordered.
:type orderby: str
:param dict custom_headers: headers that will be added to the request
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "1.0.1"
VERSION = "2018-07-01"