Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
25cd0e09
Commit
25cd0e09
authored
Mar 18, 2024
by
Niklas Haas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vf_showinfo: adapt to new AVFilmGrainParams
parent
a08f3587
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
11 deletions
+15
-11
vf_showinfo.c
libavfilter/vf_showinfo.c
+15
-11
No files found.
libavfilter/vf_showinfo.c
View file @
25cd0e09
...
...
@@ -452,6 +452,11 @@ static void dump_sei_film_grain_params_metadata(AVFilterContext *ctx, const AVFr
[
AV_FILM_GRAIN_PARAMS_H274
]
=
"h274"
,
};
const
char
*
color_range_str
=
av_color_range_name
(
fgp
->
color_range
);
const
char
*
color_primaries_str
=
av_color_primaries_name
(
fgp
->
color_primaries
);
const
char
*
color_trc_str
=
av_color_transfer_name
(
fgp
->
color_trc
);
const
char
*
colorspace_str
=
av_color_space_name
(
fgp
->
color_space
);
if
(
fgp
->
type
>=
FF_ARRAY_ELEMS
(
film_grain_type_names
))
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"invalid data
\n
"
);
return
;
...
...
@@ -459,6 +464,16 @@ static void dump_sei_film_grain_params_metadata(AVFilterContext *ctx, const AVFr
av_log
(
ctx
,
AV_LOG_INFO
,
"type %s; "
,
film_grain_type_names
[
fgp
->
type
]);
av_log
(
ctx
,
AV_LOG_INFO
,
"seed=%"
PRIu64
"; "
,
fgp
->
seed
);
av_log
(
ctx
,
AV_LOG_INFO
,
"width=%d; "
,
fgp
->
width
);
av_log
(
ctx
,
AV_LOG_INFO
,
"height=%d; "
,
fgp
->
height
);
av_log
(
ctx
,
AV_LOG_INFO
,
"subsampling_x=%d; "
,
fgp
->
subsampling_x
);
av_log
(
ctx
,
AV_LOG_INFO
,
"subsampling_y=%d; "
,
fgp
->
subsampling_y
);
av_log
(
ctx
,
AV_LOG_INFO
,
"color_range=%s; "
,
color_range_str
?
color_range_str
:
"unknown"
);
av_log
(
ctx
,
AV_LOG_INFO
,
"color_primaries=%s; "
,
color_primaries_str
?
color_primaries_str
:
"unknown"
);
av_log
(
ctx
,
AV_LOG_INFO
,
"color_trc=%s; "
,
color_trc_str
?
color_trc_str
:
"unknown"
);
av_log
(
ctx
,
AV_LOG_INFO
,
"color_space=%s; "
,
colorspace_str
?
colorspace_str
:
"unknown"
);
av_log
(
ctx
,
AV_LOG_INFO
,
"bit_depth_luma=%d; "
,
fgp
->
bit_depth_luma
);
av_log
(
ctx
,
AV_LOG_INFO
,
"bit_depth_chroma=%d; "
,
fgp
->
bit_depth_chroma
);
switch
(
fgp
->
type
)
{
case
AV_FILM_GRAIN_PARAMS_NONE
:
...
...
@@ -504,18 +519,7 @@ static void dump_sei_film_grain_params_metadata(AVFilterContext *ctx, const AVFr
}
case
AV_FILM_GRAIN_PARAMS_H274
:
{
const
AVFilmGrainH274Params
*
h274
=
&
fgp
->
codec
.
h274
;
const
char
*
color_range_str
=
av_color_range_name
(
h274
->
color_range
);
const
char
*
color_primaries_str
=
av_color_primaries_name
(
h274
->
color_primaries
);
const
char
*
color_trc_str
=
av_color_transfer_name
(
h274
->
color_trc
);
const
char
*
colorspace_str
=
av_color_space_name
(
h274
->
color_space
);
av_log
(
ctx
,
AV_LOG_INFO
,
"model_id=%d; "
,
h274
->
model_id
);
av_log
(
ctx
,
AV_LOG_INFO
,
"bit_depth_luma=%d; "
,
h274
->
bit_depth_luma
);
av_log
(
ctx
,
AV_LOG_INFO
,
"bit_depth_chroma=%d; "
,
h274
->
bit_depth_chroma
);
av_log
(
ctx
,
AV_LOG_INFO
,
"color_range=%s; "
,
color_range_str
?
color_range_str
:
"unknown"
);
av_log
(
ctx
,
AV_LOG_INFO
,
"color_primaries=%s; "
,
color_primaries_str
?
color_primaries_str
:
"unknown"
);
av_log
(
ctx
,
AV_LOG_INFO
,
"color_trc=%s; "
,
color_trc_str
?
color_trc_str
:
"unknown"
);
av_log
(
ctx
,
AV_LOG_INFO
,
"color_space=%s; "
,
colorspace_str
?
colorspace_str
:
"unknown"
);
av_log
(
ctx
,
AV_LOG_INFO
,
"blending_mode_id=%d; "
,
h274
->
blending_mode_id
);
av_log
(
ctx
,
AV_LOG_INFO
,
"log2_scale_factor=%d; "
,
h274
->
log2_scale_factor
);
...
...
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