diff options
| author | randomengy <[email protected]> | 2014-06-11 03:45:16 +0000 |
|---|---|---|
| committer | randomengy <[email protected]> | 2014-06-11 03:45:16 +0000 |
| commit | f9da2ea7534cc8603951d44ad8c4ce4497c5c851 (patch) | |
| tree | 3b92e31b1614a9f54fca7aa7423dec3551800174 /win/CS/HandBrake.Interop/HandBrakeInterop/Model | |
| parent | 9491a0b137116e8606d4d08f419514d0c298debd (diff) | |
Interop: Fixed a bug that was causing crashes on AAC passthrough. We were clobbering the private data section with zeroes. Also added support for passing through a track if it's possible.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6210 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.Interop/HandBrakeInterop/Model')
5 files changed, 29 insertions, 15 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs index ecf1b775a..f27fad285 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs @@ -177,7 +177,18 @@ namespace HandBrake.Interop.Model return containers;
}
- }
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether SRT subtitles can be burnt in.
+ /// </summary>
+ public static bool CanBurnSrt
+ {
+ get
+ {
+ return HBFunctions.hb_subtitle_can_burn((int)hb_subtitle_s_subsource.SRTSUB) > 0;
+ }
+ }
/// <summary>
/// Gets the audio encoder with the specified short name.
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs index c6ac28ea5..7aa211c8d 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs @@ -37,6 +37,11 @@ namespace HandBrake.Interop.Model.Encoding public string Encoder { get; set; }
/// <summary>
+ /// Will pass through the track if it maches the codec type.
+ /// </summary>
+ public bool PassthroughIfPossible { get; set; }
+
+ /// <summary>
/// Gets or sets the encode rate type (bitrate or quality).
/// </summary>
public AudioEncodeRateType EncodeRateType { get; set; }
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBAudioEncoder.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBAudioEncoder.cs index 478e309a6..6bcd8e0d7 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBAudioEncoder.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBAudioEncoder.cs @@ -49,7 +49,7 @@ namespace HandBrake.Interop.Model.Encoding public int Id { get; set; }
/// <summary>
- /// Gets a value indicating whether is passthrough.
+ /// Gets a value indicating whether the encoder is passthrough.
/// </summary>
public bool IsPassthrough
{
@@ -70,7 +70,7 @@ namespace HandBrake.Interop.Model.Encoding public string ShortName { get; set; }
/// <summary>
- /// Gets a value indicating whether supports compression.
+ /// Gets a value indicating whether the encoder supports compression.
/// </summary>
public bool SupportsCompression
{
@@ -81,7 +81,7 @@ namespace HandBrake.Interop.Model.Encoding }
/// <summary>
- /// Gets a value indicating whether supports quality.
+ /// Gets a value indicating whether the encoder supports quality.
/// </summary>
public bool SupportsQuality
{
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs index 2912dec1e..e4bb3c39e 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs @@ -17,7 +17,7 @@ namespace HandBrake.Interop.Model #region Properties
/// <summary>
- /// Gets or sets a value indicating whether burned in.
+ /// Gets or sets a value indicating whether the subtitle track should be burned in.
/// </summary>
public bool BurnedIn { get; set; }
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs index 46cc45f57..9a60c8ab3 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs @@ -14,18 +14,21 @@ namespace HandBrake.Interop.Model /// </summary>
public class SrtSubtitle
{
- #region Properties
-
/// <summary>
/// Gets or sets the character code.
/// </summary>
public string CharacterCode { get; set; }
/// <summary>
- /// Gets or sets a value indicating whether default.
+ /// Gets or sets a value indicating whether the subtitle track should be marked as default.
/// </summary>
public bool Default { get; set; }
+ /// <summary>
+ /// Gets or sets a value indicating the subtitle track should be burned in.
+ /// </summary>
+ public bool BurnedIn { get; set; }
+
/// <summary>
/// Gets or sets the file name.
/// </summary>
@@ -41,10 +44,6 @@ namespace HandBrake.Interop.Model /// </summary>
public int Offset { get; set; }
- #endregion
-
- #region Public Methods
-
/// <summary>
/// The clone.
/// </summary>
@@ -55,14 +54,13 @@ namespace HandBrake.Interop.Model {
return new SrtSubtitle
{
- Default = this.Default,
+ Default = this.Default,
+ BurnedIn = this.BurnedIn,
FileName = this.FileName,
LanguageCode = this.LanguageCode,
CharacterCode = this.CharacterCode,
Offset = this.Offset
};
}
-
- #endregion
}
}
\ No newline at end of file |