| Message ID | 20200107050355.17503-1-lance.lmwang@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,v7,1/8] avutil: add AV_FRAME_DATA_USER_DATA_UNREGISTERED side data type | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
Quoting lance.lmwang@gmail.com (2020-01-07 06:03:48) > From: Limin Wang <lance.lmwang@gmail.com> > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > --- > doc/APIchanges | 3 +++ > libavutil/frame.c | 1 + > libavutil/frame.h | 8 ++++++++ > libavutil/version.h | 2 +- > 4 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/doc/APIchanges b/doc/APIchanges > index 3c24dc6fbc..6e1673e25e 100644 > --- a/doc/APIchanges > +++ b/doc/APIchanges > @@ -15,6 +15,9 @@ libavutil: 2017-10-21 > > API changes, most recent first: > > +2020-01-xx - xxxxxxxxxx - lavu 56.39.100 - frame.h > + Add AV_FRAME_DATA_USER_DATA_UNREGISTERED. > + > 2019-12-27 - xxxxxxxxxx - lavu 56.38.100 - eval.h > Add av_expr_count_func(). > > diff --git a/libavutil/frame.c b/libavutil/frame.c > index e4038096c2..1d0faec687 100644 > --- a/libavutil/frame.c > +++ b/libavutil/frame.c > @@ -842,6 +842,7 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type) > #endif > case AV_FRAME_DATA_DYNAMIC_HDR_PLUS: return "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)"; > case AV_FRAME_DATA_REGIONS_OF_INTEREST: return "Regions Of Interest"; > + case AV_FRAME_DATA_USER_DATA_UNREGISTERED: return "User Data Unregistered"; > } > return NULL; > } > diff --git a/libavutil/frame.h b/libavutil/frame.h > index b5afb58634..54863c86ce 100644 > --- a/libavutil/frame.h > +++ b/libavutil/frame.h > @@ -179,6 +179,14 @@ enum AVFrameSideDataType { > * array element is implied by AVFrameSideData.size / AVRegionOfInterest.self_size. > */ > AV_FRAME_DATA_REGIONS_OF_INTEREST, > + > + /** > + * User data unregistered metadata associated with a video frame. > + * This is the H.26[45] UDU SEI message, and shouldn't be used for any other purpose > + * The data is stored as uint8_t in AVFrameSideData.data which is 16 bytes of > + * uuid_iso_iec_11578 followed by AVFrameSideData.size-16 bytes of user_data_payload_byte. > + */ > + AV_FRAME_DATA_USER_DATA_UNREGISTERED, This naming is too generic IMO. Something like AV_FRAME_DATA_SEI_UNREGISTERED would make it clearer that it refers to the H.26x concept rather than any other kind of "registration" or "user data".
On Wed, Jan 08, 2020 at 06:07:29AM +0100, Anton Khirnov wrote: > Quoting lance.lmwang@gmail.com (2020-01-07 06:03:48) > > From: Limin Wang <lance.lmwang@gmail.com> > > > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > > --- > > doc/APIchanges | 3 +++ > > libavutil/frame.c | 1 + > > libavutil/frame.h | 8 ++++++++ > > libavutil/version.h | 2 +- > > 4 files changed, 13 insertions(+), 1 deletion(-) > > > > diff --git a/doc/APIchanges b/doc/APIchanges > > index 3c24dc6fbc..6e1673e25e 100644 > > --- a/doc/APIchanges > > +++ b/doc/APIchanges > > @@ -15,6 +15,9 @@ libavutil: 2017-10-21 > > > > API changes, most recent first: > > > > +2020-01-xx - xxxxxxxxxx - lavu 56.39.100 - frame.h > > + Add AV_FRAME_DATA_USER_DATA_UNREGISTERED. > > + > > 2019-12-27 - xxxxxxxxxx - lavu 56.38.100 - eval.h > > Add av_expr_count_func(). > > > > diff --git a/libavutil/frame.c b/libavutil/frame.c > > index e4038096c2..1d0faec687 100644 > > --- a/libavutil/frame.c > > +++ b/libavutil/frame.c > > @@ -842,6 +842,7 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type) > > #endif > > case AV_FRAME_DATA_DYNAMIC_HDR_PLUS: return "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)"; > > case AV_FRAME_DATA_REGIONS_OF_INTEREST: return "Regions Of Interest"; > > + case AV_FRAME_DATA_USER_DATA_UNREGISTERED: return "User Data Unregistered"; > > } > > return NULL; > > } > > diff --git a/libavutil/frame.h b/libavutil/frame.h > > index b5afb58634..54863c86ce 100644 > > --- a/libavutil/frame.h > > +++ b/libavutil/frame.h > > @@ -179,6 +179,14 @@ enum AVFrameSideDataType { > > * array element is implied by AVFrameSideData.size / AVRegionOfInterest.self_size. > > */ > > AV_FRAME_DATA_REGIONS_OF_INTEREST, > > + > > + /** > > + * User data unregistered metadata associated with a video frame. > > + * This is the H.26[45] UDU SEI message, and shouldn't be used for any other purpose > > + * The data is stored as uint8_t in AVFrameSideData.data which is 16 bytes of > > + * uuid_iso_iec_11578 followed by AVFrameSideData.size-16 bytes of user_data_payload_byte. > > + */ > > + AV_FRAME_DATA_USER_DATA_UNREGISTERED, > > This naming is too generic IMO. Something like > AV_FRAME_DATA_SEI_UNREGISTERED would make it clearer that it refers to > the H.26x concept rather than any other kind of "registration" or "user > data". Sure, I'll change to AV_FRAME_DATA_SEI_UNREGISTERED. > > -- > Anton Khirnov > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/doc/APIchanges b/doc/APIchanges index 3c24dc6fbc..6e1673e25e 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2020-01-xx - xxxxxxxxxx - lavu 56.39.100 - frame.h + Add AV_FRAME_DATA_USER_DATA_UNREGISTERED. + 2019-12-27 - xxxxxxxxxx - lavu 56.38.100 - eval.h Add av_expr_count_func(). diff --git a/libavutil/frame.c b/libavutil/frame.c index e4038096c2..1d0faec687 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -842,6 +842,7 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type) #endif case AV_FRAME_DATA_DYNAMIC_HDR_PLUS: return "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)"; case AV_FRAME_DATA_REGIONS_OF_INTEREST: return "Regions Of Interest"; + case AV_FRAME_DATA_USER_DATA_UNREGISTERED: return "User Data Unregistered"; } return NULL; } diff --git a/libavutil/frame.h b/libavutil/frame.h index b5afb58634..54863c86ce 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -179,6 +179,14 @@ enum AVFrameSideDataType { * array element is implied by AVFrameSideData.size / AVRegionOfInterest.self_size. */ AV_FRAME_DATA_REGIONS_OF_INTEREST, + + /** + * User data unregistered metadata associated with a video frame. + * This is the H.26[45] UDU SEI message, and shouldn't be used for any other purpose + * The data is stored as uint8_t in AVFrameSideData.data which is 16 bytes of + * uuid_iso_iec_11578 followed by AVFrameSideData.size-16 bytes of user_data_payload_byte. + */ + AV_FRAME_DATA_USER_DATA_UNREGISTERED, }; enum AVActiveFormatDescription { diff --git a/libavutil/version.h b/libavutil/version.h index af8f614aff..2bc1b98615 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 38 +#define LIBAVUTIL_VERSION_MINOR 39 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \