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
acfdbe5d
Commit
acfdbe5d
authored
Mar 11, 2004
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/mux/mp4.c: support for a few more user data atoms.
parent
ae51f379
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
18 deletions
+26
-18
modules/mux/mp4.c
modules/mux/mp4.c
+26
-18
No files found.
modules/mux/mp4.c
View file @
acfdbe5d
...
@@ -510,7 +510,8 @@ static int Mux( sout_mux_t *p_mux )
...
@@ -510,7 +510,8 @@ static int Mux( sout_mux_t *p_mux )
/* add index entry */
/* add index entry */
p_stream
->
entry
[
p_stream
->
i_entry_count
].
i_pos
=
p_sys
->
i_pos
;
p_stream
->
entry
[
p_stream
->
i_entry_count
].
i_pos
=
p_sys
->
i_pos
;
p_stream
->
entry
[
p_stream
->
i_entry_count
].
i_size
=
p_data
->
i_size
;
p_stream
->
entry
[
p_stream
->
i_entry_count
].
i_size
=
p_data
->
i_size
;
p_stream
->
entry
[
p_stream
->
i_entry_count
].
i_pts_dts
=
__MAX
(
p_data
->
i_pts
-
p_data
->
i_dts
,
0
);
p_stream
->
entry
[
p_stream
->
i_entry_count
].
i_pts_dts
=
__MAX
(
p_data
->
i_pts
-
p_data
->
i_dts
,
0
);
p_stream
->
entry
[
p_stream
->
i_entry_count
].
i_length
=
p_data
->
i_length
;
p_stream
->
entry
[
p_stream
->
i_entry_count
].
i_length
=
p_data
->
i_length
;
p_stream
->
entry
[
p_stream
->
i_entry_count
].
i_flags
=
p_data
->
i_flags
;
p_stream
->
entry
[
p_stream
->
i_entry_count
].
i_flags
=
p_data
->
i_flags
;
...
@@ -739,6 +740,8 @@ static bo_t *GetUdtaTag( sout_mux_t *p_mux )
...
@@ -739,6 +740,8 @@ static bo_t *GetUdtaTag( sout_mux_t *p_mux )
box_fix
(
box
);
box_fix
(
box
);
box_gather
(
udta
,
box
);
box_gather
(
udta
,
box
);
}
}
/* Misc atoms */
if
(
p_meta
)
if
(
p_meta
)
{
{
int
i
;
int
i
;
...
@@ -747,27 +750,28 @@ static bo_t *GetUdtaTag( sout_mux_t *p_mux )
...
@@ -747,27 +750,28 @@ static bo_t *GetUdtaTag( sout_mux_t *p_mux )
bo_t
*
box
=
NULL
;
bo_t
*
box
=
NULL
;
if
(
!
strcmp
(
p_meta
->
name
[
i
],
VLC_META_TITLE
)
)
if
(
!
strcmp
(
p_meta
->
name
[
i
],
VLC_META_TITLE
)
)
{
box
=
box_new
(
"
\251
nam"
);
box
=
box_new
(
"
\251
nam"
);
}
else
if
(
!
strcmp
(
p_meta
->
name
[
i
],
VLC_META_AUTHOR
)
)
else
if
(
!
strcmp
(
p_meta
->
name
[
i
],
VLC_META_AUTHOR
)
)
{
box
=
box_new
(
"
\251
aut"
);
box
=
box_new
(
"
\251
aut"
);
}
else
if
(
!
strcmp
(
p_meta
->
name
[
i
],
VLC_META_ARTIST
)
)
else
if
(
!
strcmp
(
p_meta
->
name
[
i
],
VLC_META_ARTIST
)
)
{
box
=
box_new
(
"
\251
ART"
);
box
=
box_new
(
"
\251
ART"
);
}
else
if
(
!
strcmp
(
p_meta
->
name
[
i
],
VLC_META_GENRE
)
)
box
=
box_new
(
"
\251
gen"
);
else
if
(
!
strcmp
(
p_meta
->
name
[
i
],
VLC_META_COPYRIGHT
)
)
else
if
(
!
strcmp
(
p_meta
->
name
[
i
],
VLC_META_COPYRIGHT
)
)
{
box
=
box_new
(
"
\251
cpy"
);
box
=
box_new
(
"
\251
cpy"
);
}
else
if
(
!
strcmp
(
p_meta
->
name
[
i
],
VLC_META_DESCRIPTION
)
)
box
=
box_new
(
"
\251
des"
);
else
if
(
!
strcmp
(
p_meta
->
name
[
i
],
VLC_META_DATE
)
)
box
=
box_new
(
"
\251
day"
);
else
if
(
!
strcmp
(
p_meta
->
name
[
i
],
VLC_META_URL
)
)
box
=
box_new
(
"
\251
url"
);
if
(
box
)
if
(
box
)
{
{
bo_add_16be
(
box
,
strlen
(
p_meta
->
value
[
i
]
)
);
bo_add_16be
(
box
,
strlen
(
p_meta
->
value
[
i
]
)
);
bo_add_16be
(
box
,
0
);
bo_add_16be
(
box
,
0
);
bo_add_mem
(
box
,
strlen
(
p_meta
->
value
[
i
]
),
p_meta
->
value
[
i
]
);
bo_add_mem
(
box
,
strlen
(
p_meta
->
value
[
i
]
),
p_meta
->
value
[
i
]
);
box_fix
(
box
);
box_fix
(
box
);
box_gather
(
udta
,
box
);
box_gather
(
udta
,
box
);
}
}
...
@@ -1070,7 +1074,8 @@ static bo_t *GetStblBox( sout_mux_t *p_mux, mp4_stream_t *p_stream )
...
@@ -1070,7 +1074,8 @@ static bo_t *GetStblBox( sout_mux_t *p_mux, mp4_stream_t *p_stream )
i_dts
+=
p_stream
->
entry
[
i
].
i_length
;
i_dts
+=
p_stream
->
entry
[
i
].
i_length
;
p_stream
->
entry
[
i
].
i_length
=
i_delta
*
(
int64_t
)
i_timescale
/
I64C
(
1000000
);;
p_stream
->
entry
[
i
].
i_length
=
i_delta
*
(
int64_t
)
i_timescale
/
I64C
(
1000000
);
i_dts_q
+=
p_stream
->
entry
[
i
].
i_length
;
i_dts_q
+=
p_stream
->
entry
[
i
].
i_length
;
}
}
...
@@ -1111,7 +1116,8 @@ static bo_t *GetStblBox( sout_mux_t *p_mux, mp4_stream_t *p_stream )
...
@@ -1111,7 +1116,8 @@ static bo_t *GetStblBox( sout_mux_t *p_mux, mp4_stream_t *p_stream )
stss
=
NULL
;
stss
=
NULL
;
for
(
i
=
0
,
i_index
=
0
;
i
<
p_stream
->
i_entry_count
;
i
++
)
for
(
i
=
0
,
i_index
=
0
;
i
<
p_stream
->
i_entry_count
;
i
++
)
{
{
if
(
p_stream
->
entry
[
i
].
i_flags
&
(
BLOCK_FLAG_TYPE_I
<<
SOUT_BUFFER_FLAGS_BLOCK_SHIFT
)
)
if
(
p_stream
->
entry
[
i
].
i_flags
&
(
BLOCK_FLAG_TYPE_I
<<
SOUT_BUFFER_FLAGS_BLOCK_SHIFT
)
)
{
{
if
(
stss
==
NULL
)
if
(
stss
==
NULL
)
{
{
...
@@ -1309,12 +1315,14 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux )
...
@@ -1309,12 +1315,14 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux )
if
(
p_sys
->
b_64_ext
)
if
(
p_sys
->
b_64_ext
)
{
{
bo_add_64be
(
elst
,
(
p_stream
->
i_dts_start
-
p_sys
->
i_dts_start
)
*
i_movie_timescale
/
I64C
(
1000000
)
);
bo_add_64be
(
elst
,
(
p_stream
->
i_dts_start
-
p_sys
->
i_dts_start
)
*
i_movie_timescale
/
I64C
(
1000000
)
);
bo_add_64be
(
elst
,
-
1
);
bo_add_64be
(
elst
,
-
1
);
}
}
else
else
{
{
bo_add_32be
(
elst
,
(
p_stream
->
i_dts_start
-
p_sys
->
i_dts_start
)
*
i_movie_timescale
/
I64C
(
1000000
)
);
bo_add_32be
(
elst
,
(
p_stream
->
i_dts_start
-
p_sys
->
i_dts_start
)
*
i_movie_timescale
/
I64C
(
1000000
)
);
bo_add_32be
(
elst
,
-
1
);
bo_add_32be
(
elst
,
-
1
);
}
}
bo_add_16be
(
elst
,
1
);
bo_add_16be
(
elst
,
1
);
...
@@ -1326,12 +1334,14 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux )
...
@@ -1326,12 +1334,14 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux )
}
}
if
(
p_sys
->
b_64_ext
)
if
(
p_sys
->
b_64_ext
)
{
{
bo_add_64be
(
elst
,
p_stream
->
i_duration
*
i_movie_timescale
/
I64C
(
1000000
)
);
bo_add_64be
(
elst
,
p_stream
->
i_duration
*
i_movie_timescale
/
I64C
(
1000000
)
);
bo_add_64be
(
elst
,
0
);
bo_add_64be
(
elst
,
0
);
}
}
else
else
{
{
bo_add_32be
(
elst
,
p_stream
->
i_duration
*
i_movie_timescale
/
I64C
(
1000000
)
);
bo_add_32be
(
elst
,
p_stream
->
i_duration
*
i_movie_timescale
/
I64C
(
1000000
)
);
bo_add_32be
(
elst
,
0
);
bo_add_32be
(
elst
,
0
);
}
}
bo_add_16be
(
elst
,
1
);
bo_add_16be
(
elst
,
1
);
...
@@ -1499,8 +1509,6 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux )
...
@@ -1499,8 +1509,6 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux )
return
moov
;
return
moov
;
}
}
/****************************************************************************/
/****************************************************************************/
static
void
bo_init
(
bo_t
*
p_bo
,
int
i_size
,
uint8_t
*
p_buffer
,
static
void
bo_init
(
bo_t
*
p_bo
,
int
i_size
,
uint8_t
*
p_buffer
,
...
...
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