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

ffmpeg: bypass ass encoding for srt

Browse Source 
Fixes #1927
This commit is contained in:
itsmattkc
2022-05-14 08:56:06 -07:00
parent fb72ca4997
commit c75ee6014c
3 changed files with 26 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/ffmpeg/ffmpegdecoder.cpp
+20 -40
View File
@@ -425,34 +425,13 @@ FootageDescription FFmpegDecoder::Probe(const QString &filename, const QAtomicIn
Instance instance;
instance.Open(filename_c, avstream->index);
//qDebug() << instance.GetSubtitleHeader();
while (instance.GetPacket(pkt) >= 0) {
TimeRange time(Timecode::timestamp_to_time(pkt->pts, avstream->time_base),
Timecode::timestamp_to_time(pkt->pts + pkt->duration, avstream->time_base));
AVSubtitle avsub;
while (instance.GetSubtitle(pkt, &avsub) >= 0) {
for (unsigned int j=0; j<avsub.num_rects; j++) {
QString ass = avsub.rects[j]->ass;
QString text = QString::fromUtf8((const char *) pkt->data, pkt->size);
int comma = 0;
for (int k=0; k<ass.size(); k++) {
if (ass.at(k) == ',') {
comma++;
}
// HARDCODED: I think FFmpeg always puts the text of SRTs in the 8th section
if (comma == 8) {
ass = ass.mid(k+1);
break;
}
}
ass.replace(QStringLiteral("\\n"), QStringLiteral("\n"), Qt::CaseInsensitive);
TimeRange time(Timecode::timestamp_to_time(pkt->pts, avstream->time_base),
Timecode::timestamp_to_time(pkt->pts + pkt->duration, avstream->time_base));
sub.push_back(Subtitle(time, ass));
}
avsubtitle_free(&avsub);
sub.push_back(Subtitle(time, text));
}
instance.Close();
@@ -1132,13 +1111,7 @@ int FFmpegDecoder::Instance::GetFrame(AVPacket *pkt, AVFrame *frame)
while ((ret = avcodec_receive_frame(codec_ctx_, frame)) == AVERROR(EAGAIN) && !eof) {
// Find next packet in the correct stream index
do {
// Free buffer in packet if there is one
av_packet_unref(pkt);
// Read packet from file
ret = av_read_frame(fmt_ctx_, pkt);
} while (pkt->stream_index != avstream_->index && ret >= 0);
ret = GetPacket(pkt);
if (ret == AVERROR_EOF) {
// Don't break so that receive gets called again, but don't try to read again
@@ -1172,13 +1145,7 @@ const char *FFmpegDecoder::Instance::GetSubtitleHeader() const
int FFmpegDecoder::Instance::GetSubtitle(AVPacket *pkt, AVSubtitle *sub)
{
int ret;
do {
av_packet_unref(pkt);
ret = av_read_frame(fmt_ctx_, pkt);
} while (pkt->stream_index != avstream_->index && ret >= 0);
int ret = GetPacket(pkt);
if (ret >= 0) {
int got_sub;
@@ -1191,6 +1158,19 @@ int FFmpegDecoder::Instance::GetSubtitle(AVPacket *pkt, AVSubtitle *sub)
return ret;
}
int FFmpegDecoder::Instance::GetPacket(AVPacket *pkt)
{
int ret;
do {
av_packet_unref(pkt);
ret = av_read_frame(fmt_ctx_, pkt);
} while (pkt->stream_index != avstream_->index && ret >= 0);
return ret;
}
void FFmpegDecoder::Instance::Seek(int64_t timestamp)
{
avcodec_flush_buffers(codec_ctx_);