| Message ID | 20230328134548.1580-1-d.kozinski@samsung.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,v18,01/10] avcodec/evc: MPEG-5 EVC codec registration | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Mar 28, 2023, 15:46 by d.kozinski@samsung.com: > Added prerequisites that must be met before providing support for the MPEG-5 EVC codec > - Added new entry to codec IDs list > - Added new entry to the codec descriptor list > - Bumped libavcodec minor version > - Added profiles for EVC codec > > Signed-off-by: Dawid Kozinski <d.kozinski@samsung.com> > --- > libavcodec/avcodec.h | 3 +++ > libavcodec/codec_desc.c | 8 ++++++++ > libavcodec/codec_id.h | 1 + > libavcodec/profiles.c | 6 ++++++ > libavcodec/profiles.h | 1 + > libavcodec/version.h | 2 +- > 6 files changed, 20 insertions(+), 1 deletion(-) > Patchset looks good to me now. Thanks! I'll push it tonight. As for your change in MAINTAINERS, the discussion is still ongoing, so I'll push it with the condition that it's just there to let submitters know who to ping, rather than requesting push access. If you'd like push access, just send a request on the ML.
> -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Lynne > Sent: środa, 29 marca 2023 08:03 > To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> > Cc: ffmpeg-devel@ffmpeg.org; d.frankiewic@samsung.com; Dawid Kozinski > <d.kozinski@samsung.com> > Subject: Re: [FFmpeg-devel] [PATCH v18 01/10] avcodec/evc: MPEG-5 EVC > codec registration > > Mar 28, 2023, 15:46 by d.kozinski@samsung.com: > > > Added prerequisites that must be met before providing support for the > > MPEG-5 EVC codec > > - Added new entry to codec IDs list > > - Added new entry to the codec descriptor list > > - Bumped libavcodec minor version > > - Added profiles for EVC codec > > > > Signed-off-by: Dawid Kozinski <d.kozinski@samsung.com> > > --- > > libavcodec/avcodec.h | 3 +++ > > libavcodec/codec_desc.c | 8 ++++++++ > > libavcodec/codec_id.h | 1 + > > libavcodec/profiles.c | 6 ++++++ > > libavcodec/profiles.h | 1 + > > libavcodec/version.h | 2 +- > > 6 files changed, 20 insertions(+), 1 deletion(-) > > > > Patchset looks good to me now. Thanks! > I'll push it tonight. > > As for your change in MAINTAINERS, the discussion is still ongoing, so I'll push it > with the condition that it's just there to let submitters know who to ping, rather > than requesting push access. If you'd like push access, just send a request on the > ML. We have just uploaded new fixes. Everything pointed out by Almer has been fixed. > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://protect2.fireeye.com/v1/url?k=f1fcf101-ae67c9fc-f1fd7a4e- > 000babff317b-b98a81531cb689f6&q=1&e=dd4c3dd7-1630-42d4-826d- > d2927424d4e3&u=https%3A%2F%2Fffmpeg.org%2Fmailman%2Flistinfo%2Fffmp > eg-devel > > To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org > with subject "unsubscribe".
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 18ca0e2494..1e87acaf4d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1704,6 +1704,9 @@ typedef struct AVCodecContext { #define FF_PROFILE_KLVA_SYNC 0 #define FF_PROFILE_KLVA_ASYNC 1 +#define FF_PROFILE_EVC_BASELINE 0 +#define FF_PROFILE_EVC_MAIN 1 + /** * level * - encoding: Set by user. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index d912704891..e59a1a30ff 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1923,6 +1923,14 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ViewQuest VQC"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_EVC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "evc", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-5 EVC (Essential Video Coding)"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_evc_profiles), + }, /* various PCM "codecs" */ { diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 64df9699f4..c6c07bd18c 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -320,6 +320,7 @@ enum AVCodecID { AV_CODEC_ID_WBMP, AV_CODEC_ID_MEDIA100, AV_CODEC_ID_VQC, + AV_CODEC_ID_EVC, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index 545626337c..c646a3f54d 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -194,4 +194,10 @@ const AVProfile ff_arib_caption_profiles[] = { { FF_PROFILE_UNKNOWN } }; +const AVProfile ff_evc_profiles[] = { + { FF_PROFILE_EVC_BASELINE, "Baseline" }, + { FF_PROFILE_EVC_MAIN, "Main" }, + { FF_PROFILE_UNKNOWN }, +}; + #endif /* !CONFIG_SMALL */ diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h index 1d523992fc..c0eacae5c1 100644 --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@ -74,5 +74,6 @@ extern const AVProfile ff_sbc_profiles[]; extern const AVProfile ff_prores_profiles[]; extern const AVProfile ff_mjpeg_profiles[]; extern const AVProfile ff_arib_caption_profiles[]; +extern const AVProfile ff_evc_profiles[]; #endif /* AVCODEC_PROFILES_H */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 7acb261bb3..ecb096f38b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 7 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \
Added prerequisites that must be met before providing support for the MPEG-5 EVC codec - Added new entry to codec IDs list - Added new entry to the codec descriptor list - Bumped libavcodec minor version - Added profiles for EVC codec Signed-off-by: Dawid Kozinski <d.kozinski@samsung.com> --- libavcodec/avcodec.h | 3 +++ libavcodec/codec_desc.c | 8 ++++++++ libavcodec/codec_id.h | 1 + libavcodec/profiles.c | 6 ++++++ libavcodec/profiles.h | 1 + libavcodec/version.h | 2 +- 6 files changed, 20 insertions(+), 1 deletion(-)