Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
audiowmark
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
audiowmark
Commits
2b4dc580
Commit
2b4dc580
authored
Aug 30, 2022
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HLS: fix ffmpeg deprecation warning: avoid using av_init_packet()
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
6ac0da13
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
hlsoutputstream.cc
src/hlsoutputstream.cc
+7
-5
hlsoutputstream.hh
src/hlsoutputstream.hh
+1
-0
No files found.
src/hlsoutputstream.cc
View file @
2b4dc580
...
...
@@ -197,6 +197,10 @@ HLSOutputStream::open_audio (const AVCodec *codec, AVDictionary *opt_arg)
if
(
err
)
return
err
;
m_tmp_pkt
=
av_packet_alloc
();
if
(
!
m_tmp_pkt
)
return
Error
(
"could not allocate AVPacket"
);
/* copy the stream parameters to the muxer */
ret
=
avcodec_parameters_from_context
(
m_st
->
codecpar
,
m_enc
);
if
(
ret
<
0
)
...
...
@@ -261,12 +265,9 @@ HLSOutputStream::write_frame (const AVRational *time_base, AVStream *st, AVPacke
HLSOutputStream
::
EncResult
HLSOutputStream
::
write_audio_frame
(
Error
&
err
)
{
AVPacket
pkt
=
{
0
};
// data and size must be 0;
AVFrame
*
frame
;
int
ret
;
av_init_packet
(
&
pkt
);
frame
=
get_audio_frame
();
if
(
frame
)
{
...
...
@@ -315,7 +316,7 @@ HLSOutputStream::write_audio_frame (Error& err)
}
for
(;;)
{
ret
=
avcodec_receive_packet
(
m_enc
,
&
pkt
);
ret
=
avcodec_receive_packet
(
m_enc
,
m_tmp_
pkt
);
if
(
ret
==
AVERROR
(
EAGAIN
))
{
return
EncResult
::
OK
;
// encoder needs more data to produce something
...
...
@@ -337,7 +338,7 @@ HLSOutputStream::write_audio_frame (Error& err)
}
else
if
(
m_keep_aac_frames
)
{
ret
=
write_frame
(
&
m_enc
->
time_base
,
m_st
,
&
pkt
);
ret
=
write_frame
(
&
m_enc
->
time_base
,
m_st
,
m_tmp_
pkt
);
if
(
ret
<
0
)
{
err
=
Error
(
string_printf
(
"error while writing audio frame: %s"
,
av_err2str
(
ret
)));
...
...
@@ -354,6 +355,7 @@ HLSOutputStream::close_stream()
avcodec_free_context
(
&
m_enc
);
av_frame_free
(
&
m_frame
);
av_frame_free
(
&
m_tmp_frame
);
av_packet_free
(
&
m_tmp_pkt
);
swr_free
(
&
m_swr_ctx
);
}
...
...
src/hlsoutputstream.hh
View file @
2b4dc580
...
...
@@ -44,6 +44,7 @@ class HLSOutputStream : public AudioOutputStream {
AVFrame
*
m_frame
=
nullptr
;
AVFrame
*
m_tmp_frame
=
nullptr
;
AVPacket
*
m_tmp_pkt
=
nullptr
;
size_t
m_cut_aac_frames
=
0
;
size_t
m_keep_aac_frames
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment