Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
2943dd35
Commit
2943dd35
authored
May 10, 2018
by
Haihao Xiang
Committed by
Mark Thompson
May 10, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cbs_h265: read/write content light level information SEI message
Signed-off-by:
Haihao Xiang
<
haihao.xiang@intel.com
>
parent
345b6962
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
0 deletions
+24
-0
cbs_h2645.c
libavcodec/cbs_h2645.c
+1
-0
cbs_h265.h
libavcodec/cbs_h265.h
+6
-0
cbs_h265_syntax_template.c
libavcodec/cbs_h265_syntax_template.c
+17
-0
No files found.
libavcodec/cbs_h2645.c
View file @
2943dd35
...
...
@@ -488,6 +488,7 @@ static void cbs_h265_free_sei_payload(H265RawSEIPayload *payload)
{
switch
(
payload
->
payload_type
)
{
case
HEVC_SEI_TYPE_MASTERING_DISPLAY_INFO
:
case
HEVC_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO
:
break
;
default:
av_buffer_unref
(
&
payload
->
payload
.
other
.
data_ref
);
...
...
libavcodec/cbs_h265.h
View file @
2943dd35
...
...
@@ -533,11 +533,17 @@ typedef struct H265RawSEIMasteringDisplayColourVolume {
uint32_t
min_display_mastering_luminance
;
}
H265RawSEIMasteringDisplayColourVolume
;
typedef
struct
H265RawSEIContentLightLevelInfo
{
uint16_t
max_content_light_level
;
uint16_t
max_pic_average_light_level
;
}
H265RawSEIContentLightLevelInfo
;
typedef
struct
H265RawSEIPayload
{
uint32_t
payload_type
;
uint32_t
payload_size
;
union
{
H265RawSEIMasteringDisplayColourVolume
mastering_display
;
H265RawSEIContentLightLevelInfo
content_light_level
;
struct
{
uint8_t
*
data
;
size_t
data_length
;
...
...
libavcodec/cbs_h265_syntax_template.c
View file @
2943dd35
...
...
@@ -1526,6 +1526,17 @@ static int FUNC(sei_mastering_display)(CodedBitstreamContext *ctx, RWContext *rw
return
0
;
}
static
int
FUNC
(
sei_content_light_level
)(
CodedBitstreamContext
*
ctx
,
RWContext
*
rw
,
H265RawSEIContentLightLevelInfo
*
current
)
{
int
err
;
u
(
16
,
max_content_light_level
,
0
,
MAX_UINT_BITS
(
16
));
u
(
16
,
max_pic_average_light_level
,
0
,
MAX_UINT_BITS
(
16
));
return
0
;
}
static
int
FUNC
(
sei_payload
)(
CodedBitstreamContext
*
ctx
,
RWContext
*
rw
,
H265RawSEIPayload
*
current
)
{
...
...
@@ -1545,6 +1556,12 @@ static int FUNC(sei_payload)(CodedBitstreamContext *ctx, RWContext *rw,
break
;
case
HEVC_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO
:
CHECK
(
FUNC
(
sei_content_light_level
)
(
ctx
,
rw
,
&
current
->
payload
.
content_light_level
));
break
;
default:
{
#ifdef READ
...
...
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