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
45697e6a
Commit
45697e6a
authored
Feb 04, 2024
by
Damiano Galassi
Committed by
James Almer
Feb 04, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: add ambient viewing environment packet side data.
parent
d525dbb4
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
1 deletion
+16
-1
APIchanges
doc/APIchanges
+3
-0
ffprobe.c
fftools/ffprobe.c
+3
-0
avpacket.c
libavcodec/avpacket.c
+1
-0
decode.c
libavcodec/decode.c
+1
-0
packet.h
libavcodec/packet.h
+7
-0
version.h
libavcodec/version.h
+1
-1
No files found.
doc/APIchanges
View file @
45697e6a
...
...
@@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09
API changes, most recent first:
2024-02-04 - xxxxxxxxxx - lavc 60.39.100 - packet.h
Add AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT.
2023-11-xx - xxxxxxxxxx - lavfi 9.16.100 - buffersink.h buffersrc.h
Add av_buffersink_get_colorspace and av_buffersink_get_color_range.
Add AVBufferSrcParameters.color_space and AVBufferSrcParameters.color_range.
...
...
fftools/ffprobe.c
View file @
45697e6a
...
...
@@ -2392,6 +2392,9 @@ static void print_pkt_side_data(WriterContext *w,
AVContentLightMetadata
*
metadata
=
(
AVContentLightMetadata
*
)
sd
->
data
;
print_int
(
"max_content"
,
metadata
->
MaxCLL
);
print_int
(
"max_average"
,
metadata
->
MaxFALL
);
}
else
if
(
sd
->
type
==
AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT
)
{
print_ambient_viewing_environment
(
w
,
(
const
AVAmbientViewingEnvironment
*
)
sd
->
data
);
}
else
if
(
sd
->
type
==
AV_PKT_DATA_DYNAMIC_HDR10_PLUS
)
{
AVDynamicHDRPlus
*
metadata
=
(
AVDynamicHDRPlus
*
)
sd
->
data
;
print_dynamic_hdr10_plus
(
w
,
metadata
);
...
...
libavcodec/avpacket.c
View file @
45697e6a
...
...
@@ -301,6 +301,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type)
case
AV_PKT_DATA_DOVI_CONF
:
return
"DOVI configuration record"
;
case
AV_PKT_DATA_S12M_TIMECODE
:
return
"SMPTE ST 12-1:2014 timecode"
;
case
AV_PKT_DATA_DYNAMIC_HDR10_PLUS
:
return
"HDR10+ Dynamic Metadata (SMPTE 2094-40)"
;
case
AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT
:
return
"Ambient viewing environment"
;
case
AV_PKT_DATA_IAMF_MIX_GAIN_PARAM
:
return
"IAMF Mix Gain Parameter Data"
;
case
AV_PKT_DATA_IAMF_DEMIXING_INFO_PARAM
:
return
"IAMF Demixing Info Parameter Data"
;
case
AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM
:
return
"IAMF Recon Gain Info Parameter Data"
;
...
...
libavcodec/decode.c
View file @
45697e6a
...
...
@@ -1434,6 +1434,7 @@ static const struct {
{
AV_PKT_DATA_CONTENT_LIGHT_LEVEL
,
AV_FRAME_DATA_CONTENT_LIGHT_LEVEL
},
{
AV_PKT_DATA_ICC_PROFILE
,
AV_FRAME_DATA_ICC_PROFILE
},
{
AV_PKT_DATA_DYNAMIC_HDR10_PLUS
,
AV_FRAME_DATA_DYNAMIC_HDR_PLUS
},
{
AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT
,
AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT
},
};
int
ff_decode_frame_props_from_pkt
(
const
AVCodecContext
*
avctx
,
...
...
libavcodec/packet.h
View file @
45697e6a
...
...
@@ -323,6 +323,13 @@ enum AVPacketSideDataType {
*/
AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM
,
/**
* Ambient viewing environment metadata, as defined by H.274. This metadata
* should be associated with a video stream and contains data in the form
* of the AVAmbientViewingEnvironment struct.
*/
AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT
,
/**
* The number of side data types.
* This is not part of the public API/ABI in the sense that it may
...
...
libavcodec/version.h
View file @
45697e6a
...
...
@@ -29,7 +29,7 @@
#include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 3
8
#define LIBAVCODEC_VERSION_MINOR 3
9
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...
...
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