fixed various audio exporting bugs

rendering/audio.cpp

@@ -50,9 +50,11 @@ bool audio_scrub = false;
 QMutex audio_write_lock;
 QAudioInput* audio_input = nullptr;
 QFile output_recording;
-bool audio_rendering = false;
 bool recording = false;
 
+bool audio_rendering = false;
+int audio_rendering_rate = 0;
+
 qint8 audio_ibuffer[audio_ibuffer_size];
 qint64 audio_ibuffer_read = 0;
 long audio_ibuffer_frame = 0;
@@ -152,7 +154,7 @@ void clear_audio_ibuffer() {
 }
 
 int current_audio_freq() {
-  return audio_rendering ? olive::ActiveSequence->audio_frequency : audio_output->format().sampleRate();
+  return audio_rendering ? audio_rendering_rate : audio_output->format().sampleRate();
 }
 
 qint64 get_buffer_offset_from_frame(double framerate, long frame) {

rendering/audio.h

@@ -32,19 +32,19 @@
 #include "project/sequence.h"
 
 class AudioSenderThread : public QThread {
-	Q_OBJECT
+  Q_OBJECT
 public:
-	AudioSenderThread();
-	void run();
-	void stop();
-	QWaitCondition cond;
-	bool close;
-	QMutex lock;
+  AudioSenderThread();
+  void run();
+  void stop();
+  QWaitCondition cond;
+  bool close;
+  QMutex lock;
 public slots:
-	void notifyReceiver();
+  void notifyReceiver();
 private:
-	QVector<qint16> samples;
-	int send_audio_to_output(qint64 offset, int max);
+  QVector<qint16> samples;
+  int send_audio_to_output(qint64 offset, int max);
 };
 
 double log_volume(double linear);
@@ -62,6 +62,7 @@ extern double audio_ibuffer_timecode;
 extern bool audio_scrub;
 extern bool recording;
 extern bool audio_rendering;
+extern int audio_rendering_rate;
 void clear_audio_ibuffer();
 
 int current_audio_freq();

rendering/cacher.cpp

@@ -180,6 +180,7 @@ void Cacher::CacheAudioWorker() {
       // retrieve frame
       bool new_frame = false;
       while ((frame_sample_index_ == -1 || frame_sample_index_ >= nb_bytes) && nb_bytes > 0) {
+
         // no more audio left in frame, get a new one
         if (!reached_end) {
           int loop = 0;
@@ -187,7 +188,8 @@ void Cacher::CacheAudioWorker() {
           if (reverse_audio && !audio_just_reset) {
             avcodec_flush_buffers(codecCtx);
             reached_end = false;
-            int64_t backtrack_seek = qMax(reverse_target_ - static_cast<int64_t>(av_q2d(av_inv_q(stream->time_base))), static_cast<int64_t>(0));
+            int64_t backtrack_seek = qMax(reverse_target_ - static_cast<int64_t>(av_q2d(av_inv_q(stream->time_base))),
+                                          static_cast<int64_t>(0));
             av_seek_frame(formatCtx, stream->index, backtrack_seek, AVSEEK_FLAG_BACKWARD);
 #ifdef AUDIOWARNINGS
             if (backtrack_seek == 0) {
@@ -339,7 +341,10 @@ void Cacher::CacheAudioWorker() {
         if (audio_just_reset) {
           // get precise sample offset for the elected clip_in from this audio frame
           double target_sts = playhead_to_clip_seconds(clip, audio_target_frame);
-          double frame_sts = ((frame->pts - stream->start_time) * timebase);
+
+          int64_t stream_start = qMax(static_cast<int64_t>(0), stream->start_time);
+          double frame_sts = ((frame->pts - stream_start) * timebase);
+
           int nb_samples = qRound64((target_sts - frame_sts)*current_audio_freq());
           frame_sample_index_ = nb_samples * 4;
 #ifdef AUDIOWARNINGS
@@ -387,10 +392,6 @@ void Cacher::CacheAudioWorker() {
       if (new_frame) {
         apply_audio_effects(clip, bytes_to_seconds(audio_buffer_write, 2, current_audio_freq()) + audio_ibuffer_timecode + ((double)clip->clip_in(true)/clip->sequence->frame_rate) - ((double)timeline_in/last_fr), frame, nb_bytes, nests_);
       }
-    } else {
-      // shouldn't ever get here
-      qCritical() << "Tried to cache a non-footage/tone clip";
-      return;
     }
 
     // mix audio into internal buffer
@@ -957,7 +958,7 @@ void Cacher::OpenWorker() {
 
       // set up cache
       queue_.append(av_frame_alloc());
-      //			if (clip->reverse) {
+
       if (true) {
         AVFrame* reverse_frame = av_frame_alloc();