export: implemented audio bit rate setting

The UI for this isn't perfect, I just wrote this in because I needed it. But the backend is solid.
This commit is contained in:
itsmattkc
2020-12-04 01:01:50 +11:00
parent 7dd9115e3f
commit 0699795c6f
6 changed files with 45 additions and 6 deletions
+2 -1
View File
@@ -48,7 +48,8 @@ EncodingParams::EncodingParams() :
video_max_bit_rate_(0),
video_buffer_size_(0),
video_threads_(0),
audio_enabled_(false)
audio_enabled_(false),
audio_bit_rate_(0)
{
}
+11
View File
@@ -69,6 +69,16 @@ public:
const ExportCodec::Codec &audio_codec() const;
const AudioParams& audio_params() const;
const int64_t& audio_bit_rate() const
{
return audio_bit_rate_;
}
void set_audio_bit_rate(const int64_t& b)
{
audio_bit_rate_ = b;
}
const rational& GetExportLength() const;
void SetExportLength(const rational& GetExportLength);
@@ -90,6 +100,7 @@ private:
bool audio_enabled_;
ExportCodec::Codec audio_codec_;
AudioParams audio_params_;
int64_t audio_bit_rate_;
rational export_length_;
+12 -5
View File
@@ -500,7 +500,7 @@ bool FFmpegEncoder::InitializeStream(AVMediaType type, AVStream** stream_ptr, AV
if (codec_id == AV_CODEC_ID_H264) {
// For some reason, FFmpeg doesn't set libx264's bff flag so we have to do it ourselves
av_opt_set(video_codec_ctx_->priv_data, "x264opts", "bff=1", AV_OPT_SEARCH_CHILDREN);
av_opt_set(codec_ctx->priv_data, "x264opts", "bff=1", AV_OPT_SEARCH_CHILDREN);
}
}
}
@@ -510,28 +510,35 @@ bool FFmpegEncoder::InitializeStream(AVMediaType type, AVStream** stream_ptr, AV
QHash<QString, QString>::const_iterator i;
for (i=params().video_opts().begin();i!=params().video_opts().end();i++) {
av_opt_set(video_codec_ctx_->priv_data, i.key().toUtf8(), i.value().toUtf8(), AV_OPT_SEARCH_CHILDREN);
av_opt_set(codec_ctx->priv_data, i.key().toUtf8(), i.value().toUtf8(), AV_OPT_SEARCH_CHILDREN);
}
if (params().video_bit_rate() > 0) {
video_codec_ctx_->bit_rate = params().video_bit_rate();
codec_ctx->bit_rate = params().video_bit_rate();
}
if (params().video_max_bit_rate() > 0) {
video_codec_ctx_->rc_max_rate = params().video_max_bit_rate();
codec_ctx->rc_max_rate = params().video_max_bit_rate();
}
if (params().video_buffer_size() > 0) {
video_codec_ctx_->rc_buffer_size = static_cast<int>(params().video_buffer_size());
codec_ctx->rc_buffer_size = static_cast<int>(params().video_buffer_size());
}
}
} else {
// Assume audio stream
codec_ctx->sample_rate = params().audio_params().sample_rate();
codec_ctx->channel_layout = params().audio_params().channel_layout();
codec_ctx->channels = av_get_channel_layout_nb_channels(codec_ctx->channel_layout);
codec_ctx->sample_fmt = encoder->sample_fmts[0];
codec_ctx->time_base = {1, codec_ctx->sample_rate};
if (params().audio_bit_rate() > 0) {
codec_ctx->bit_rate = params().audio_bit_rate();
}
}
if (!SetupCodecContext(stream, codec_ctx, encoder)) {