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
9cf24203
Commit
9cf24203
authored
May 04, 2020
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testhls: provide one frame prev/next context to aac encoder
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
46608121
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
testhls.cc
src/testhls.cc
+7
-3
No files found.
src/testhls.cc
View file @
9cf24203
...
...
@@ -28,6 +28,7 @@ using std::string;
using
std
::
regex
;
using
std
::
vector
;
using
std
::
map
;
using
std
::
min
;
Error
xsystem
(
const
string
&
cmd
)
...
...
@@ -104,7 +105,8 @@ ff_encode (const WavData& wav_data, const string& filename, size_t start_pos)
if
(
err
)
return
err
;
cmd
=
string_printf
(
"ffmpeg -v error -y -i '%s' -ss 0.023 -f mpegts -c copy '%s-tcpy'"
,
filename
.
c_str
(),
filename
.
c_str
());
cmd
=
string_printf
(
"ffmpeg -v error -y -i '%s' -ss 0.023 -t %.3f -f mpegts -c copy '%s-tcpy'"
,
filename
.
c_str
(),
((
double
(
wav_data
.
n_values
())
/
wav_data
.
n_channels
()
-
2048
)
/
wav_data
.
sample_rate
()),
filename
.
c_str
());
err
=
xsystem
(
cmd
);
if
(
err
)
return
err
;
...
...
@@ -249,11 +251,13 @@ hls_mark (const string& infile, const string& outfile, const string& bits)
size_t
start_pos
=
atoi
(
vars
[
"start_pos"
].
c_str
());
size_t
prev_size
=
atoi
(
vars
[
"prev_size"
].
c_str
());
size_t
next_size
=
atoi
(
vars
[
"next_size"
].
c_str
());
size_t
next_ctx
=
min
<
size_t
>
(
1024
,
next_size
);
size_t
prev_ctx
=
min
<
size_t
>
(
1024
,
prev_size
);
/* erase extra samples caused by concatting with prev.ts */
auto
samples
=
wav_data
.
samples
();
samples
.
erase
(
samples
.
begin
(),
samples
.
begin
()
+
prev_size
*
wav_data
.
n_channels
());
samples
.
erase
(
samples
.
end
()
-
next_size
*
wav_data
.
n_channels
(),
samples
.
end
());
samples
.
erase
(
samples
.
begin
(),
samples
.
begin
()
+
(
prev_size
-
prev_ctx
)
*
wav_data
.
n_channels
());
samples
.
erase
(
samples
.
end
()
-
(
next_size
-
next_ctx
)
*
wav_data
.
n_channels
(),
samples
.
end
());
wav_data
.
set_samples
(
samples
);
err
=
ff_encode
(
wav_data
,
outfile
,
start_pos
);
...
...
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