Attachment #907291 for bug #917591

View | Details | Raw Unified | Return to bug 917591 | Differences between

and this patch

Lines 2392-2397 static void print_pkt_side_data(WriterContext *w, Link Here

(-)a/fftools/ffprobe.c (+3 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);

Lines 301-306 const char *av_packet_side_data_name(enum AVPacketSideDataType type) Link Here

(-)a/libavcodec/avpacket.c (+1 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	}	305	}
305	return NULL;	306	return NULL;
306	}	307	}

Lines 1434-1439 static const struct { Link Here

(-)a/libavcodec/decode.c (+1 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
1439	int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx,	1440	int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx,

Lines 299-304 enum AVPacketSideDataType { Link Here

(-)a/libavcodec/packet.h (-1 / +7 lines)
299	*/	299	*/
300	AV_PKT_DATA_DYNAMIC_HDR10_PLUS,	300	AV_PKT_DATA_DYNAMIC_HDR10_PLUS,
301		301
		302	/**
		303	* Ambient viewing environment metadata, as defined by H.274.. This metadata
		304	* should be associated with a video stream and contains data in the form
		305	* of the AVAmbientViewingEnvironment struct.
		306	*/
		307	AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,
		308
302	/**	309	/**
303	* The number of side data types.	310	* The number of side data types.
304	* This is not part of the public API/ABI in the sense that it may	311	* This is not part of the public API/ABI in the sense that it may
305	-

Return to bug 917591