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
7a362078
Commit
7a362078
authored
Oct 28, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: libmp4: handle btrt atom
parent
5ee57b86
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
0 deletions
+24
-0
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+15
-0
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+9
-0
No files found.
modules/demux/mp4/libmp4.c
View file @
7a362078
...
...
@@ -3325,6 +3325,20 @@ static int MP4_ReadBox_iods( stream_t *p_stream, MP4_Box_t *p_box )
MP4_READBOX_EXIT
(
1
);
}
static
int
MP4_ReadBox_btrt
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
)
{
MP4_READBOX_ENTER
(
MP4_Box_data_btrt_t
,
NULL
);
if
(
i_read
!=
12
)
MP4_READBOX_EXIT
(
0
);
MP4_GET4BYTES
(
p_box
->
data
.
p_btrt
->
i_buffer_size
);
MP4_GET4BYTES
(
p_box
->
data
.
p_btrt
->
i_max_bitrate
);
MP4_GET4BYTES
(
p_box
->
data
.
p_btrt
->
i_avg_bitrate
);
MP4_READBOX_EXIT
(
1
);
}
static
int
MP4_ReadBox_pasp
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
)
{
MP4_READBOX_ENTER
(
MP4_Box_data_pasp_t
,
NULL
);
...
...
@@ -3731,6 +3745,7 @@ static const struct
{
ATOM_enda
,
MP4_ReadBox_enda
,
0
},
{
ATOM_iods
,
MP4_ReadBox_iods
,
0
},
{
ATOM_pasp
,
MP4_ReadBox_pasp
,
0
},
{
ATOM_btrt
,
MP4_ReadBox_btrt
,
0
},
/* codecs bitrate stsd/????/btrt */
{
ATOM_keys
,
MP4_ReadBox_keys
,
ATOM_meta
},
/* Quicktime preview atoms, all at root */
...
...
modules/demux/mp4/libmp4.h
View file @
7a362078
...
...
@@ -132,6 +132,7 @@ typedef int64_t stime_t;
#define ATOM_mpod VLC_FOURCC( 'm', 'p', 'o', 'd' )
#define ATOM_hnti VLC_FOURCC( 'h', 'n', 't', 'i' )
#define ATOM_rtp VLC_FOURCC( 'r', 't', 'p', ' ' )
#define ATOM_btrt VLC_FOURCC( 'b', 't', 'r', 't' )
#define ATOM_esds VLC_FOURCC( 'e', 's', 'd', 's' )
...
...
@@ -1283,6 +1284,13 @@ typedef struct
}
MP4_Box_data_iods_t
;
typedef
struct
{
uint32_t
i_buffer_size
;
uint32_t
i_max_bitrate
;
uint32_t
i_avg_bitrate
;
}
MP4_Box_data_btrt_t
;
typedef
struct
{
uint32_t
i_horizontal_spacing
;
...
...
@@ -1443,6 +1451,7 @@ typedef union MP4_Box_data_s
MP4_Box_data_enda_t
*
p_enda
;
MP4_Box_data_keys_t
*
p_keys
;
MP4_Box_data_iods_t
*
p_iods
;
MP4_Box_data_btrt_t
*
p_btrt
;
MP4_Box_data_pasp_t
*
p_pasp
;
MP4_Box_data_trex_t
*
p_trex
;
MP4_Box_data_mehd_t
*
p_mehd
;
...
...
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