| Message ID | 20210111163319.13387-3-nuomi2021@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | add vvc raw demuxer, muxer, parser, metadata bsf | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/configure | warning | Failed to apply patch |
On 1/11/2021 1:33 PM, Nuo Mi wrote: > --- > libavcodec/avcodec.h | 2 ++ > libavcodec/codec_desc.c | 8 ++++++++ > libavcodec/codec_id.h | 2 ++ > libavcodec/profiles.c | 5 +++++ > libavcodec/profiles.h | 1 + > 5 files changed, 18 insertions(+) > > diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h > index 1d3099d50a..13a3191b53 100644 > --- a/libavcodec/avcodec.h > +++ b/libavcodec/avcodec.h > @@ -1961,6 +1961,8 @@ typedef struct AVCodecContext { > #define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3 > #define FF_PROFILE_HEVC_REXT 4 > > +#define FF_PROFILE_VVC_MAIN_10 1 > + > #define FF_PROFILE_AV1_MAIN 0 > #define FF_PROFILE_AV1_HIGH 1 > #define FF_PROFILE_AV1_PROFESSIONAL 2 > diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c > index 14757bf31b..a7594f9004 100644 > --- a/libavcodec/codec_desc.c > +++ b/libavcodec/codec_desc.c > @@ -1426,6 +1426,14 @@ static const AVCodecDescriptor codec_descriptors[] = { > .long_name = NULL_IF_CONFIG_SMALL("Microsoft Paint (MSP) version 2"), > .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, > }, > + { > + .id = AV_CODEC_ID_VVC, > + .type = AVMEDIA_TYPE_VIDEO, > + .name = "vvc", > + .long_name = NULL_IF_CONFIG_SMALL("H.266 / VVC (Versatile Video Coding)"), > + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, > + .profiles = NULL_IF_CONFIG_SMALL(ff_vvc_profiles), > + }, > { > .id = AV_CODEC_ID_Y41P, > .type = AVMEDIA_TYPE_VIDEO, > diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h > index 6133e03bb9..7a8a896bfe 100644 > --- a/libavcodec/codec_id.h > +++ b/libavcodec/codec_id.h > @@ -244,6 +244,8 @@ enum AVCodecID { > AV_CODEC_ID_PGX, > AV_CODEC_ID_AVS3, > AV_CODEC_ID_MSP2, > + AV_CODEC_ID_VVC, > +#define AV_CODEC_ID_H266 AV_CODEC_ID_VVC > > AV_CODEC_ID_Y41P = 0x8000, > AV_CODEC_ID_AVRP, > diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c > index e59a3a5c12..6dd6594319 100644 > --- a/libavcodec/profiles.c > +++ b/libavcodec/profiles.c > @@ -74,6 +74,11 @@ const AVProfile ff_h264_profiles[] = { > { FF_PROFILE_UNKNOWN }, > }; > > +const AVProfile ff_vvc_profiles[] = { > + { FF_PROFILE_VVC_MAIN_10, "Main 10" }, Added Main 10 4:4:4 as well, since some of the conformance samples used it, and applied. > + { FF_PROFILE_UNKNOWN }, > +}; > + > const AVProfile ff_hevc_profiles[] = { > { FF_PROFILE_HEVC_MAIN, "Main" }, > { FF_PROFILE_HEVC_MAIN_10, "Main 10" }, > diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h > index 6baaba5701..41a19aa9ad 100644 > --- a/libavcodec/profiles.h > +++ b/libavcodec/profiles.h > @@ -61,6 +61,7 @@ extern const AVProfile ff_dca_profiles[]; > extern const AVProfile ff_dnxhd_profiles[]; > extern const AVProfile ff_h264_profiles[]; > extern const AVProfile ff_hevc_profiles[]; > +extern const AVProfile ff_vvc_profiles[]; > extern const AVProfile ff_jpeg2000_profiles[]; > extern const AVProfile ff_mpeg2_video_profiles[]; > extern const AVProfile ff_mpeg4_video_profiles[]; >
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1d3099d50a..13a3191b53 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1961,6 +1961,8 @@ typedef struct AVCodecContext { #define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3 #define FF_PROFILE_HEVC_REXT 4 +#define FF_PROFILE_VVC_MAIN_10 1 + #define FF_PROFILE_AV1_MAIN 0 #define FF_PROFILE_AV1_HIGH 1 #define FF_PROFILE_AV1_PROFESSIONAL 2 diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 14757bf31b..a7594f9004 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1426,6 +1426,14 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Microsoft Paint (MSP) version 2"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, + { + .id = AV_CODEC_ID_VVC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vvc", + .long_name = NULL_IF_CONFIG_SMALL("H.266 / VVC (Versatile Video Coding)"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_vvc_profiles), + }, { .id = AV_CODEC_ID_Y41P, .type = AVMEDIA_TYPE_VIDEO, diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 6133e03bb9..7a8a896bfe 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -244,6 +244,8 @@ enum AVCodecID { AV_CODEC_ID_PGX, AV_CODEC_ID_AVS3, AV_CODEC_ID_MSP2, + AV_CODEC_ID_VVC, +#define AV_CODEC_ID_H266 AV_CODEC_ID_VVC AV_CODEC_ID_Y41P = 0x8000, AV_CODEC_ID_AVRP, diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index e59a3a5c12..6dd6594319 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -74,6 +74,11 @@ const AVProfile ff_h264_profiles[] = { { FF_PROFILE_UNKNOWN }, }; +const AVProfile ff_vvc_profiles[] = { + { FF_PROFILE_VVC_MAIN_10, "Main 10" }, + { FF_PROFILE_UNKNOWN }, +}; + const AVProfile ff_hevc_profiles[] = { { FF_PROFILE_HEVC_MAIN, "Main" }, { FF_PROFILE_HEVC_MAIN_10, "Main 10" }, diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h index 6baaba5701..41a19aa9ad 100644 --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@ -61,6 +61,7 @@ extern const AVProfile ff_dca_profiles[]; extern const AVProfile ff_dnxhd_profiles[]; extern const AVProfile ff_h264_profiles[]; extern const AVProfile ff_hevc_profiles[]; +extern const AVProfile ff_vvc_profiles[]; extern const AVProfile ff_jpeg2000_profiles[]; extern const AVProfile ff_mpeg2_video_profiles[]; extern const AVProfile ff_mpeg4_video_profiles[];