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
36c95034
Commit
36c95034
authored
Dec 13, 2018
by
Steve Lhomme
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
av1: read the color range as a video_color_range_t
parent
e0fd9d2a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
modules/packetizer/av1.c
modules/packetizer/av1.c
+2
-2
modules/packetizer/av1_obu.c
modules/packetizer/av1_obu.c
+2
-2
modules/packetizer/av1_obu.h
modules/packetizer/av1_obu.h
+1
-1
No files found.
modules/packetizer/av1.c
View file @
36c95034
...
@@ -136,7 +136,7 @@ static void UpdateDecoderFormat(decoder_t *p_dec)
...
@@ -136,7 +136,7 @@ static void UpdateDecoderFormat(decoder_t *p_dec)
video_color_primaries_t
prim
;
video_color_primaries_t
prim
;
video_color_space_t
space
;
video_color_space_t
space
;
video_transfer_func_t
xfer
;
video_transfer_func_t
xfer
;
bool
full
;
video_color_range_t
full
;
if
(
p_dec
->
fmt_in
.
video
.
primaries
==
COLOR_PRIMARIES_UNDEF
&&
if
(
p_dec
->
fmt_in
.
video
.
primaries
==
COLOR_PRIMARIES_UNDEF
&&
AV1_get_colorimetry
(
p_sys
->
p_sequence_header
,
&
prim
,
&
xfer
,
&
space
,
&
full
)
&&
AV1_get_colorimetry
(
p_sys
->
p_sequence_header
,
&
prim
,
&
xfer
,
&
space
,
&
full
)
&&
prim
!=
COLOR_PRIMARIES_UNDEF
&&
prim
!=
COLOR_PRIMARIES_UNDEF
&&
...
@@ -147,7 +147,7 @@ static void UpdateDecoderFormat(decoder_t *p_dec)
...
@@ -147,7 +147,7 @@ static void UpdateDecoderFormat(decoder_t *p_dec)
p_dec
->
fmt_out
.
video
.
primaries
=
prim
;
p_dec
->
fmt_out
.
video
.
primaries
=
prim
;
p_dec
->
fmt_out
.
video
.
transfer
=
xfer
;
p_dec
->
fmt_out
.
video
.
transfer
=
xfer
;
p_dec
->
fmt_out
.
video
.
space
=
space
;
p_dec
->
fmt_out
.
video
.
space
=
space
;
p_dec
->
fmt_out
.
video
.
color_range
=
full
?
COLOR_RANGE_FULL
:
COLOR_RANGE_LIMITED
;
p_dec
->
fmt_out
.
video
.
color_range
=
full
;
}
}
if
(
!
p_dec
->
fmt_in
.
i_extra
&&
!
p_dec
->
fmt_out
.
i_extra
)
if
(
!
p_dec
->
fmt_in
.
i_extra
&&
!
p_dec
->
fmt_out
.
i_extra
)
...
...
modules/packetizer/av1_obu.c
View file @
36c95034
...
@@ -535,14 +535,14 @@ bool AV1_get_colorimetry(const av1_OBU_sequence_header_t *p_seq,
...
@@ -535,14 +535,14 @@ bool AV1_get_colorimetry(const av1_OBU_sequence_header_t *p_seq,
video_color_primaries_t
*
p_primaries
,
video_color_primaries_t
*
p_primaries
,
video_transfer_func_t
*
p_transfer
,
video_transfer_func_t
*
p_transfer
,
video_color_space_t
*
p_colorspace
,
video_color_space_t
*
p_colorspace
,
bool
*
p_full_range
)
video_color_range_t
*
p_full_range
)
{
{
if
(
!
p_seq
->
color_config
.
color_description_present_flag
)
if
(
!
p_seq
->
color_config
.
color_description_present_flag
)
return
false
;
return
false
;
*
p_primaries
=
iso_23001_8_cp_to_vlc_primaries
(
p_seq
->
color_config
.
color_primaries
);
*
p_primaries
=
iso_23001_8_cp_to_vlc_primaries
(
p_seq
->
color_config
.
color_primaries
);
*
p_transfer
=
iso_23001_8_tc_to_vlc_xfer
(
p_seq
->
color_config
.
transfer_characteristics
);
*
p_transfer
=
iso_23001_8_tc_to_vlc_xfer
(
p_seq
->
color_config
.
transfer_characteristics
);
*
p_colorspace
=
iso_23001_8_mc_to_vlc_coeffs
(
p_seq
->
color_config
.
matrix_coefficients
);
*
p_colorspace
=
iso_23001_8_mc_to_vlc_coeffs
(
p_seq
->
color_config
.
matrix_coefficients
);
*
p_full_range
=
p_seq
->
color_config
.
color_range
==
COLOR_RANGE_FULL
;
*
p_full_range
=
p_seq
->
color_config
.
color_range
?
COLOR_RANGE_FULL
:
COLOR_RANGE_LIMITED
;
return
true
;
return
true
;
}
}
...
...
modules/packetizer/av1_obu.h
View file @
36c95034
...
@@ -165,7 +165,7 @@ void AV1_get_frame_max_dimensions(const av1_OBU_sequence_header_t *, unsigned *,
...
@@ -165,7 +165,7 @@ void AV1_get_frame_max_dimensions(const av1_OBU_sequence_header_t *, unsigned *,
void
AV1_get_profile_level
(
const
av1_OBU_sequence_header_t
*
,
int
*
,
int
*
,
int
*
);
void
AV1_get_profile_level
(
const
av1_OBU_sequence_header_t
*
,
int
*
,
int
*
,
int
*
);
bool
AV1_get_colorimetry
(
const
av1_OBU_sequence_header_t
*
,
bool
AV1_get_colorimetry
(
const
av1_OBU_sequence_header_t
*
,
video_color_primaries_t
*
,
video_transfer_func_t
*
,
video_color_primaries_t
*
,
video_transfer_func_t
*
,
video_color_space_t
*
,
bool
*
);
video_color_space_t
*
,
video_color_range_t
*
);
bool
AV1_get_frame_rate
(
const
av1_OBU_sequence_header_t
*
,
unsigned
*
,
unsigned
*
);
bool
AV1_get_frame_rate
(
const
av1_OBU_sequence_header_t
*
,
unsigned
*
,
unsigned
*
);
...
...
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