removed subtitle encoding functions
This commit is contained in:
@@ -115,10 +115,9 @@ void EncodingParams::EnableAudio(const AudioParams &audio_params, const ExportCo
|
||||
audio_codec_ = acodec;
|
||||
}
|
||||
|
||||
void EncodingParams::EnableSubtitles(const SubtitleParams::Encoding &encoding, const ExportCodec::Codec &scodec)
|
||||
void EncodingParams::EnableSubtitles(const ExportCodec::Codec &scodec)
|
||||
{
|
||||
subtitles_enabled_ = true;
|
||||
subtitles_encoding_ = encoding;
|
||||
subtitles_codec_ = scodec;
|
||||
}
|
||||
|
||||
@@ -232,11 +231,6 @@ bool EncodingParams::subtitles_enabled() const
|
||||
return subtitles_enabled_;
|
||||
}
|
||||
|
||||
SubtitleParams::Encoding EncodingParams::subtitles_encoding() const
|
||||
{
|
||||
return subtitles_encoding_;
|
||||
}
|
||||
|
||||
ExportCodec::Codec EncodingParams::subtitles_codec() const
|
||||
{
|
||||
return subtitles_codec_;
|
||||
|
||||
+1
-3
@@ -49,7 +49,7 @@ public:
|
||||
|
||||
void EnableVideo(const VideoParams& video_params, const ExportCodec::Codec& vcodec);
|
||||
void EnableAudio(const AudioParams& audio_params, const ExportCodec::Codec &acodec);
|
||||
void EnableSubtitles(const SubtitleParams::Encoding &encoding, const ExportCodec::Codec &scodec);
|
||||
void EnableSubtitles(const ExportCodec::Codec &scodec);
|
||||
|
||||
void set_video_option(const QString& key, const QString& value);
|
||||
void set_video_bit_rate(const int64_t& rate);
|
||||
@@ -95,7 +95,6 @@ public:
|
||||
}
|
||||
|
||||
bool subtitles_enabled() const;
|
||||
SubtitleParams::Encoding subtitles_encoding() const;
|
||||
ExportCodec::Codec subtitles_codec() const;
|
||||
|
||||
const rational& GetExportLength() const;
|
||||
@@ -125,7 +124,6 @@ private:
|
||||
|
||||
bool subtitles_enabled_;
|
||||
ExportCodec::Codec subtitles_codec_;
|
||||
SubtitleParams::Encoding subtitles_encoding_;
|
||||
|
||||
rational export_length_;
|
||||
|
||||
|
||||
@@ -97,31 +97,4 @@ bool ExportCodec::IsCodecAStillImage(ExportCodec::Codec c)
|
||||
return false;
|
||||
}
|
||||
|
||||
SubtitleParams::Encoding ExportCodec::GetDefaultSubtitleEncoding(Codec c)
|
||||
{
|
||||
switch (c) {
|
||||
case kCodecSRT:
|
||||
return SubtitleParams::kWindows1252;
|
||||
case kCodecDNxHD:
|
||||
case kCodecH264:
|
||||
case kCodecH265:
|
||||
case kCodecProRes:
|
||||
case kCodecMP2:
|
||||
case kCodecMP3:
|
||||
case kCodecAAC:
|
||||
case kCodecPCM:
|
||||
case kCodecVorbis:
|
||||
case kCodecOpus:
|
||||
case kCodecFLAC:
|
||||
case kCodecVP9:
|
||||
case kCodecOpenEXR:
|
||||
case kCodecPNG:
|
||||
case kCodecTIFF:
|
||||
case kCodecCount:
|
||||
break;
|
||||
}
|
||||
|
||||
return SubtitleParams::kEncodingInvalid;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -63,8 +63,6 @@ public:
|
||||
|
||||
static bool IsCodecAStillImage(Codec c);
|
||||
|
||||
static SubtitleParams::Encoding GetDefaultSubtitleEncoding(Codec c);
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user