lavu/frame: add side data storing view ID for multi-view video

Anton Khirnov committed 9 years ago

Commit 6940a6d1 parent a7505ec6 files · +18 −1Browse files

Unified · Split

6 files

@@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07 · 1 unmodified line
2		2
3	API changes, most recent first:	3	API changes, most recent first:
4		4
		5	2024-09-23 - xxxxxxx - lavu 59.38.100 - frame.h
		6	Add AV_FRAME_DATA_VIEW_ID.
		7
5	2024-09-23 - xxxxxxxxxx - lavc 61.18.100 - avcodec.h	8	2024-09-23 - xxxxxxxxxx - lavc 61.18.100 - avcodec.h
6	Add a new flag AV_CODEC_EXPORT_DATA_ENHANCEMENTS for export_side_data.	9	Add a new flag AV_CODEC_EXPORT_DATA_ENHANCEMENTS for export_side_data.
7		10

         } else if (sd->type == AV_FRAME_DATA_FILM_GRAIN_PARAMS) {
             AVFilmGrainParams *fgp = (AVFilmGrainParams *)sd->data;
             print_film_grain_params(w, fgp);
+        } else if (sd->type == AV_FRAME_DATA_VIEW_ID) {
+            print_int("view_id", *(int*)sd->data);
         }
         writer_print_section_footer(w);
     }

         case AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT:
             dump_ambient_viewing_environment(ctx, sd);
             break;
+        case AV_FRAME_DATA_VIEW_ID:
+            av_log(ctx, AV_LOG_INFO, "view id: %d\n", *(int*)sd->data);
         default:
             if (name)
                 av_log(ctx, AV_LOG_INFO,

@@ -47,6 +47,7 @@ static const AVSideDataDescriptor sd_props[] = { · 46 unmodified lines
47	[AV_FRAME_DATA_DOVI_RPU_BUFFER] = { "Dolby Vision RPU Data" },	47	[AV_FRAME_DATA_DOVI_RPU_BUFFER] = { "Dolby Vision RPU Data" },
48	[AV_FRAME_DATA_DOVI_METADATA] = { "Dolby Vision Metadata" },	48	[AV_FRAME_DATA_DOVI_METADATA] = { "Dolby Vision Metadata" },
49	[AV_FRAME_DATA_LCEVC] = { "LCEVC NAL data" },	49	[AV_FRAME_DATA_LCEVC] = { "LCEVC NAL data" },
		50	[AV_FRAME_DATA_VIEW_ID] = { "View ID" },
50	[AV_FRAME_DATA_STEREO3D] = { "Stereo 3D", AV_SIDE_DATA_PROP_GLOBAL },	51	[AV_FRAME_DATA_STEREO3D] = { "Stereo 3D", AV_SIDE_DATA_PROP_GLOBAL },
51	[AV_FRAME_DATA_REPLAYGAIN] = { "AVReplayGain", AV_SIDE_DATA_PROP_GLOBAL },	52	[AV_FRAME_DATA_REPLAYGAIN] = { "AVReplayGain", AV_SIDE_DATA_PROP_GLOBAL },
52	[AV_FRAME_DATA_DISPLAYMATRIX] = { "3x3 displaymatrix", AV_SIDE_DATA_PROP_GLOBAL },	53	[AV_FRAME_DATA_DISPLAYMATRIX] = { "3x3 displaymatrix", AV_SIDE_DATA_PROP_GLOBAL },

@@ -234,6 +234,15 @@ enum AVFrameSideDataType { · 233 unmodified lines
234	* bytes intact.	234	* bytes intact.
235	*/	235	*/
236	AV_FRAME_DATA_LCEVC,	236	AV_FRAME_DATA_LCEVC,
		237
		238	/**
		239	* This side data must be associated with a video frame.
		240	* The presence of this side data indicates that the video stream is
		241	* composed of multiple views (e.g. stereoscopic 3D content,
		242	* cf. H.264 Annex H or H.265 Annex G).
		243	* The data is an int storing the view ID.
		244	*/
		245	AV_FRAME_DATA_VIEW_ID,
237	};	246	};
238		247
239	enum AVActiveFormatDescription {	248	enum AVActiveFormatDescription {

@@ -79,7 +79,7 @@ · 78 unmodified lines
79	*/	79	*/
80		80
81	#define LIBAVUTIL_VERSION_MAJOR 59	81	#define LIBAVUTIL_VERSION_MAJOR 59
82	#define LIBAVUTIL_VERSION_MINOR 37	82	#define LIBAVUTIL_VERSION_MINOR 38
83	#define LIBAVUTIL_VERSION_MICRO 100	83	#define LIBAVUTIL_VERSION_MICRO 100
84		84
85	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \	85	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

Keyboard shortcuts