Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
c84e8acb
Commit
c84e8acb
authored
Mar 14, 2018
by
François Cartegnie
🤞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: mp4: simplify colr lookup
Some were missing, and that's a subset of ISO/IEC 23001-8:2016
parent
8a9e2e8f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
15 deletions
+6
-15
modules/demux/mp4/essetup.c
modules/demux/mp4/essetup.c
+6
-15
No files found.
modules/demux/mp4/essetup.c
View file @
c84e8acb
...
@@ -498,21 +498,12 @@ int SetupVideoES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
...
@@ -498,21 +498,12 @@ int SetupVideoES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
if
(
BOXDATA
(
p_colr
)
->
i_type
==
VLC_FOURCC
(
'n'
,
'c'
,
'l'
,
'c'
)
||
if
(
BOXDATA
(
p_colr
)
->
i_type
==
VLC_FOURCC
(
'n'
,
'c'
,
'l'
,
'c'
)
||
BOXDATA
(
p_colr
)
->
i_type
==
VLC_FOURCC
(
'n'
,
'c'
,
'l'
,
'x'
)
)
BOXDATA
(
p_colr
)
->
i_type
==
VLC_FOURCC
(
'n'
,
'c'
,
'l'
,
'x'
)
)
{
{
switch
(
BOXDATA
(
p_colr
)
->
nclc
.
i_primary_idx
)
p_track
->
fmt
.
video
.
primaries
=
{
iso_23001_8_cp_to_vlc_primaries
(
BOXDATA
(
p_colr
)
->
nclc
.
i_primary_idx
);
case
1
:
p_track
->
fmt
.
video
.
primaries
=
COLOR_PRIMARIES_BT709
;
break
;
p_track
->
fmt
.
video
.
transfer
=
case
5
:
p_track
->
fmt
.
video
.
primaries
=
COLOR_PRIMARIES_BT601_625
;
break
;
iso_23001_8_tc_to_vlc_xfer
(
BOXDATA
(
p_colr
)
->
nclc
.
i_transfer_function_idx
);
case
6
:
p_track
->
fmt
.
video
.
primaries
=
COLOR_PRIMARIES_BT601_525
;
break
;
p_track
->
fmt
.
video
.
space
=
}
iso_23001_8_mc_to_vlc_coeffs
(
BOXDATA
(
p_colr
)
->
nclc
.
i_matrix_idx
);
switch
(
BOXDATA
(
p_colr
)
->
nclc
.
i_transfer_function_idx
)
{
case
1
:
p_track
->
fmt
.
video
.
transfer
=
TRANSFER_FUNC_BT709
;
break
;
}
switch
(
BOXDATA
(
p_colr
)
->
nclc
.
i_matrix_idx
)
{
case
1
:
p_track
->
fmt
.
video
.
space
=
COLOR_SPACE_BT709
;
break
;
case
2
:
p_track
->
fmt
.
video
.
space
=
COLOR_SPACE_BT601
;
break
;
}
p_track
->
fmt
.
video
.
b_color_range_full
=
BOXDATA
(
p_colr
)
->
i_type
==
VLC_FOURCC
(
'n'
,
'c'
,
'l'
,
'x'
)
&&
p_track
->
fmt
.
video
.
b_color_range_full
=
BOXDATA
(
p_colr
)
->
i_type
==
VLC_FOURCC
(
'n'
,
'c'
,
'l'
,
'x'
)
&&
(
BOXDATA
(
p_colr
)
->
nclc
.
i_full_range
>>
7
)
!=
0
;
(
BOXDATA
(
p_colr
)
->
nclc
.
i_full_range
>>
7
)
!=
0
;
}
}
...
...
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