This commit is contained in:
itsmattkc
2018-07-19 11:39:37 +01:00
parent a0d97bbb2e
commit 48b1c21d6c
8 changed files with 708 additions and 621 deletions
+3
View File
@@ -15,7 +15,10 @@ struct MediaStream {
int video_width;
int video_height;
bool infinite_length;
double video_frame_rate;
int audio_channels;
int audio_layout;
int audio_frequency;
// preview thumbnail/waveform
bool preview_done;
+3
View File
@@ -35,10 +35,13 @@ void PreviewGenerator::parse_media() {
bool infinite_length = (fmt_ctx->streams[i]->avg_frame_rate.den == 0);
ms->video_width = fmt_ctx->streams[i]->codecpar->width;
ms->video_height = fmt_ctx->streams[i]->codecpar->height;
ms->video_frame_rate = (infinite_length) ? 0 : av_q2d(fmt_ctx->streams[i]->avg_frame_rate);
ms->infinite_length = infinite_length;
media->video_tracks.append(ms);
} else if (fmt_ctx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
ms->audio_channels = fmt_ctx->streams[i]->codecpar->channels;
ms->audio_layout = fmt_ctx->streams[i]->codecpar->channel_layout;
ms->audio_frequency = fmt_ctx->streams[i]->codecpar->sample_rate;
media->audio_tracks.append(ms);
}
}
+1 -1
View File
@@ -110,7 +110,7 @@ MainWindow::MainWindow(QWidget *parent) :
panel_project->load_project();
}
}
autorecovery_timer.setInterval(10000);
autorecovery_timer.setInterval(60000);
QObject::connect(&autorecovery_timer, SIGNAL(timeout()), this, SLOT(autorecover_interval()));
autorecovery_timer.start();
+1 -1
View File
@@ -215,7 +215,7 @@
<string>&amp;Redo</string>
</property>
<property name="shortcut">
<string>Ctrl+Y</string>
<string>Ctrl+Shift+Z, Ctrl+Y</string>
</property>
</action>
<action name="actionCu_t">
+2 -2
View File
@@ -214,8 +214,8 @@ void Timeline::update_sequence() {
ui->pushButton_4->setEnabled(!null_sequence);
ui->pushButton_5->setEnabled(!null_sequence);
ui->headers->setEnabled(!null_sequence);
ui->video_area->setEnabled(!null_sequence);
ui->audio_area->setEnabled(!null_sequence);
// ui->video_area->setEnabled(!null_sequence);
// ui->audio_area->setEnabled(!null_sequence);
if (null_sequence) {
setWindowTitle("Timeline: <none>");
+1 -1
View File
@@ -20,7 +20,7 @@ public:
long getEndFrame();
int width;
int height;
float frame_rate;
double frame_rate;
int audio_frequency;
int audio_layout;
private:
+691 -616
View File
File diff suppressed because it is too large Load Diff
+6
View File
@@ -57,6 +57,12 @@ private:
QPixmap clip_pixmap;
// QPixmap selection_pixmap;
int predicted_video_width;
int predicted_video_height;
double predicted_new_frame_rate;
int predicted_audio_freq;
int predicted_audio_layout;
signals:
public slots: