oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switched global to unique ptr and renamed olive namespace

Browse Source
This commit is contained in:
itsmattkc
2019-02-16 15:08:33 -08:00
parent 3d0a65c70d
commit e063a5ba8f
65 changed files with 860 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/exportthread.cpp
+15 -15
View File
@@ -183,15 +183,15 @@ bool ExportThread::setupVideo() {
video_frame = av_frame_alloc();
av_frame_make_writable(video_frame);
video_frame->format = AV_PIX_FMT_RGBA;
video_frame->width = Olive::ActiveSequence->width;
video_frame->height = Olive::ActiveSequence->height;
video_frame->width = olive::ActiveSequence->width;
video_frame->height = olive::ActiveSequence->height;
av_frame_get_buffer(video_frame, 0);
av_init_packet(&video_pkt);
sws_ctx = sws_getContext(
Olive::ActiveSequence->width,
Olive::ActiveSequence->height,
olive::ActiveSequence->width,
olive::ActiveSequence->height,
AV_PIX_FMT_RGBA,
params.video_width,
params.video_height,
@@ -274,9 +274,9 @@ bool ExportThread::setupAudio() {
acodec_ctx->channel_layout,
acodec_ctx->sample_fmt,
acodec_ctx->sample_rate,
Olive::ActiveSequence->audio_layout,
olive::ActiveSequence->audio_layout,
AV_SAMPLE_FMT_S16,
Olive::ActiveSequence->audio_frequency,
olive::ActiveSequence->audio_frequency,
0,
nullptr
);
@@ -284,7 +284,7 @@ bool ExportThread::setupAudio() {
// initialize raw audio frame
audio_frame = av_frame_alloc();
audio_frame->sample_rate = Olive::ActiveSequence->audio_frequency;
audio_frame->sample_rate = olive::ActiveSequence->audio_frequency;
audio_frame->nb_samples = acodec_ctx->frame_size;
if (audio_frame->nb_samples == 0) audio_frame->nb_samples = 256; // should possibly be smaller?
audio_frame->format = AV_SAMPLE_FMT_S16;
@@ -366,16 +366,16 @@ void ExportThread::run() {
mutex.lock();
while (Olive::ActiveSequence->playhead <= params.end_frame && continueEncode) {
while (olive::ActiveSequence->playhead <= params.end_frame && continueEncode) {
start_time = QDateTime::currentMSecsSinceEpoch();
if (params.audio_enabled) {
compose_audio(nullptr, Olive::ActiveSequence, 1);
compose_audio(nullptr, olive::ActiveSequence, 1);
}
if (params.video_enabled) {
do {
// TODO optimize by rendering the next frame while encoding the last
renderer->start_render(nullptr, Olive::ActiveSequence, nullptr, video_frame->data[0], video_frame->linesize[0]/4);
renderer->start_render(nullptr, olive::ActiveSequence, nullptr, video_frame->data[0], video_frame->linesize[0]/4);
waitCond.wait(&mutex);
if (!continueEncode) break;
} while (renderer->did_texture_fail());
@@ -383,7 +383,7 @@ void ExportThread::run() {
}
// encode last frame while rendering next frame
double timecode_secs = double(Olive::ActiveSequence->playhead - params.start_frame) / Olive::ActiveSequence->frame_rate;
double timecode_secs = double(olive::ActiveSequence->playhead - params.start_frame) / olive::ActiveSequence->frame_rate;
if (params.video_enabled) {
// create sws_frame for converting pixel format
@@ -444,12 +444,12 @@ void ExportThread::run() {
// generating encoding statistics (time it took to encode this frame/estimated remaining time)
frame_time = (QDateTime::currentMSecsSinceEpoch()-start_time);
total_time += frame_time;
remaining_frames = (params.end_frame - Olive::ActiveSequence->playhead);
remaining_frames = (params.end_frame - olive::ActiveSequence->playhead);
avg_time = (total_time/frame_count);
eta = (remaining_frames*avg_time);
emit progress_changed(qRound((double(Olive::ActiveSequence->playhead - params.start_frame) / double(params.end_frame - params.start_frame)) * 100.0), eta);
Olive::ActiveSequence->playhead++;
emit progress_changed(qRound((double(olive::ActiveSequence->playhead - params.start_frame) / double(params.end_frame - params.start_frame)) * 100.0), eta);
olive::ActiveSequence->playhead++;
frame_count++;
}
@@ -463,7 +463,7 @@ void ExportThread::run() {
if (params.audio_enabled) apkt_alloc = true;
}
Olive::Global.data()->set_rendering_state(false);
olive::Global->set_rendering_state(false);
if (params.audio_enabled && continueEncode) {
// flush swresample