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
1714b8ea
Commit
1714b8ea
authored
Oct 19, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: libmp4: add quicktime pnot movie preview atoms
parent
a8d12d85
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
0 deletions
+32
-0
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+19
-0
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+13
-0
No files found.
modules/demux/mp4/libmp4.c
View file @
1714b8ea
...
@@ -3429,6 +3429,20 @@ static void MP4_FreeBox_tfra( MP4_Box_t *p_box )
...
@@ -3429,6 +3429,20 @@ static void MP4_FreeBox_tfra( MP4_Box_t *p_box )
FREENULL
(
p_box
->
data
.
p_tfra
->
p_sample_number
);
FREENULL
(
p_box
->
data
.
p_tfra
->
p_sample_number
);
}
}
static
int
MP4_ReadBox_pnot
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
)
{
if
(
p_box
->
i_size
!=
20
)
return
0
;
MP4_READBOX_ENTER
(
MP4_Box_data_pnot_t
);
MP4_GET4BYTES
(
p_box
->
data
.
p_pnot
->
i_date
);
uint16_t
i_version
;
MP4_GET2BYTES
(
i_version
);
if
(
i_version
!=
0
)
MP4_READBOX_EXIT
(
0
);
MP4_GETFOURCC
(
p_box
->
data
.
p_pnot
->
i_type
);
MP4_GET2BYTES
(
p_box
->
data
.
p_pnot
->
i_index
);
MP4_READBOX_EXIT
(
1
);
}
/* For generic */
/* For generic */
static
int
MP4_ReadBox_default
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
)
static
int
MP4_ReadBox_default
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
)
...
@@ -3567,6 +3581,11 @@ static const struct
...
@@ -3567,6 +3581,11 @@ static const struct
{
ATOM_pasp
,
MP4_ReadBox_pasp
,
MP4_FreeBox_Common
,
0
},
{
ATOM_pasp
,
MP4_ReadBox_pasp
,
MP4_FreeBox_Common
,
0
},
{
ATOM_keys
,
MP4_ReadBox_keys
,
MP4_FreeBox_keys
,
ATOM_meta
},
{
ATOM_keys
,
MP4_ReadBox_keys
,
MP4_FreeBox_keys
,
ATOM_meta
},
/* Quicktime preview atoms, all at root */
{
ATOM_pnot
,
MP4_ReadBox_pnot
,
MP4_FreeBox_Common
,
0
},
{
ATOM_pict
,
MP4_ReadBox_Binary
,
MP4_FreeBox_Binary
,
0
},
{
ATOM_PICT
,
MP4_ReadBox_Binary
,
MP4_FreeBox_Binary
,
0
},
/* Nothing to do with this box */
/* Nothing to do with this box */
{
ATOM_mdat
,
MP4_ReadBoxSkip
,
MP4_FreeBox_Common
,
0
},
{
ATOM_mdat
,
MP4_ReadBoxSkip
,
MP4_FreeBox_Common
,
0
},
{
ATOM_skip
,
MP4_ReadBoxSkip
,
MP4_FreeBox_Common
,
0
},
{
ATOM_skip
,
MP4_ReadBoxSkip
,
MP4_FreeBox_Common
,
0
},
...
...
modules/demux/mp4/libmp4.h
View file @
1714b8ea
...
@@ -54,6 +54,11 @@
...
@@ -54,6 +54,11 @@
#define ATOM_wide VLC_FOURCC( 'w', 'i', 'd', 'e' )
#define ATOM_wide VLC_FOURCC( 'w', 'i', 'd', 'e' )
#define ATOM_binm VLC_FOURCC( 0x82, 0x82, 0x7f, 0x7d )
/* binary Computer Graphics Metafile */
#define ATOM_binm VLC_FOURCC( 0x82, 0x82, 0x7f, 0x7d )
/* binary Computer Graphics Metafile */
/* Quicktime preview */
#define ATOM_pnot VLC_FOURCC( 'p', 'n', 'o', 't' )
#define ATOM_pict VLC_FOURCC( 'p', 'i', 'c', 't' )
#define ATOM_PICT VLC_FOURCC( 'P', 'I', 'C', 'T' )
#define ATOM_data VLC_FOURCC( 'd', 'a', 't', 'a' )
#define ATOM_data VLC_FOURCC( 'd', 'a', 't', 'a' )
#define ATOM_trak VLC_FOURCC( 't', 'r', 'a', 'k' )
#define ATOM_trak VLC_FOURCC( 't', 'r', 'a', 'k' )
...
@@ -1020,6 +1025,13 @@ typedef struct MP4_Box_data_trun_s
...
@@ -1020,6 +1025,13 @@ typedef struct MP4_Box_data_trun_s
}
MP4_Box_data_trun_t
;
}
MP4_Box_data_trun_t
;
typedef
struct
{
uint32_t
i_date
;
uint32_t
i_type
;
uint16_t
i_index
;
}
MP4_Box_data_pnot_t
;
typedef
struct
typedef
struct
{
{
char
*
psz_text
;
char
*
psz_text
;
...
@@ -1429,6 +1441,7 @@ typedef union MP4_Box_data_s
...
@@ -1429,6 +1441,7 @@ typedef union MP4_Box_data_s
MP4_Box_data_rmqu_t
*
p_rmqu
;
MP4_Box_data_rmqu_t
*
p_rmqu
;
MP4_Box_data_rmvc_t
*
p_rmvc
;
MP4_Box_data_rmvc_t
*
p_rmvc
;
MP4_Box_data_pnot_t
*
p_pnot
;
MP4_Box_data_chpl_t
*
p_chpl
;
MP4_Box_data_chpl_t
*
p_chpl
;
MP4_Box_data_tref_generic_t
*
p_tref_generic
;
MP4_Box_data_tref_generic_t
*
p_tref_generic
;
...
...
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