Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
35e152f4
Commit
35e152f4
authored
Dec 16, 2013
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mux hevc into mp4
parent
aebbde86
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
0 deletions
+16
-0
modules/mux/mp4.c
modules/mux/mp4.c
+16
-0
No files found.
modules/mux/mp4.c
View file @
35e152f4
...
...
@@ -382,6 +382,7 @@ static int AddStream(sout_mux_t *p_mux, sout_input_t *p_input)
case
VLC_CODEC_SVQ3
:
case
VLC_CODEC_H263
:
case
VLC_CODEC_H264
:
case
VLC_CODEC_HEVC
:
case
VLC_CODEC_AMR_NB
:
case
VLC_CODEC_AMR_WB
:
case
VLC_CODEC_YV12
:
...
...
@@ -752,6 +753,16 @@ static bo_t *GetD263Tag(void)
return
d263
;
}
static
bo_t
*
GetHvcCTag
(
mp4_stream_t
*
p_stream
)
{
bo_t
*
hvcC
=
box_new
(
"hvcC"
);
if
(
p_stream
->
fmt
.
i_extra
>
0
)
bo_add_mem
(
hvcC
,
p_stream
->
fmt
.
i_extra
,
p_stream
->
fmt
.
p_extra
);
return
hvcC
;
}
static
bo_t
*
GetAvcCTag
(
mp4_stream_t
*
p_stream
)
{
bo_t
*
avcC
=
NULL
;
...
...
@@ -988,6 +999,7 @@ static bo_t *GetVideBox(mp4_stream_t *p_stream)
case
VLC_CODEC_SVQ3
:
memcpy
(
fcc
,
"SVQ3"
,
4
);
break
;
case
VLC_CODEC_H263
:
memcpy
(
fcc
,
"s263"
,
4
);
break
;
case
VLC_CODEC_H264
:
memcpy
(
fcc
,
"avc1"
,
4
);
break
;
case
VLC_CODEC_HEVC
:
memcpy
(
fcc
,
"hvc1"
,
4
);
break
;
case
VLC_CODEC_YV12
:
memcpy
(
fcc
,
"yv12"
,
4
);
break
;
case
VLC_CODEC_YUYV
:
memcpy
(
fcc
,
"yuy2"
,
4
);
break
;
default:
...
...
@@ -1040,6 +1052,10 @@ static bo_t *GetVideBox(mp4_stream_t *p_stream)
case
VLC_CODEC_H264
:
box_gather
(
vide
,
GetAvcCTag
(
p_stream
));
break
;
case
VLC_CODEC_HEVC
:
box_gather
(
vide
,
GetHvcCTag
(
p_stream
));
break
;
}
return
vide
;
...
...
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