Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
LibAVQt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Silas Della Contrada
LibAVQt
Commits
db6c7596
Commit
db6c7596
authored
4 years ago
by
Silas Della Contrada
Browse files
Options
Downloads
Patches
Plain Diff
Fixed another error
parent
5430c83e
No related branches found
Branches containing commit
No related tags found
1 merge request
!3
Finished MMAL decoder
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.idea/misc.xml
+5
-0
5 additions, 0 deletions
.idea/misc.xml
AVQt/filter/DecoderVAAPI.cpp
+1
-15
1 addition, 15 deletions
AVQt/filter/DecoderVAAPI.cpp
AVQt/filter/EncoderVAAPI.cpp
+6
-3
6 additions, 3 deletions
AVQt/filter/EncoderVAAPI.cpp
Player/main.cpp
+13
-12
13 additions, 12 deletions
Player/main.cpp
with
25 additions
and
30 deletions
.idea/misc.xml
+
5
−
0
View file @
db6c7596
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"CMakeWorkspace"
PROJECT_DIR=
"$PROJECT_DIR$"
/>
<component
name=
"CidrRootsConfiguration"
>
<excludeRoots>
<file
path=
"$PROJECT_DIR$/build-qt59"
/>
</excludeRoots>
</component>
<component
name=
"ProjectPlainTextFileTypeManager"
>
<file
url=
"file://$PROJECT_DIR$/AVQt/mainpage.dox"
/>
</component>
...
...
This diff is collapsed.
Click to expand it.
AVQt/filter/DecoderVAAPI.cpp
+
1
−
15
View file @
db6c7596
...
...
@@ -284,20 +284,6 @@ namespace AVQt {
for
(
const
auto
&
cb
:
d
->
m_cbList
)
{
// cbFutures.append(QtConcurrent::run([=] {
AVFrame
*
cbFrame
=
av_frame_clone
(
frame
);
cbFrame
->
pts
=
av_rescale_q
(
frame
->
pts
,
d
->
m_timebase
,
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
,
AVFrame
*
cbFrame
=
av_frame_clone
(
frame
);
cbFrame
->
pts
=
av_rescale_q
(
frame
->
pts
,
d
->
m_timebase
,
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
,
d
->
m_timebase
.
den
);
QTime
time
=
QTime
::
currentTime
();
cb
->
onFrame
(
this
,
cbFrame
,
static_cast
<
int64_t
>
(
av_q2d
(
av_inv_q
(
d
->
m_framerate
))
*
1000.0
));
qDebug
()
<<
"Video CB time:"
<<
time
.
msecsTo
(
QTime
::
currentTime
());
av_frame_unref
(
cbFrame
);
av_frame_free
(
&
cbFrame
);
AVFrame
*
cbFrame
=
av_frame_clone
(
frame
);
cbFrame
->
pts
=
av_rescale_q
(
frame
->
pts
,
d
->
m_timebase
,
av_make_q
(
1
,
1000000
));
// Rescale pts to microseconds for easier processing
qDebug
(
"Calling video frame callback for PTS: %lld, Timebase: %d/%d"
,
cbFrame
->
pts
,
d
->
m_timebase
.
num
,
...
...
@@ -332,4 +318,4 @@ namespace AVQt {
}
}
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
AVQt/filter/EncoderVAAPI.cpp
+
6
−
3
View file @
db6c7596
...
...
@@ -318,7 +318,7 @@ namespace AVQt {
cb
->
start
(
this
);
}
}
while
(
!
d
->
m_inputQueue
.
isEmpty
())
{
if
(
!
d
->
m_inputQueue
.
isEmpty
())
{
QPair
<
AVFrame
*
,
int64_t
>
frame
;
{
QMutexLocker
lock
(
&
d
->
m_inputQueueMutex
);
...
...
@@ -339,12 +339,14 @@ namespace AVQt {
AVPacket
*
packet
=
av_packet_alloc
();
while
(
true
)
{
ret
=
avcodec_receive_packet
(
d
->
m_pCodecCtx
,
packet
);
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
);
if
(
ret
==
AVERROR_EOF
||
ret
==
AVERROR
(
EAGAIN
))
{
break
;
}
else
if
(
ret
<
0
)
{
}
else
if
(
ret
!=
0
)
{
qFatal
(
"%i: Could not receive packet from encoder: %s"
,
ret
,
av_make_error_string
(
strBuf
,
strBufSize
,
ret
));
}
{
if
(
packet
->
buf
)
{
QMutexLocker
lock
(
&
d
->
m_cbListMutex
);
for
(
const
auto
&
cb
:
d
->
m_cbList
)
{
AVPacket
*
cbPacket
=
av_packet_clone
(
packet
);
...
...
@@ -352,6 +354,7 @@ namespace AVQt {
av_packet_free
(
&
cbPacket
);
}
}
av_packet_unref
(
packet
);
}
}
else
{
msleep
(
1
);
...
...
This diff is collapsed.
Click to expand it.
Player/main.cpp
+
13
−
12
View file @
db6c7596
...
...
@@ -4,6 +4,7 @@
#include
<QFileDialog>
#include
<csignal>
#include
<iostream>
#include
<qglobal.h>
constexpr
auto
LOGFILE_LOCATION
=
"libAVQt.log"
;
...
...
@@ -59,11 +60,11 @@ int main(int argc, char *argv[]) {
inputFile
->
open
(
QIODevice
::
ReadOnly
);
AVQt
::
Demuxer
demuxer
(
inputFile
);
AVQt
::
AudioDecoder
decoder
;
AVQt
::
OpenALAudioOutput
output
;
//
AVQt::AudioDecoder decoder;
//
AVQt::OpenALAudioOutput output;
demuxer
.
registerCallback
(
&
decoder
,
AVQt
::
IPacketSource
::
CB_AUDIO
);
decoder
.
registerCallback
(
&
output
);
//
demuxer.registerCallback(&decoder, AVQt::IPacketSource::CB_AUDIO);
//
decoder.registerCallback(&output);
AVQt
::
IDecoder
*
videoDecoder
;
#ifdef Q_OS_LINUX
...
...
@@ -73,21 +74,21 @@ int main(int argc, char *argv[]) {
#else
#error "Unsupported OS"
#endif
AVQt
::
OpenGLRenderer
renderer
;
//
AVQt::OpenGLRenderer renderer;
//
AVQt::IEncoder *encoder = new AVQt::EncoderVAAPI("hevc_vaapi");
AVQt
::
IEncoder
*
encoder
=
new
AVQt
::
EncoderVAAPI
(
"hevc_vaapi"
);
demuxer
.
registerCallback
(
videoDecoder
,
AVQt
::
IPacketSource
::
CB_VIDEO
);
//
videoDecoder->registerCallback(encoder);
videoDecoder
->
registerCallback
(
encoder
);
QFile
outputFile
(
"output.ts"
);
outputFile
.
open
(
QIODevice
::
ReadWrite
|
QIODevice
::
Truncate
);
AVQt
::
Muxer
muxer
(
&
outputFile
);
//
encoder->registerCallback(&muxer, AVQt::IPacketSource::CB_VIDEO);
videoDecoder
->
registerCallback
(
&
renderer
);
encoder
->
registerCallback
(
&
muxer
,
AVQt
::
IPacketSource
::
CB_VIDEO
);
//
videoDecoder->registerCallback(&renderer);
renderer
.
setMinimumSize
(
QSize
(
360
,
240
));
//
renderer.setMinimumSize(QSize(360, 240));
// QObject::connect(&renderer, &AVQt::OpenGLRenderer::paused, [&](bool paused) {
// output.pause(nullptr, paused);
...
...
@@ -98,7 +99,7 @@ int main(int argc, char *argv[]) {
demuxer
.
init
();
output
.
syncToOutput
(
&
renderer
);
//
output.syncToOutput(&renderer);
demuxer
.
start
();
...
...
@@ -109,4 +110,4 @@ int main(int argc, char *argv[]) {
});
return
QApplication
::
exec
();
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment