History

avcodec: add ambient viewing environment packet side data.

Damiano Galassi committed 2 years ago

Commit 45697e61 parent d525dbb6 files · +16 −1Browse files

Unified · Split

6 files
  1. doc/APIchanges +3 −0
  2. fftools/ffprobe.c +3 −0
  3. libavcodec/avpacket.c +1 −0
  4. libavcodec/decode.c +1 −0
  5. libavcodec/packet.h +7 −0
  6. libavcodec/version.h +1 −1
doc/APIchanges+3−0
@@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 · 1 unmodified line
2 2
3API changes, most recent first:3API changes, most recent first:
4 4
52024-02-04 - xxxxxxxxxx - lavc 60.39.100 - packet.h
6 Add AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT.
7
52023-11-xx - xxxxxxxxxx - lavfi 9.16.100 - buffersink.h buffersrc.h82023-11-xx - xxxxxxxxxx - lavfi 9.16.100 - buffersink.h buffersrc.h
6 Add av_buffersink_get_colorspace and av_buffersink_get_color_range.9 Add av_buffersink_get_colorspace and av_buffersink_get_color_range.
7 Add AVBufferSrcParameters.color_space and AVBufferSrcParameters.color_range.10 Add AVBufferSrcParameters.color_space and AVBufferSrcParameters.color_range.
fftools/ffprobe.c+3−0
@@ -2392,6 +2392,9 @@ static void print_pkt_side_data(WriterContext *w, · 2391 unmodified lines
2392 AVContentLightMetadata *metadata = (AVContentLightMetadata *)sd->data;2392 AVContentLightMetadata *metadata = (AVContentLightMetadata *)sd->data;
2393 print_int("max_content", metadata->MaxCLL);2393 print_int("max_content", metadata->MaxCLL);
2394 print_int("max_average", metadata->MaxFALL);2394 print_int("max_average", metadata->MaxFALL);
2395 } else if (sd->type == AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT) {
2396 print_ambient_viewing_environment(
2397 w, (const AVAmbientViewingEnvironment *)sd->data);
2395 } else if (sd->type == AV_PKT_DATA_DYNAMIC_HDR10_PLUS) {2398 } else if (sd->type == AV_PKT_DATA_DYNAMIC_HDR10_PLUS) {
2396 AVDynamicHDRPlus *metadata = (AVDynamicHDRPlus *)sd->data;2399 AVDynamicHDRPlus *metadata = (AVDynamicHDRPlus *)sd->data;
2397 print_dynamic_hdr10_plus(w, metadata);2400 print_dynamic_hdr10_plus(w, metadata);
libavcodec/avpacket.c+1−0
@@ -301,6 +301,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) · 300 unmodified lines
301 case AV_PKT_DATA_DOVI_CONF: return "DOVI configuration record";301 case AV_PKT_DATA_DOVI_CONF: return "DOVI configuration record";
302 case AV_PKT_DATA_S12M_TIMECODE: return "SMPTE ST 12-1:2014 timecode";302 case AV_PKT_DATA_S12M_TIMECODE: return "SMPTE ST 12-1:2014 timecode";
303 case AV_PKT_DATA_DYNAMIC_HDR10_PLUS: return "HDR10+ Dynamic Metadata (SMPTE 2094-40)";303 case AV_PKT_DATA_DYNAMIC_HDR10_PLUS: return "HDR10+ Dynamic Metadata (SMPTE 2094-40)";
304 case AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT:return "Ambient viewing environment";
304 case AV_PKT_DATA_IAMF_MIX_GAIN_PARAM: return "IAMF Mix Gain Parameter Data";305 case AV_PKT_DATA_IAMF_MIX_GAIN_PARAM: return "IAMF Mix Gain Parameter Data";
305 case AV_PKT_DATA_IAMF_DEMIXING_INFO_PARAM: return "IAMF Demixing Info Parameter Data";306 case AV_PKT_DATA_IAMF_DEMIXING_INFO_PARAM: return "IAMF Demixing Info Parameter Data";
306 case AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM: return "IAMF Recon Gain Info Parameter Data";307 case AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM: return "IAMF Recon Gain Info Parameter Data";
libavcodec/decode.c+1−0
@@ -1434,6 +1434,7 @@ static const struct { · 1433 unmodified lines
1434 { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL },1434 { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL },
1435 { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE },1435 { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE },
1436 { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS },1436 { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS },
1437 { AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT },
1437};1438};
1438 1439
1439int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx,1440int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx,
libavcodec/packet.h+7−0
@@ -323,6 +323,13 @@ enum AVPacketSideDataType { · 322 unmodified lines
323 */323 */
324 AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM,324 AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM,
325 325
326 /**
327 * Ambient viewing environment metadata, as defined by H.274. This metadata
328 * should be associated with a video stream and contains data in the form
329 * of the AVAmbientViewingEnvironment struct.
330 */
331 AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,
332
326 /**333 /**
327 * The number of side data types.334 * The number of side data types.
328 * This is not part of the public API/ABI in the sense that it may335 * This is not part of the public API/ABI in the sense that it may
libavcodec/version.h+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29 29
30#include "version_major.h"30#include "version_major.h"
31 31
32#define LIBAVCODEC_VERSION_MINOR 3832#define LIBAVCODEC_VERSION_MINOR 39
33#define LIBAVCODEC_VERSION_MICRO 10033#define LIBAVCODEC_VERSION_MICRO 100
34 34
35#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \35#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t