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
dfa78693
Commit
dfa78693
authored
Jul 22, 2020
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HLS: support any file type as hls-prepare audio master
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
12d320ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
2 deletions
+24
-2
audiowmark.cc
src/audiowmark.cc
+1
-1
hls.cc
src/hls.cc
+23
-1
No files found.
src/audiowmark.cc
View file @
dfa78693
...
...
@@ -80,7 +80,7 @@ print_usage_hls()
printf
(
"
\n
"
);
printf
(
"Commands:
\n
"
);
printf
(
" * prepare HLS segments for streaming:
\n
"
);
printf
(
" audiowmark hls-prepare <input_dir> <output_dir> <playlist_name> <
master_wav
>
\n
"
);
printf
(
" audiowmark hls-prepare <input_dir> <output_dir> <playlist_name> <
audio_master
>
\n
"
);
printf
(
"
\n
"
);
printf
(
" * watermark one HLS segment:
\n
"
);
printf
(
" audiowmark hls-add <input_ts> <output_ts> <message_hex>
\n
"
);
...
...
src/hls.cc
View file @
dfa78693
...
...
@@ -288,6 +288,28 @@ bit_rate_from_m3u8 (const string& m3u8, const WavData& wav_data, int& bit_rate)
return
Error
::
Code
::
NONE
;
}
Error
load_audio_master
(
const
string
&
filename
,
WavData
&
audio_master_data
)
{
FILE
*
tmp_file
=
tmpfile
();
ScopedFile
tmp_file_s
(
tmp_file
);
string
tmp_file_name
=
string_printf
(
"/dev/fd/%d"
,
fileno
(
tmp_file
));
if
(
!
tmp_file
)
return
Error
(
"failed to create temp file"
);
/* extract wav */
Error
err
=
run
({
"ffmpeg"
,
"-v"
,
"error"
,
"-y"
,
"-i"
,
filename
,
"-f"
,
"wav"
,
tmp_file_name
});
if
(
err
)
return
err
;
err
=
audio_master_data
.
load
(
tmp_file_name
);
if
(
err
)
return
err
;
return
Error
::
Code
::
NONE
;
}
Error
validate_input_segment
(
const
string
&
filename
)
{
...
...
@@ -393,7 +415,7 @@ hls_prepare (const string& in_dir, const string& out_dir, const string& filename
}
WavData
audio_master_data
;
Error
err
=
audio_master_data
.
load
(
audio_master
);
Error
err
=
load_audio_master
(
audio_master
,
audio_master_data
);
if
(
err
)
{
error
(
"audiowmark: failed to load audio master: %s
\n
"
,
audio_master
.
c_str
());
...
...
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