From 7871fda97bb4a687a208eb945317f23ffabe5658 Mon Sep 17 00:00:00 2001 From: Nicolas Pope <nwpope@utu.fi> Date: Sat, 16 May 2020 14:51:28 +0300 Subject: [PATCH] Mkv with correct framerate --- applications/ftl2mkv/src/main.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/applications/ftl2mkv/src/main.cpp b/applications/ftl2mkv/src/main.cpp index 796ee277a..0ebf1a0bf 100644 --- a/applications/ftl2mkv/src/main.cpp +++ b/applications/ftl2mkv/src/main.cpp @@ -41,8 +41,8 @@ static AVStream *add_video_stream(AVFormatContext *oc, const ftl::codecs::Packet //c->codec_id = codec_id; //c->codec_type = AVMEDIA_TYPE_VIDEO; - st->time_base.den = 20; - st->time_base.num = 1; + //st->time_base.den = 20; + //st->time_base.num = 1; //st->id = oc->nb_streams-1; //st->nb_frames = 0; st->codecpar->codec_id = codec_id; @@ -144,9 +144,11 @@ int main(int argc, char **argv) { //bool stream_added[10] = {false}; + int64_t first_ts = 10000000000000ll; + // TODO: In future, find a better way to discover number of streams... // Read entire file to find all streams before reading again to write data - bool res = r.read(90000000000000, [¤t_stream,¤t_channel,&r,&video_st,oc](const ftl::codecs::StreamPacket &spkt, const ftl::codecs::Packet &pkt) { + bool res = r.read(90000000000000, [&first_ts,¤t_stream,¤t_channel,&r,&video_st,oc](const ftl::codecs::StreamPacket &spkt, const ftl::codecs::Packet &pkt) { if (spkt.channel != static_cast<ftl::codecs::Channel>(current_channel) && current_channel != -1) return; if (spkt.frame_number == current_stream || current_stream == 255) { @@ -156,6 +158,8 @@ int main(int argc, char **argv) { if (spkt.frame_number >= 10) return; // TODO: Allow for more than 10 + if (spkt.timestamp < first_ts) first_ts = spkt.timestamp; + if (video_st[spkt.frame_number][(spkt.channel == Channel::Left) ? 0 : 1] == nullptr) { video_st[spkt.frame_number][(spkt.channel == Channel::Left) ? 0 : 1] = add_video_stream(oc, pkt); } @@ -180,10 +184,7 @@ int main(int argc, char **argv) { bool seen_key[10] = {false}; - int64_t last_ts = 0; - int64_t framecount = -1; - - res = r.read(90000000000000, [&last_ts,&framecount,¤t_stream,¤t_channel,&r,&video_st,oc,&seen_key](const ftl::codecs::StreamPacket &spkt, const ftl::codecs::Packet &pkt) { + res = r.read(90000000000000, [first_ts,¤t_stream,¤t_channel,&r,&video_st,oc,&seen_key](const ftl::codecs::StreamPacket &spkt, const ftl::codecs::Packet &pkt) { if (spkt.channel != static_cast<ftl::codecs::Channel>(current_channel) && current_channel != -1) return; if (spkt.frame_number == current_stream || current_stream == 255) { @@ -209,13 +210,14 @@ int main(int argc, char **argv) { } if (!seen_key[spkt.frame_number]) return; - if (spkt.timestamp > last_ts) framecount++; - last_ts = spkt.timestamp; + //if (spkt.timestamp > last_ts) framecount++; + //last_ts = spkt.timestamp; AVPacket avpkt; av_init_packet(&avpkt); if (keyframe) avpkt.flags |= AV_PKT_FLAG_KEY; - avpkt.pts = framecount*50; //spkt.timestamp - r.getStartTime(); + //avpkt.pts = framecount*50; //spkt.timestamp - r.getStartTime(); + avpkt.pts = spkt.timestamp - first_ts; avpkt.dts = avpkt.pts; avpkt.stream_index= video_st[spkt.frame_number][(spkt.channel == Channel::Left) ? 0 : 1]->index; avpkt.data= const_cast<uint8_t*>(pkt.data.data()); -- GitLab