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
e1b446b7
Commit
e1b446b7
authored
Apr 27, 2020
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement TSWriter class, make hls context embedding work.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
c191daf0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
63 additions
and
41 deletions
+63
-41
mpegts.cc
src/mpegts.cc
+44
-30
mpegts.hh
src/mpegts.hh
+12
-1
testhls.cc
src/testhls.cc
+3
-9
testmpegts.cc
src/testmpegts.cc
+4
-1
No files found.
src/mpegts.cc
View file @
e1b446b7
...
...
@@ -113,7 +113,23 @@ public:
};
Error
ts_append
(
const
string
&
inname
,
const
string
&
outname
,
const
string
&
dataname
)
TSWriter
::
append_file
(
const
string
&
name
,
const
string
&
filename
)
{
vector
<
unsigned
char
>
data
;
FILE
*
datafile
=
fopen
(
filename
.
c_str
(),
"r"
);
ScopedFile
datafile_s
(
datafile
);
if
(
!
datafile
)
return
Error
(
"unable to open data file"
);
int
c
;
while
((
c
=
fgetc
(
datafile
))
>=
0
)
data
.
push_back
(
c
);
entries
.
push_back
({
name
,
data
});
return
Error
::
Code
::
NONE
;
}
Error
TSWriter
::
process
(
const
string
&
inname
,
const
string
&
outname
)
{
FILE
*
infile
=
fopen
(
inname
.
c_str
(),
"r"
);
FILE
*
outfile
=
fopen
(
outname
.
c_str
(),
"w"
);
...
...
@@ -135,40 +151,38 @@ ts_append (const string& inname, const string& outname, const string& dataname)
err
=
p
.
write
(
outfile
);
}
}
vector
<
unsigned
char
>
data
;
FILE
*
datafile
=
fopen
(
dataname
.
c_str
(),
"r"
);
ScopedFile
datafile_s
(
datafile
);
int
c
;
while
((
c
=
fgetc
(
datafile
))
>=
0
)
data
.
push_back
(
c
);
char
buf
[
1024
];
sprintf
(
buf
,
"%zd"
,
data
.
size
());
string
header
=
buf
;
header
+=
":"
+
dataname
;
header
+=
'\0'
;
for
(
size_t
i
=
0
;
i
<
header
.
size
();
i
++
)
data
.
insert
(
data
.
begin
()
+
i
,
header
[
i
]);
TSPacket
p_file
;
p_file
.
clear
(
TSPacket
::
ID
::
awmk_file
);
size_t
data_pos
=
0
;
int
pos
=
12
;
while
(
data_pos
<
data
.
size
())
for
(
auto
entry
:
entries
)
{
p_file
[
pos
++
]
=
data
[
data_pos
];
if
(
pos
==
188
)
char
buf
[
1024
];
sprintf
(
buf
,
"%zd"
,
entry
.
data
.
size
());
string
header
=
buf
;
header
+=
":"
+
entry
.
name
;
header
+=
'\0'
;
vector
<
unsigned
char
>
data
=
entry
.
data
;
for
(
size_t
i
=
0
;
i
<
header
.
size
();
i
++
)
data
.
insert
(
data
.
begin
()
+
i
,
header
[
i
]);
TSPacket
p_file
;
p_file
.
clear
(
TSPacket
::
ID
::
awmk_file
);
size_t
data_pos
=
0
;
int
pos
=
12
;
while
(
data_pos
<
data
.
size
())
{
p_file
.
write
(
outfile
);
p_file
.
clear
(
TSPacket
::
ID
::
awmk_data
);
pos
=
12
;
p_file
[
pos
++
]
=
data
[
data_pos
];
if
(
pos
==
188
)
{
p_file
.
write
(
outfile
);
p_file
.
clear
(
TSPacket
::
ID
::
awmk_data
);
pos
=
12
;
}
data_pos
++
;
}
data_pos
++
;
}
if
(
pos
!=
12
)
{
Error
err
=
p_file
.
write
(
outfile
);
if
(
pos
!=
12
)
{
Error
err
=
p_file
.
write
(
outfile
);
}
}
return
Error
::
Code
::
NONE
;
...
...
src/mpegts.hh
View file @
e1b446b7
...
...
@@ -39,6 +39,17 @@ public:
const
std
::
vector
<
Entry
>&
entries
();
};
Error
ts_append
(
const
std
::
string
&
inname
,
const
std
::
string
&
outname
,
const
std
::
string
&
dataname
);
class
TSWriter
{
struct
Entry
{
std
::
string
name
;
std
::
vector
<
unsigned
char
>
data
;
};
std
::
vector
<
Entry
>
entries
;
public
:
Error
append_file
(
const
std
::
string
&
name
,
const
std
::
string
&
filename
);
Error
process
(
const
std
::
string
&
in_name
,
const
std
::
string
&
out_name
);
};
#endif
/* AUDIOWMARK_MPEGTS_HH */
src/testhls.cc
View file @
e1b446b7
...
...
@@ -21,18 +21,12 @@
#include <regex>
#include "utils.hh"
#include "mpegts.hh"
using
std
::
string
;
using
std
::
regex
;
using
std
::
vector
;
class
TSWriter
{
public
:
void
append_file
(
const
string
&
name
,
const
string
&
filename
)
{}
void
process
(
const
string
&
in_name
,
const
string
&
out_name
)
{}
};
int
hls_embed_context
(
const
string
&
in_dir
,
const
string
&
out_dir
,
const
string
&
filename
)
{
...
...
@@ -87,9 +81,9 @@ hls_embed_context (const string& in_dir, const string& out_dir, const string& fi
TSWriter
writer
;
if
(
i
>
0
)
writer
.
append_file
(
"prev.ts"
,
out
_dir
+
"/"
+
segments
[
i
-
1
]);
writer
.
append_file
(
"prev.ts"
,
in
_dir
+
"/"
+
segments
[
i
-
1
]);
if
(
i
+
1
<
segments
.
size
())
writer
.
append_file
(
"next.ts"
,
out
_dir
+
"/"
+
segments
[
i
+
1
]);
writer
.
append_file
(
"next.ts"
,
in
_dir
+
"/"
+
segments
[
i
+
1
]);
writer
.
process
(
in_dir
+
"/"
+
segments
[
i
],
out_dir
+
"/"
+
segments
[
i
]);
}
return
0
;
...
...
src/testmpegts.cc
View file @
e1b446b7
...
...
@@ -34,7 +34,10 @@ main (int argc, char **argv)
if
(
argc
==
5
&&
strcmp
(
argv
[
1
],
"append"
)
==
0
)
{
printf
(
"append: in=%s out=%s fn=%s
\n
"
,
argv
[
2
],
argv
[
3
],
argv
[
4
]);
Error
err
=
ts_append
(
argv
[
2
],
argv
[
3
],
argv
[
4
]);
TSWriter
writer
;
writer
.
append_file
(
argv
[
4
],
argv
[
4
]);
Error
err
=
writer
.
process
(
argv
[
2
],
argv
[
3
]);
if
(
err
)
{
error
(
"ts_append: %s
\n
"
,
err
.
message
());
...
...
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