Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
4f7a9d3d
Commit
4f7a9d3d
authored
Jun 14, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: libmp4: add clcp sample desc
parent
8d2fd6f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
0 deletions
+27
-0
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+19
-0
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+8
-0
No files found.
modules/demux/mp4/libmp4.c
View file @
4f7a9d3d
...
@@ -2206,6 +2206,24 @@ static int MP4_ReadBox_sample_text( stream_t *p_stream, MP4_Box_t *p_box )
...
@@ -2206,6 +2206,24 @@ static int MP4_ReadBox_sample_text( stream_t *p_stream, MP4_Box_t *p_box )
MP4_READBOX_EXIT
(
1
);
MP4_READBOX_EXIT
(
1
);
}
}
static
int
MP4_ReadBox_sample_clcp
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
)
{
p_box
->
i_handler
=
ATOM_clcp
;
MP4_READBOX_ENTER
(
MP4_Box_data_sample_clcp_t
,
NULL
);
if
(
i_read
<
8
)
MP4_READBOX_EXIT
(
0
);
for
(
int
i
=
0
;
i
<
6
;
i
++
)
MP4_GET1BYTE
(
p_box
->
data
.
p_sample_clcp
->
i_reserved1
[
i
]
);
MP4_GET2BYTES
(
p_box
->
data
.
p_sample_clcp
->
i_data_reference_index
);
#ifdef MP4_VERBOSE
msg_Dbg
(
p_stream
,
"read box:
\"
clcp
\"
in stsd"
);
#endif
MP4_READBOX_EXIT
(
1
);
}
static
int
MP4_ReadBox_sample_tx3g
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
)
static
int
MP4_ReadBox_sample_tx3g
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
)
{
{
p_box
->
i_handler
=
ATOM_text
;
p_box
->
i_handler
=
ATOM_text
;
...
@@ -3684,6 +3702,7 @@ static const struct
...
@@ -3684,6 +3702,7 @@ static const struct
/* Subtitles */
/* Subtitles */
{
ATOM_tx3g
,
MP4_ReadBox_sample_tx3g
,
0
},
{
ATOM_tx3g
,
MP4_ReadBox_sample_tx3g
,
0
},
{
ATOM_c608
,
MP4_ReadBox_sample_clcp
,
ATOM_stsd
},
//{ ATOM_text, MP4_ReadBox_sample_text, 0 },
//{ ATOM_text, MP4_ReadBox_sample_text, 0 },
/* for codecs */
/* for codecs */
...
...
modules/demux/mp4/libmp4.h
View file @
4f7a9d3d
...
@@ -670,6 +670,13 @@ typedef struct
...
@@ -670,6 +670,13 @@ typedef struct
// TODO to complete
// TODO to complete
}
MP4_Box_data_sample_text_t
;
}
MP4_Box_data_sample_text_t
;
typedef
struct
{
uint8_t
i_reserved1
[
6
];
uint16_t
i_data_reference_index
;
}
MP4_Box_data_sample_clcp_t
;
typedef
struct
MP4_Box_data_sample_hint_s
typedef
struct
MP4_Box_data_sample_hint_s
{
{
uint8_t
i_reserved1
[
6
];
uint8_t
i_reserved1
[
6
];
...
@@ -1410,6 +1417,7 @@ typedef union MP4_Box_data_s
...
@@ -1410,6 +1417,7 @@ typedef union MP4_Box_data_s
MP4_Box_data_sample_vide_t
*
p_sample_vide
;
MP4_Box_data_sample_vide_t
*
p_sample_vide
;
MP4_Box_data_sample_soun_t
*
p_sample_soun
;
MP4_Box_data_sample_soun_t
*
p_sample_soun
;
MP4_Box_data_sample_text_t
*
p_sample_text
;
MP4_Box_data_sample_text_t
*
p_sample_text
;
MP4_Box_data_sample_clcp_t
*
p_sample_clcp
;
MP4_Box_data_sample_hint_t
*
p_sample_hint
;
MP4_Box_data_sample_hint_t
*
p_sample_hint
;
MP4_Box_data_esds_t
*
p_esds
;
MP4_Box_data_esds_t
*
p_esds
;
...
...
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