Unified · Split
| @@ -65,6 +65,7 @@ const SideDataMap ff_sd_global_map[] = { · 64 unmodified lines | |||
| 65 | { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, | 65 | { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, |
| 66 | { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, | 66 | { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, |
| 67 | { AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT }, | 67 | { AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT }, |
| 68 | { AV_PKT_DATA_3D_REFERENCE_DISPLAYS, AV_FRAME_DATA_3D_REFERENCE_DISPLAYS }, | ||
| 68 | { AV_PKT_DATA_NB }, | 69 | { AV_PKT_DATA_NB }, |
| 69 | }; | 70 | }; |
| 70 | 71 | ||
| @@ -308,6 +308,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) · 307 unmodified lines | |||
| 308 | case AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM: return "IAMF Recon Gain Info Parameter Data"; | 308 | case AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM: return "IAMF Recon Gain Info Parameter Data"; |
| 309 | case AV_PKT_DATA_FRAME_CROPPING: return "Frame Cropping"; | 309 | case AV_PKT_DATA_FRAME_CROPPING: return "Frame Cropping"; |
| 310 | case AV_PKT_DATA_LCEVC: return "LCEVC NAL data"; | 310 | case AV_PKT_DATA_LCEVC: return "LCEVC NAL data"; |
| 311 | case AV_PKT_DATA_3D_REFERENCE_DISPLAYS: return "3D Reference Displays Info"; | ||
| 311 | } | 312 | } |
| 312 | return NULL; | 313 | return NULL; |
| 313 | } | 314 | } |
| @@ -345,6 +345,17 @@ enum AVPacketSideDataType { · 344 unmodified lines | |||
| 345 | */ | 345 | */ |
| 346 | AV_PKT_DATA_LCEVC, | 346 | AV_PKT_DATA_LCEVC, |
| 347 | 347 | ||
| 348 | /** | ||
| 349 | * This side data contains information about the reference display width(s) | ||
| 350 | * and reference viewing distance(s) as well as information about the | ||
| 351 | * corresponding reference stereo pair(s), i.e., the pair(s) of views to be | ||
| 352 | * displayed for the viewer's left and right eyes on the reference display | ||
| 353 | * at the reference viewing distance. | ||
| 354 | * The payload is the AV3DReferenceDisplaysInfo struct defined in | ||
| 355 | * libavutil/tdrdi.h. | ||
| 356 | */ | ||
| 357 | AV_PKT_DATA_3D_REFERENCE_DISPLAYS, | ||
| 358 | |||
| 348 | /** | 359 | /** |
| 349 | * The number of side data types. | 360 | * The number of side data types. |
| 350 | * This is not part of the public API/ABI in the sense that it may | 361 | * This is not part of the public API/ABI in the sense that it may |
| @@ -30,7 +30,7 @@ · 29 unmodified lines | |||
| 30 | #include "version_major.h" | 30 | #include "version_major.h" |
| 31 | 31 | ||
| 32 | #define LIBAVCODEC_VERSION_MINOR 4 | 32 | #define LIBAVCODEC_VERSION_MINOR 4 |
| 33 | #define LIBAVCODEC_VERSION_MICRO 100 | 33 | #define LIBAVCODEC_VERSION_MICRO 101 |
| 34 | 34 | ||
| 35 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | 35 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
| 36 | LIBAVCODEC_VERSION_MINOR, \ | 36 | LIBAVCODEC_VERSION_MINOR, \ |