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
a79f608e
Commit
a79f608e
authored
Jun 29, 2020
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HLSOutputStream: clean up encoder result codes
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
b10c33a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
16 deletions
+18
-16
hlsoutputstream.cc
src/hlsoutputstream.cc
+11
-15
hlsoutputstream.hh
src/hlsoutputstream.hh
+7
-1
No files found.
src/hlsoutputstream.cc
View file @
a79f608e
...
...
@@ -237,15 +237,14 @@ HLSOutputStream::write_frame (const AVRational *time_base, AVStream *st, AVPacke
/*
* encode one audio frame and send it to the muxer
*
return 1 when encoding is finished, 0 otherwise
*
returns EncResult: OK, ERROR, DONE
*/
in
t
HLSOutputStream
::
EncResul
t
HLSOutputStream
::
write_audio_frame
(
Error
&
err
)
{
AVPacket
pkt
=
{
0
};
// data and size must be 0;
AVFrame
*
frame
;
int
ret
;
int
got_packet
;
av_init_packet
(
&
pkt
);
...
...
@@ -267,7 +266,7 @@ HLSOutputStream::write_audio_frame (Error& err)
if
(
ret
<
0
)
{
err
=
Error
(
"error making frame writable"
);
return
1
;
return
EncResult
::
ERROR
;
}
/* convert to destination format */
...
...
@@ -277,7 +276,7 @@ HLSOutputStream::write_audio_frame (Error& err)
if
(
ret
<
0
)
{
err
=
Error
(
"error while converting"
);
return
1
;
return
EncResult
::
ERROR
;
}
frame
=
m_frame
;
...
...
@@ -288,30 +287,28 @@ HLSOutputStream::write_audio_frame (Error& err)
ret
=
avcodec_send_frame
(
m_enc
,
frame
);
if
(
ret
==
AVERROR_EOF
)
{
/* encoder has nothing more to do */
return
1
;
return
EncResult
::
DONE
;
// encoder has nothing more to do
}
else
if
(
ret
<
0
)
{
err
=
Error
(
string_printf
(
"error encoding audio frame: %s"
,
av_err2str
(
ret
)));
return
1
;
return
EncResult
::
ERROR
;
}
for
(;;)
{
ret
=
avcodec_receive_packet
(
m_enc
,
&
pkt
);
if
(
ret
==
AVERROR
(
EAGAIN
))
{
/* encoder needs more data to produce something */
return
0
;
return
EncResult
::
OK
;
// encoder needs more data to produce something
}
else
if
(
ret
==
AVERROR_EOF
)
{
return
1
;
/* done */
return
EncResult
::
DONE
;
}
else
if
(
ret
<
0
)
{
err
=
Error
(
string_printf
(
"error while encoding audio frame: %s"
,
av_err2str
(
ret
)));
return
1
;
return
EncResult
::
ERROR
;
}
/* one packet available */
...
...
@@ -325,11 +322,10 @@ HLSOutputStream::write_audio_frame (Error& err)
if
(
ret
<
0
)
{
err
=
Error
(
string_printf
(
"error while writing audio frame: %s"
,
av_err2str
(
ret
)));
return
1
;
return
EncResult
::
ERROR
;
}
m_keep_aac_frames
--
;
}
return
0
;
/* not done yet */
}
}
...
...
@@ -400,7 +396,7 @@ HLSOutputStream::close()
m_state
=
State
::
CLOSED
;
Error
err
;
while
(
write_audio_frame
(
err
)
==
0
);
while
(
write_audio_frame
(
err
)
==
EncResult
::
OK
);
if
(
err
)
return
err
;
...
...
src/hlsoutputstream.hh
View file @
a79f608e
...
...
@@ -99,9 +99,15 @@ class HLSOutputStream : public AudioOutputStream {
Error
add_stream
(
AVCodec
**
codec
,
enum
AVCodecID
codec_id
);
Error
open_audio
(
AVCodec
*
codec
,
AVDictionary
*
opt_arg
);
AVFrame
*
get_audio_frame
();
int
write_audio_frame
(
Error
&
err
);
enum
class
EncResult
{
OK
,
ERROR
,
DONE
};
EncResult
write_audio_frame
(
Error
&
err
);
void
close_stream
();
AVFrame
*
alloc_audio_frame
(
AVSampleFormat
sample_fmt
,
uint64_t
channel_layout
,
int
sample_rate
,
int
nb_samples
,
Error
&
err
);
int
write_frame
(
const
AVRational
*
time_base
,
AVStream
*
st
,
AVPacket
*
pkt
);
public
:
HLSOutputStream
(
int
n_channels
,
int
sample_rate
,
int
bit_depth
);
...
...
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