openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Reverting video_timestamp increment logic which used pkt.duration. In some codecs (such as vp8), this approach breaks due to differences in the timebase vs the framerate. For example, if the timebase is an inverse of the FPS, everything works. But if the timebase is not, for example 1/1000000, this approach breaks.

Browse Source
This commit is contained in:
Jonathan Thomas
2021-07-03 17:01:55 -05:00
parent 0f2f2e1514
commit 9ca63b321a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/FFmpegWriter.cpp
View File

@@ -947,7 +947,7 @@ void FFmpegWriter::flush_encoders() {
// Increment PTS by duration of packet
audio_timestamp += pkt.duration;
// deallocate memory for packet
// deallocate memory for packet
AV_FREE_PACKET(&pkt);
}
}
@@ -1885,8 +1885,8 @@ void FFmpegWriter::write_audio_packets(bool is_final) {
ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::write_audio_packets ERROR [" + (std::string) av_err2str(error_code) + "]", "error_code", error_code);
}
// Increment PTS by duration of packet
audio_timestamp += pkt.duration;
// Increment PTS (no pkt.duration, so calculate with maths)
audio_timestamp += FFMIN(audio_input_frame_size, audio_input_position);
// deallocate AVFrame
av_freep(&(frame_final->data[0]));
@@ -2134,9 +2134,6 @@ bool FFmpegWriter::write_video_packet(std::shared_ptr<Frame> frame, AVFrame *fra
}
}
// Increment PTS (in frames and scaled to the codec's timebase)
video_timestamp += pkt.duration;
// Deallocate packet
AV_FREE_PACKET(&pkt);
#if USE_HW_ACCEL
@@ -2149,6 +2146,9 @@ bool FFmpegWriter::write_video_packet(std::shared_ptr<Frame> frame, AVFrame *fra
#endif // USE_HW_ACCEL
}
// Increment PTS (in frames and scaled to the codec's timebase)
video_timestamp += av_rescale_q(1, av_make_q(info.fps.den, info.fps.num), video_codec_ctx->time_base);
// Success
return true;
}