Skip to content
Snippets Groups Projects
Commit 2a3211cc authored by Silas Della Contrada's avatar Silas Della Contrada
Browse files

Merge branch 'qt-legacy-pi' of ssh://edugit.org/sdcieo0330/libAVQt into qt-legacy-pi

parents 3a385bef db6c7596
Branches qt-legacy-pi
No related tags found
No related merge requests found
...@@ -286,7 +286,7 @@ namespace AVQt { ...@@ -286,7 +286,7 @@ namespace AVQt {
AVFrame *cbFrame = av_frame_clone(frame); AVFrame *cbFrame = av_frame_clone(frame);
cbFrame->pts = av_rescale_q(frame->pts, d->m_timebase, cbFrame->pts = av_rescale_q(frame->pts, d->m_timebase,
av_make_q(1, 1000000)); // Rescale pts to microseconds for easier processing av_make_q(1, 1000000)); // Rescale pts to microseconds for easier processing
qDebug("Calling video frame callback for PTS: %ld, Timebase: %d/%d", cbFrame->pts, d->m_timebase.num, qDebug("Calling video frame callback for PTS: %lld, Timebase: %d/%d", cbFrame->pts, d->m_timebase.num,
d->m_timebase.den); d->m_timebase.den);
QTime time = QTime::currentTime(); QTime time = QTime::currentTime();
cb->onFrame(this, cbFrame, static_cast<int64_t>(av_q2d(av_inv_q(d->m_framerate)) * 1000.0)); cb->onFrame(this, cbFrame, static_cast<int64_t>(av_q2d(av_inv_q(d->m_framerate)) * 1000.0));
...@@ -318,4 +318,4 @@ namespace AVQt { ...@@ -318,4 +318,4 @@ namespace AVQt {
} }
} }
} }
} }
\ No newline at end of file
...@@ -339,7 +339,7 @@ namespace AVQt { ...@@ -339,7 +339,7 @@ namespace AVQt {
AVPacket *packet = av_packet_alloc(); AVPacket *packet = av_packet_alloc();
while (true) { while (true) {
ret = avcodec_receive_packet(d->m_pCodecCtx, packet); ret = avcodec_receive_packet(d->m_pCodecCtx, packet);
qDebug("[AVQt::EncoderVAAPI] Got packet from encoder with PTS: %ld, timebase: %d/%d", packet->pts, qDebug("[AVQt::EncoderVAAPI] Got packet from encoder with PTS: %lld, timebase: %d/%d", packet->pts,
d->m_pCodecCtx->time_base.num, d->m_pCodecCtx->time_base.den); d->m_pCodecCtx->time_base.num, d->m_pCodecCtx->time_base.den);
if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN)) { if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN)) {
break; break;
...@@ -370,4 +370,4 @@ namespace AVQt { ...@@ -370,4 +370,4 @@ namespace AVQt {
return *this; return *this;
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment