February 2023 - ffmpeg-cvslog

[ffmpeg-web] branch master updated. a378949 src/template_head2: Make "community" a seperate page containing Organisation and Code of Conduct.
by ffmpeg-git＠ffmpeg.org 28 Feb '23

28 Feb '23

The branch, master has been updated via a37894903a119b32570a81c890078ab3c41feb25 (commit) from 71d027fd1a741b2ae84c88b51434c523c6156b72 (commit) - Log ----------------------------------------------------------------- commit a37894903a119b32570a81c890078ab3c41feb25 Author: Thilo Borgmann <thilo.borgmann(a)mail.de> AuthorDate: Wed Feb 8 16:36:01 2023 +0100 Commit: Thilo Borgmann <thilo.borgmann(a)mail.de> CommitDate: Wed Mar 1 00:23:52 2023 +0100 src/template_head2: Make "community" a seperate page containing Organisation and Code of Conduct. diff --git a/src/template_head2 b/src/template_head2 index a0b11ab..7ba634b 100644 --- a/src/template_head2 +++ b/src/template_head2 @@ -21,8 +21,9 @@ <li><a href="index.html#news">News</a></li> <li><a href="download.html">Download</a></li> <li><a href="documentation.html">Documentation</a></li> - <li><a href="contact.html#MailingLists">Community</a> + <li><a href="community.html">Community</a> <ul> + <li><a href="community.html#CodeOfConduct">Code of Conduct</a></li> <li><a href="contact.html#MailingLists">Mailing Lists</a></li> <li><a href="contact.html#IRCChannels">IRC</a></li> <li><a href="contact.html#Forums">Forums</a></li> ----------------------------------------------------------------------- Summary of changes: src/template_head2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive --

1 0

doc: Merge doc/dev_community/* and Code of Conduct into a seperate file
by Thilo Borgmann 28 Feb '23

28 Feb '23

ffmpeg | branch: master | Thilo Borgmann <thilo.borgmann(a)mail.de> | Wed Feb 8 16:57:53 2023 +0100| [6709e468f6ce0febc914fece7cc5d08a9b0e7858] | committer: Thilo Borgmann doc: Merge doc/dev_community/* and Code of Conduct into a seperate file Remove doc/dev_communit markup files completely as they are at the wrong place. Create a new community page, merging all of doc/dev_community and subsection Code of Conduct into a common place. The corresponding patch to ffmpeg-web puts the Organisation & Code of Conduct into a seperate community chapter on the FFmpeg website. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6709e468f6ce0febc… --- doc/Makefile | 1 + doc/community.texi | 175 ++++++++++++++++++++++++++++++++ doc/dev_community/community.md | 86 ---------------- doc/dev_community/resolution_process.md | 91 ----------------- doc/developer.texi | 29 ------ doc/mailing-list-faq.texi | 2 +- 6 files changed, 177 insertions(+), 207 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 25774c7bad..67586e4b74 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -19,6 +19,7 @@ MANPAGES3 = $(LIBRARIES-yes:%=doc/%.3) MANPAGES = $(MANPAGES1) $(MANPAGES3) PODPAGES = $(AVPROGS-yes:%=doc/%.pod) $(AVPROGS-yes:%=doc/%-all.pod) $(COMPONENTS-yes:%=doc/%.pod) $(LIBRARIES-yes:%=doc/%.pod) HTMLPAGES = $(AVPROGS-yes:%=doc/%.html) $(AVPROGS-yes:%=doc/%-all.html) $(COMPONENTS-yes:%=doc/%.html) $(LIBRARIES-yes:%=doc/%.html) \ + doc/community.html \ doc/developer.html \ doc/faq.html \ doc/fate.html \ diff --git a/doc/community.texi b/doc/community.texi new file mode 100644 index 0000000000..5fdd5f6d36 --- /dev/null +++ b/doc/community.texi @@ -0,0 +1,175 @@ +\input texinfo @c -*- texinfo -*- +@documentencoding UTF-8 + +@settitle Community +@titlepage +@center @titlefont{Community} +@end titlepage + +@top + +@contents + +@anchor{Organisation} +@chapter Organisation + +The FFmpeg project is organized through a community working on global consensus. + +Decisions are taken by the ensemble of active members, through voting and are aided by two committees. + +@anchor{General Assembly} +@chapter General Assembly + +The ensemble of active members is called the General Assembly (GA). + +The General Assembly is sovereign and legitimate for all its decisions regarding the FFmpeg project. + +The General Assembly is made up of active contributors. + +Contributors are considered "active contributors" if they have pushed more than 20 patches in the last 36 months in the main FFmpeg repository, or if they have been voted in by the GA. + +Additional members are added to the General Assembly through a vote after proposal by a member of the General Assembly. They are part of the GA for two years, after which they need a confirmation by the GA. + +A script to generate the current members of the general assembly (minus members voted in) can be found in `tools/general_assembly.pl`. + +@anchor{Voting} +@chapter Voting + +Voting is done using a ranked voting system, currently running on https://vote.ffmpeg.org/ . + +Majority vote means more than 50% of the expressed ballots. + +@anchor{Technical Committee} +@chapter Technical Committee + +The Technical Committee (TC) is here to arbitrate and make decisions when technical conflicts occur in the project. They will consider the merits of all the positions, judge them and make a decision. + +The TC resolves technical conflicts but is not a technical steering committee. + +Decisions by the TC are binding for all the contributors. + +Decisions made by the TC can be re-opened after 1 year or by a majority vote of the General Assembly, requested by one of the member of the GA. + +The TC is elected by the General Assembly for a duration of 1 year, and is composed of 5 members. Members can be re-elected if they wish. A majority vote in the General Assembly can trigger a new election of the TC. + +The members of the TC can be elected from outside of the GA. Candidates for election can either be suggested or self-nominated. + +The conflict resolution process is detailed in the resolution process document. + +The TC can be contacted at <tc@ffmpeg>. + +@anchor{Resolution Process} +@section Resolution Process + +The Technical Committee (TC) is here to arbitrate and make decisions when technical conflicts occur in the project. + +The TC main role is to resolve technical conflicts. It is therefore not a technical steering committee, but it is understood that some decisions might impact the future of the project. + +@subsection Seizing + +The TC can take possession of any technical matter that it sees fit. + +To involve the TC in a matter, email tc@ or CC them on an ongoing discussion. + +As members of TC are developers, they also can email tc@ to raise an issue. +@subsection Announcement + +The TC, once seized, must announce itself on the main mailing list, with a [TC] tag. + +The TC has 2 modes of operation: a RFC one and an internal one. + +If the TC thinks it needs the input from the larger community, the TC can call for a RFC. Else, it can decide by itself. + +If the disagreement involves a member of the TC, that member should recuse themselves from the decision. + +The decision to use a RFC process or an internal discussion is a discretionary decision of the TC. + +The TC can also reject a seizure for a few reasons such as: the matter was not discussed enough previously; it lacks expertise to reach a beneficial decision on the matter; or the matter is too trivial. +@subsection RFC call + +In the RFC mode, one person from the TC posts on the mailing list the technical question and will request input from the community. + +The mail will have the following specification: + + a precise title + a specific tag [TC RFC] + a top-level email + contain a precise question that does not exceed 100 words and that is answerable by developers + may have an extra description, or a link to a previous discussion, if deemed necessary, + contain a precise end date for the answers. + +The answers from the community must be on the main mailing list and must have the following specification: + + keep the tag and the title unchanged + limited to 400 words + a first-level, answering directly to the main email + answering to the question. + +Further replies to answers are permitted, as long as they conform to the community standards of politeness, they are limited to 100 words, and are not nested more than once. (max-depth=2) + +After the end-date, mails on the thread will be ignored. + +Violations of those rules will be escalated through the Community Committee. + +After all the emails are in, the TC has 96 hours to give its final decision. Exceptionally, the TC can request an extra delay, that will be notified on the mailing list. +@subsection Within TC + +In the internal case, the TC has 96 hours to give its final decision. Exceptionally, the TC can request an extra delay. +@subsection Decisions + +The decisions from the TC will be sent on the mailing list, with the [TC] tag. + +Internally, the TC should take decisions with a majority, or using ranked-choice voting. + +The decision from the TC should be published with a summary of the reasons that lead to this decision. + +The decisions from the TC are final, until the matters are reopened after no less than one year. + +@anchor{Community Committee} +@chapter Community Committee + +The Community Committee (CC) is here to arbitrage and make decisions when inter-personal conflicts occur in the project. It will decide quickly and take actions, for the sake of the project. + +The CC can remove privileges of offending members, including removal of commit access and temporary ban from the community. + +Decisions made by the CC can be re-opened after 1 year or by a majority vote of the General Assembly. Indefinite bans from the community must be confirmed by the General Assembly, in a majority vote. + +The CC is elected by the General Assembly for a duration of 1 year, and is composed of 5 members. Members can be re-elected if they wish. A majority vote in the General Assembly can trigger a new election of the CC. + +The members of the CC can be elected from outside of the GA. Candidates for election can either be suggested or self-nominated. + +The CC is governed by and responsible for enforcing the Code of Conduct. + +The CC can be contacted at <cc@ffmpeg>. + +@anchor{Code of Conduct} +@chapter Code of Conduct + +Be friendly and respectful towards others and third parties. +Treat others the way you yourself want to be treated. + +Be considerate. Not everyone shares the same viewpoint and priorities as you do. +Different opinions and interpretations help the project. +Looking at issues from a different perspective assists development. + +Do not assume malice for things that can be attributed to incompetence. Even if +it is malice, it's rarely good to start with that as initial assumption. + +Stay friendly even if someone acts contrarily. Everyone has a bad day +once in a while. +If you yourself have a bad day or are angry then try to take a break and reply +once you are calm and without anger if you have to. + +Try to help other team members and cooperate if you can. + +The goal of software development is to create technical excellence, not for any +individual to be better and "win" against the others. Large software projects +are only possible and successful through teamwork. + +If someone struggles do not put them down. Give them a helping hand +instead and point them in the right direction. + +Finally, keep in mind the immortal words of Bill and Ted, +"Be excellent to each other." + +@bye diff --git a/doc/dev_community/community.md b/doc/dev_community/community.md deleted file mode 100644 index 837fa6f586..0000000000 --- a/doc/dev_community/community.md +++ /dev/null @@ -1,86 +0,0 @@ -# FFmpeg project - -## Organisation - -The FFmpeg project is organized through a community working on global consensus. - -Decisions are taken by the ensemble of active members, through voting and -are aided by two committees. - -## General Assembly - -The ensemble of active members is called the General Assembly (GA). - -The General Assembly is sovereign and legitimate for all its decisions -regarding the FFmpeg project. - -The General Assembly is made up of active contributors. - -Contributors are considered "active contributors" if they have pushed more -than 20 patches in the last 36 months in the main FFmpeg repository, or -if they have been voted in by the GA. - -Additional members are added to the General Assembly through a vote after -proposal by a member of the General Assembly. -They are part of the GA for two years, after which they need a confirmation by -the GA. - -A script to generate the current members of the general assembly (minus members -voted in) can be found in `tools/general_assembly.pl`. - -## Voting - -Voting is done using a ranked voting system, currently running on https://vote.ffmpeg.org/ . - -Majority vote means more than 50% of the expressed ballots. - -## Technical Committee - -The Technical Committee (TC) is here to arbitrate and make decisions when -technical conflicts occur in the project. -They will consider the merits of all the positions, judge them and make a -decision. - -The TC resolves technical conflicts but is not a technical steering committee. - -Decisions by the TC are binding for all the contributors. - -Decisions made by the TC can be re-opened after 1 year or by a majority vote -of the General Assembly, requested by one of the member of the GA. - -The TC is elected by the General Assembly for a duration of 1 year, and -is composed of 5 members. -Members can be re-elected if they wish. A majority vote in the General Assembly -can trigger a new election of the TC. - -The members of the TC can be elected from outside of the GA. -Candidates for election can either be suggested or self-nominated. - -The conflict resolution process is detailed in the [resolution process](resolution_process.md) document. - -The TC can be contacted at <tc@ffmpeg>. - -## Community committee - -The Community Committee (CC) is here to arbitrage and make decisions when -inter-personal conflicts occur in the project. It will decide quickly and -take actions, for the sake of the project. - -The CC can remove privileges of offending members, including removal of -commit access and temporary ban from the community. - -Decisions made by the CC can be re-opened after 1 year or by a majority vote -of the General Assembly. Indefinite bans from the community must be confirmed -by the General Assembly, in a majority vote. - -The CC is elected by the General Assembly for a duration of 1 year, and is -composed of 5 members. -Members can be re-elected if they wish. A majority vote in the General Assembly -can trigger a new election of the CC. - -The members of the CC can be elected from outside of the GA. -Candidates for election can either be suggested or self-nominated. - -The CC is governed by and responsible for enforcing the Code of Conduct. - -The CC can be contacted at <cc@ffmpeg>. diff --git a/doc/dev_community/resolution_process.md b/doc/dev_community/resolution_process.md deleted file mode 100644 index 4ed0b63c43..0000000000 --- a/doc/dev_community/resolution_process.md +++ /dev/null @@ -1,91 +0,0 @@ -# Technical Committee - -_This document only makes sense with the rules from [the community document](community)_. - -The Technical Committee (**TC**) is here to arbitrate and make decisions when -technical conflicts occur in the project. - -The TC main role is to resolve technical conflicts. -It is therefore not a technical steering committee, but it is understood that -some decisions might impact the future of the project. - -# Process - -## Seizing - -The TC can take possession of any technical matter that it sees fit. - -To involve the TC in a matter, email tc@ or CC them on an ongoing discussion. - -As members of TC are developers, they also can email tc@ to raise an issue. - -## Announcement - -The TC, once seized, must announce itself on the main mailing list, with a _[TC]_ tag. - -The TC has 2 modes of operation: a RFC one and an internal one. - -If the TC thinks it needs the input from the larger community, the TC can call -for a RFC. Else, it can decide by itself. - -If the disagreement involves a member of the TC, that member should recuse -themselves from the decision. - -The decision to use a RFC process or an internal discussion is a discretionary -decision of the TC. - -The TC can also reject a seizure for a few reasons such as: -the matter was not discussed enough previously; it lacks expertise to reach a -beneficial decision on the matter; or the matter is too trivial. - -### RFC call - -In the RFC mode, one person from the TC posts on the mailing list the -technical question and will request input from the community. - -The mail will have the following specification: -* a precise title -* a specific tag [TC RFC] -* a top-level email -* contain a precise question that does not exceed 100 words and that is answerable by developers -* may have an extra description, or a link to a previous discussion, if deemed necessary, -* contain a precise end date for the answers. - -The answers from the community must be on the main mailing list and must have -the following specification: -* keep the tag and the title unchanged -* limited to 400 words -* a first-level, answering directly to the main email -* answering to the question. - -Further replies to answers are permitted, as long as they conform to the -community standards of politeness, they are limited to 100 words, and are not -nested more than once. (max-depth=2) - -After the end-date, mails on the thread will be ignored. - -Violations of those rules will be escalated through the Community Committee. - -After all the emails are in, the TC has 96 hours to give its final decision. -Exceptionally, the TC can request an extra delay, that will be notified on the -mailing list. - -### Within TC - -In the internal case, the TC has 96 hours to give its final decision. -Exceptionally, the TC can request an extra delay. - - -## Decisions - -The decisions from the TC will be sent on the mailing list, with the _[TC]_ tag. - -Internally, the TC should take decisions with a majority, or using -ranked-choice voting. - -The decision from the TC should be published with a summary of the reasons that -lead to this decision. - -The decisions from the TC are final, until the matters are reopened after -no less than one year. - diff --git a/doc/developer.texi b/doc/developer.texi index 31b485b0f6..1275fa4f84 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -421,35 +421,6 @@ finding a new maintainer and also don't forget to update the @file{MAINTAINERS} We think our rules are not too hard. If you have comments, contact us. -@chapter Code of conduct - -Be friendly and respectful towards others and third parties. -Treat others the way you yourself want to be treated. - -Be considerate. Not everyone shares the same viewpoint and priorities as you do. -Different opinions and interpretations help the project. -Looking at issues from a different perspective assists development. - -Do not assume malice for things that can be attributed to incompetence. Even if -it is malice, it's rarely good to start with that as initial assumption. - -Stay friendly even if someone acts contrarily. Everyone has a bad day -once in a while. -If you yourself have a bad day or are angry then try to take a break and reply -once you are calm and without anger if you have to. - -Try to help other team members and cooperate if you can. - -The goal of software development is to create technical excellence, not for any -individual to be better and "win" against the others. Large software projects -are only possible and successful through teamwork. - -If someone struggles do not put them down. Give them a helping hand -instead and point them in the right direction. - -Finally, keep in mind the immortal words of Bill and Ted, -"Be excellent to each other." - @anchor{Submitting patches} @chapter Submitting patches diff --git a/doc/mailing-list-faq.texi b/doc/mailing-list-faq.texi index 534ef3f802..b2028eeee1 100644 --- a/doc/mailing-list-faq.texi +++ b/doc/mailing-list-faq.texi @@ -344,7 +344,7 @@ recommended. Avoid sending the same message to multiple mailing lists. @item -Please follow our @url{https://ffmpeg.org/developer.html#Code-of-conduct, Code of Conduct}. +Please follow our @url{https://ffmpeg.org/community.html#Code-of-conduct, Code of Conduct}. @end itemize @chapter Help

1 0

doc/dev_community: add the addresses of the committees
by Nicolas George 28 Feb '23

28 Feb '23

ffmpeg | branch: master | Nicolas George <george(a)nsup.org> | Wed Feb 8 16:57:52 2023 +0100| [9a0d202118b1df1823598abe4c66e9243d435d30] | committer: Thilo Borgmann doc/dev_community: add the addresses of the committees Omitting the .org from the address should be protection enough against spam spiders. Signed-off-by: Nicolas George <george(a)nsup.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a0d202118b1df182… --- doc/dev_community/community.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/dev_community/community.md b/doc/dev_community/community.md index 516ca5c05e..837fa6f586 100644 --- a/doc/dev_community/community.md +++ b/doc/dev_community/community.md @@ -58,6 +58,8 @@ Candidates for election can either be suggested or self-nominated. The conflict resolution process is detailed in the [resolution process](resolution_process.md) document. +The TC can be contacted at <tc@ffmpeg>. + ## Community committee The Community Committee (CC) is here to arbitrage and make decisions when @@ -80,3 +82,5 @@ The members of the CC can be elected from outside of the GA. Candidates for election can either be suggested or self-nominated. The CC is governed by and responsible for enforcing the Code of Conduct. + +The CC can be contacted at <cc@ffmpeg>.

1 0

fftools/ffmpeg_filter: initialize the 'o' to silence the warning
by Jun Zhao 28 Feb '23

28 Feb '23

ffmpeg | branch: master | Jun Zhao <barryjzhao(a)tencent.com> | Sat Feb 25 21:54:00 2023 +0800| [a0a0a804998da8d1a397479c9bafeb000e6be088] | committer: Jun Zhao fftools/ffmpeg_filter: initialize the 'o' to silence the warning silence the warning: variable 'o' is used uninitialized whenever '&&' condition is false Signed-off-by: Jun Zhao <barryjzhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0a0a804998da8d1a… --- fftools/ffmpeg_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 1f5bbf6c4d..3504a3cc0a 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -362,7 +362,7 @@ fail: static int filter_opt_apply(AVFilterContext *f, const char *key, const char *val) { - const AVOption *o; + const AVOption *o = NULL; int ret; ret = av_opt_set(f, key, val, AV_OPT_SEARCH_CHILDREN);

1 0

libavcodec/libfdk-aacenc: Enable writing DRC metadata
by JonHGee 28 Feb '23

28 Feb '23

ffmpeg | branch: master | JonHGee <jonhgee(a)gmail.com> | Tue Feb 28 21:25:13 2023 +0000| [3ff4a3d2ec5eacc0f3194f7cc8b526496d0b8b37] | committer: Martin Storsjö libavcodec/libfdk-aacenc: Enable writing DRC metadata Signed-off-by: JonHGee <JonHGee(a)gmail.com> Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ff4a3d2ec5eacc0f… --- libavcodec/libfdk-aacenc.c | 67 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 13 deletions(-) diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 54549de473..ebf11516d9 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -46,6 +46,13 @@ typedef struct AACContext { int latm; int header_period; int vbr; + int drc_profile; + int drc_target_ref; + int comp_profile; + int comp_target_ref; + int prog_ref; + int metadata_mode; + AACENC_MetaData metaDataSetup; AudioFrameQueue afq; } AACContext; @@ -64,6 +71,11 @@ static const AVOption aac_enc_options[] = { { "latm", "Output LATM/LOAS encapsulated data", offsetof(AACContext, latm), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, { "header_period", "StreamMuxConfig and PCE repetition period (in frames)", offsetof(AACContext, header_period), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 0xffff, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, { "vbr", "VBR mode (1-5)", offsetof(AACContext, vbr), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 5, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, + { "drc_profile", "The desired compression profile for AAC DRC", offsetof(AACContext, drc_profile), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 256, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, + { "drc_target_ref", "Expected target reference level at decoder side in dB (for clipping prevention/limiter)", offsetof(AACContext, drc_target_ref), AV_OPT_TYPE_INT, { .i64 = 0.0 }, -31.75, 0, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, + { "comp_profile", "The desired compression profile for AAC DRC", offsetof(AACContext, comp_profile), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 256, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, + { "comp_target_ref", "Expected target reference level at decoder side in dB (for clipping prevention/limiter)", offsetof(AACContext, comp_target_ref), AV_OPT_TYPE_INT, { .i64 = 0.0 }, -31.75, 0, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, + { "prog_ref", "The program reference level or dialog level in dB", offsetof(AACContext, prog_ref), AV_OPT_TYPE_INT, { .i64 = 0.0 }, -31.75, 0, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, FF_AAC_PROFILE_OPTS { NULL } }; @@ -319,6 +331,30 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) } } + s->metadata_mode = 0; + if (s->prog_ref) { + s->metadata_mode = 1; + s->metaDataSetup.prog_ref_level_present = 1; + s->metaDataSetup.prog_ref_level = s->prog_ref << 16; + } + if (s->drc_profile) { + s->metadata_mode = 1; + s->metaDataSetup.drc_profile = s->drc_profile; + s->metaDataSetup.drc_TargetRefLevel = s->drc_target_ref << 16; + if (s->comp_profile) { + /* Including the comp_profile means that we need to set the mode to ETSI */ + s->metadata_mode = 2; + s->metaDataSetup.comp_profile = s->comp_profile; + s->metaDataSetup.comp_TargetRefLevel = s->comp_target_ref << 16; + } + } + + if ((err = aacEncoder_SetParam(s->handle, AACENC_METADATA_MODE, s->metadata_mode)) != AACENC_OK) { + av_log(avctx, AV_LOG_ERROR, "Unable to set metadata mode to %d: %s\n", + s->metadata_mode, aac_get_error(err)); + goto error; + } + if ((err = aacEncEncode(s->handle, NULL, NULL, NULL, NULL)) != AACENC_OK) { av_log(avctx, AV_LOG_ERROR, "Unable to initialize the encoder: %s\n", aac_get_error(err)); @@ -363,11 +399,13 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AACENC_BufDesc in_buf = { 0 }, out_buf = { 0 }; AACENC_InArgs in_args = { 0 }; AACENC_OutArgs out_args = { 0 }; - int in_buffer_identifier = IN_AUDIO_DATA; - int in_buffer_size, in_buffer_element_size; + void* inBuffer[] = { 0, &s->metaDataSetup }; + int in_buffer_identifiers[] = { IN_AUDIO_DATA, IN_METADATA_SETUP }; + int in_buffer_element_sizes[] = { 2, sizeof(AACENC_MetaData) }; + int in_buffer_sizes[] = { 0, sizeof(s->metaDataSetup) }; int out_buffer_identifier = OUT_BITSTREAM_DATA; int out_buffer_size, out_buffer_element_size; - void *in_ptr, *out_ptr; + void *out_ptr; int ret; uint8_t dummy_buf[1]; AACENC_ERROR err; @@ -376,13 +414,12 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (!frame) { /* Must be a non-null pointer, even if it's a dummy. We could use * the address of anything else on the stack as well. */ - in_ptr = dummy_buf; - in_buffer_size = 0; + inBuffer[0] = dummy_buf; in_args.numInSamples = -1; } else { - in_ptr = frame->data[0]; - in_buffer_size = 2 * avctx->ch_layout.nb_channels * frame->nb_samples; + inBuffer[0] = frame->data[0]; + in_buffer_sizes[0] = 2 * avctx->ch_layout.nb_channels * frame->nb_samples; in_args.numInSamples = avctx->ch_layout.nb_channels * frame->nb_samples; @@ -391,12 +428,16 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, return ret; } - in_buffer_element_size = 2; - in_buf.numBufs = 1; - in_buf.bufs = &in_ptr; - in_buf.bufferIdentifiers = &in_buffer_identifier; - in_buf.bufSizes = &in_buffer_size; - in_buf.bufElSizes = &in_buffer_element_size; + if (s->metadata_mode == 0) { + in_buf.numBufs = 1; + } else { + in_buf.numBufs = 2; + } + + in_buf.bufs = (void**)inBuffer; + in_buf.bufferIdentifiers = in_buffer_identifiers; + in_buf.bufSizes = in_buffer_sizes; + in_buf.bufElSizes = in_buffer_element_sizes; /* The maximum packet size is 6144 bits aka 768 bytes per channel. */ ret = ff_alloc_packet(avctx, avpkt, FFMAX(8192, 768 * avctx->ch_layout.nb_channels));

1 0

doc/ffmpeg: extend documentation for -dts_delta_threshold and -dts_error_threshold
by Stefano Sabatini 28 Feb '23

28 Feb '23

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Sat Feb 11 17:18:39 2023 +0100| [f88a4cb5e0c40b1578b4b7db66c6972da9f770c2] | committer: Stefano Sabatini doc/ffmpeg: extend documentation for -dts_delta_threshold and -dts_error_threshold PR: https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=8252 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f88a4cb5e0c40b157… --- doc/ffmpeg.texi | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index d9d4b75567..7feba8ab70 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1837,12 +1837,38 @@ results, but increase memory use and latency. The default value is 10 seconds. -@item -dts_delta_threshold -Timestamp discontinuity delta threshold. -@item -dts_error_threshold @var{seconds} -Timestamp error delta threshold. This threshold use to discard crazy/damaged -timestamps and the default is 30 hours which is arbitrarily picked and quite -conservative. +@item -dts_delta_threshold @var{threshold} +Timestamp discontinuity delta threshold, expressed as a decimal number +of seconds. + +The timestamp discontinuity correction enabled by this option is only +applied to input formats accepting timestamp discontinuity (for which +the @code{AV_FMT_DISCONT} flag is enabled), e.g. MPEG-TS and HLS, and +is automatically disabled when employing the @code{-copy_ts} option +(unless wrapping is detected). + +If a timestamp discontinuity is detected whose absolute value is +greater than @var{threshold}, ffmpeg will remove the discontinuity by +decreasing/increasing the current DTS and PTS by the corresponding +delta value. + +The default value is 10. + +@item -dts_error_threshold @var{threshold} +Timestamp error delta threshold, expressed as a decimal number of +seconds. + +The timestamp correction enabled by this option is only applied to +input formats not accepting timestamp discontinuity (for which the +@code{AV_FMT_DISCONT} flag is not enabled). + +If a timestamp discontinuity is detected whose absolute value is +greater than @var{threshold}, ffmpeg will drop the PTS/DTS timestamp +value. + +The default value is @code{3600*30} (30 hours), which is arbitrarily +picked and quite conservative. + @item -muxdelay @var{seconds} (@emph{output}) Set the maximum demux-decode delay. @item -muxpreload @var{seconds} (@emph{output})

1 0

ffmpeg_demux: show fixed timestamps in ts_fixup
by Stefano Sabatini 28 Feb '23

28 Feb '23

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Mon Feb 6 01:59:02 2023 +0100| [9998c31044cb05eb9392ce2fdb2b3a281e47e0da] | committer: Stefano Sabatini ffmpeg_demux: show fixed timestamps in ts_fixup Help debugging. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9998c31044cb05eb9… --- fftools/ffmpeg_demux.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 2033c1de54..db05ddb8e9 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -194,15 +194,19 @@ static void ts_fixup(Demuxer *d, AVPacket *pkt, int *repeat_pict) const int64_t start_time = ifile->start_time_effective; int64_t duration; - if (debug_ts) { - av_log(ist, AV_LOG_INFO, "demuxer -> type:%s " - "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s duration:%s duration_time:%s\n", - av_get_media_type_string(ist->st->codecpar->codec_type), - av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &ist->st->time_base), - av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &ist->st->time_base), - av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &ist->st->time_base)); +#define SHOW_TS_DEBUG(tag_) \ + if (debug_ts) { \ + av_log(ist, AV_LOG_INFO, "%s -> ist_index:%d:%d type:%s " \ + "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s duration:%s duration_time:%s\n", \ + tag_, ifile->index, pkt->stream_index, \ + av_get_media_type_string(ist->st->codecpar->codec_type), \ + av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &ist->st->time_base), \ + av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &ist->st->time_base), \ + av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &ist->st->time_base)); \ } + SHOW_TS_DEBUG("demuxer"); + if (!ist->wrap_correction_done && start_time != AV_NOPTS_VALUE && ist->st->pts_wrap_bits < 64) { int64_t stime, stime2; @@ -245,6 +249,8 @@ static void ts_fixup(Demuxer *d, AVPacket *pkt, int *repeat_pict) if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && av_stream_get_parser(ist->st)) *repeat_pict = av_stream_get_parser(ist->st)->repeat_pict; + + SHOW_TS_DEBUG("demuxer+tsfixup"); } static void thread_set_name(InputFile *f)

1 0

[ffmpeg-web] branch master updated. 71d027f Index: fix bullet point tags
by ffmpeg-git＠ffmpeg.org 28 Feb '23

28 Feb '23

The branch, master has been updated via 71d027fd1a741b2ae84c88b51434c523c6156b72 (commit) from 07dda56caa67581d1eeda237300cfa0ad6f3ed51 (commit) - Log ----------------------------------------------------------------- commit 71d027fd1a741b2ae84c88b51434c523c6156b72 Author: Lynne <dev(a)lynne.ee> AuthorDate: Tue Feb 28 22:10:39 2023 +0100 Commit: Lynne <dev(a)lynne.ee> CommitDate: Tue Feb 28 22:10:58 2023 +0100 Index: fix bullet point tags diff --git a/src/index b/src/index index 2425435..4e6498a 100644 --- a/src/index +++ b/src/index @@ -61,48 +61,47 @@ Some highlights are: </p> <ul> - <ul>Radiance HDR image support</ul> - <ul>ddagrab (Desktop Duplication) video capture filter</ul> - <ul>ffmpeg -shortest_buf_duration option</ul> - <ul>ffmpeg now requires threading to be built</ul> - <ul>ffmpeg now runs every muxer in a separate thread</ul> - <ul>Add new mode to cropdetect filter to detect crop-area based on motion vectors and edges</ul> - <ul>VAAPI decoding and encoding for 10/12bit 422, 10/12bit 444 HEVC and VP9</ul> - <ul>WBMP (Wireless Application Protocol Bitmap) image format</ul> - <ul>a3dscope filter</ul> - <ul>bonk decoder and demuxer</ul> - <ul>Micronas SC-4 audio decoder</ul> - <ul>LAF demuxer</ul> - <ul>APAC decoder and demuxer</ul> - <ul>Media 100i decoders</ul> - <ul>DTS to PTS reorder bsf</ul> - <ul>ViewQuest VQC decoder</ul> - <ul>backgroundkey filter</ul> - <ul>nvenc AV1 encoding support</ul> - <ul>MediaCodec decoder via NDKMediaCodec</ul> - <ul>MediaCodec encoder</ul> - <ul>oneVPL support for QSV</ul> - <ul>QSV AV1 encoder</ul> - <ul>QSV decoding and encoding for 10/12bit 422, 10/12bit 444 HEVC and VP9</ul> - <ul>showcwt multimedia filter</ul> - <ul>corr video filter</ul> - <ul>adrc audio filter</ul> - <ul>afdelaysrc audio filter</ul> - <ul>WADY DPCM decoder and demuxer</ul> - <ul>CBD2 DPCM decoder</ul> - <ul>ssim360 video filter</ul> - <ul>ffmpeg CLI new options: -stats_enc_pre[_fmt], -stats_enc_post[_fmt], -stats_mux_pre[_fmt]</ul> - <ul>hstack_vaapi, vstack_vaapi and xstack_vaapi filters</ul> - <ul>XMD ADPCM decoder and demuxer</ul> - <ul>media100 to mjpegb bsf</ul> - <ul>ffmpeg CLI new option: -fix_sub_duration_heartbeat</ul> - <ul>WavArc decoder and demuxer</ul> - <ul>CrystalHD decoders deprecated</ul> - <ul>SDNS demuxer</ul> - <ul>RKA decoder and demuxer</ul> - <ul>filtergraph syntax in ffmpeg CLI now supports passing file contents</ul> - <ul> as option values, by prefixing option name with '/'</ul> - <ul>hstack_qsv, vstack_qsv and xstack_qsv filters</ul> + <li>Radiance HDR image support</li> + <li>ddagrab (Desktop Duplication) video capture filter</li> + <li>ffmpeg -shortest_buf_duration option</li> + <li>ffmpeg now requires threading to be built</li> + <li>ffmpeg now runs every muxer in a separate thread</li> + <li>Add new mode to cropdetect filter to detect crop-area based on motion vectors and edges</li> + <li>VAAPI decoding and encoding for 10/12bit 422, 10/12bit 444 HEVC and VP9</li> + <li>WBMP (Wireless Application Protocol Bitmap) image format</li> + <li>a3dscope filter</li> + <li>bonk decoder and demuxer</li> + <li>Micronas SC-4 audio decoder</li> + <li>LAF demuxer</li> + <li>APAC decoder and demuxer</li> + <li>Media 100i decoders</li> + <li>DTS to PTS reorder bsf</li> + <li>ViewQuest VQC decoder</li> + <li>backgroundkey filter</li> + <li>nvenc AV1 encoding support</li> + <li>MediaCodec decoder via NDKMediaCodec</li> + <li>MediaCodec encoder</li> + <li>oneVPL support for QSV</li> + <li>QSV AV1 encoder</li> + <li>QSV decoding and encoding for 10/12bit 422, 10/12bit 444 HEVC and VP9</li> + <li>showcwt multimedia filter</li> + <li>corr video filter</li> + <li>adrc audio filter</li> + <li>afdelaysrc audio filter</li> + <li>WADY DPCM decoder and demuxer</li> + <li>CBD2 DPCM decoder</li> + <li>ssim360 video filter</li> + <li>ffmpeg CLI new options: -stats_enc_pre[_fmt], -stats_enc_post[_fmt], -stats_mux_pre[_fmt]</li> + <li>hstack_vaapi, vstack_vaapi and xstack_vaapi filters</li> + <li>XMD ADPCM decoder and demuxer</li> + <li>media100 to mjpegb bsf</li> + <li>ffmpeg CLI new option: -fix_sub_duration_heartbeat</li> + <li>WavArc decoder and demuxer</li> + <li>CrystalHD decoders deprecated</li> + <li>SDNS demuxer</li> + <li>RKA decoder and demuxer</li> + <li>filtergraph syntax in ffmpeg CLI now supports passing file contents as option values</li> + <li>hstack_qsv, vstack_qsv and xstack_qsv filters</li> </ul> <p> We strongly recommend users, distributors, and system integrators to ----------------------------------------------------------------------- Summary of changes: src/index | 83 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 41 insertions(+), 42 deletions(-) hooks/post-receive --

1 0

[ffmpeg-web] branch master updated. 07dda56 Website release notes for 6.0
by ffmpeg-git＠ffmpeg.org 28 Feb '23

28 Feb '23

The branch, master has been updated via 07dda56caa67581d1eeda237300cfa0ad6f3ed51 (commit) from 4808c81576c98df228a24a06624e78ab45c1b40c (commit) - Log ----------------------------------------------------------------- commit 07dda56caa67581d1eeda237300cfa0ad6f3ed51 Author: Lynne <dev(a)lynne.ee> AuthorDate: Tue Feb 28 10:39:18 2023 +0100 Commit: Lynne <dev(a)lynne.ee> CommitDate: Tue Feb 28 22:07:39 2023 +0100 Website release notes for 6.0 diff --git a/src/index b/src/index index 2aac720..2425435 100644 --- a/src/index +++ b/src/index @@ -35,6 +35,80 @@ News </h1> + <h3 id="pr6.0">February 28th, 2023, FFmpeg 6.0 "Von Neumann"</h3> + <p> + A new major release, <a href="download.html#release_6.0">FFmpeg 6.0 "Von Neumann"</a>, + is now available for download. This release has many new encoders and decoders, filters, + ffmpeg CLI tool improvements, and also, changes the way releases are done. All major + releases will now bump the version of the ABI. We plan to have a new major release each + year. Another release-specific change is that deprecated APIs will be removed after 3 + releases, upon the next major bump. + This means that releases will be done more often and will be more organized. + </p> + <p> + New decoders featured are Bonk, RKA, Radiance, SC-4, APAC, VQC, WavArc and a few ADPCM formats. + QSV and NVenc now support AV1 encoding. The FFmpeg CLI (we usually reffer to it as ffmpeg.c + to avoid confusion) has speed-up improvements due to threading, as well as statistics options, + and the ability to pass option values for filters from a file. There are quite a few new audio + and video filters, such as adrc, showcwt, backgroundkey and ssim360, with a few hardware ones too. + Finally, the release features many behind-the-scenes changes, including a new FFT and MDCT + implementation used in codecs (expect a blog post about this soon), numerous bugfixes, better + ICC profile handling and colorspace signalling improvement, introduction of a number of RISC-V + vector and scalar assembly optimized routines, and a few new improved APIs, which can be viewed + in the doc/APIchanges file in our tree. + A few submitted features, such as the Vulkan improvements and more FFT optimizations will be in the + next minor release, 6.1, which we plan to release soon, in line with our new release schedule. + Some highlights are: + </p> + <ul> + <ul>Radiance HDR image support</ul> + <ul>ddagrab (Desktop Duplication) video capture filter</ul> + <ul>ffmpeg -shortest_buf_duration option</ul> + <ul>ffmpeg now requires threading to be built</ul> + <ul>ffmpeg now runs every muxer in a separate thread</ul> + <ul>Add new mode to cropdetect filter to detect crop-area based on motion vectors and edges</ul> + <ul>VAAPI decoding and encoding for 10/12bit 422, 10/12bit 444 HEVC and VP9</ul> + <ul>WBMP (Wireless Application Protocol Bitmap) image format</ul> + <ul>a3dscope filter</ul> + <ul>bonk decoder and demuxer</ul> + <ul>Micronas SC-4 audio decoder</ul> + <ul>LAF demuxer</ul> + <ul>APAC decoder and demuxer</ul> + <ul>Media 100i decoders</ul> + <ul>DTS to PTS reorder bsf</ul> + <ul>ViewQuest VQC decoder</ul> + <ul>backgroundkey filter</ul> + <ul>nvenc AV1 encoding support</ul> + <ul>MediaCodec decoder via NDKMediaCodec</ul> + <ul>MediaCodec encoder</ul> + <ul>oneVPL support for QSV</ul> + <ul>QSV AV1 encoder</ul> + <ul>QSV decoding and encoding for 10/12bit 422, 10/12bit 444 HEVC and VP9</ul> + <ul>showcwt multimedia filter</ul> + <ul>corr video filter</ul> + <ul>adrc audio filter</ul> + <ul>afdelaysrc audio filter</ul> + <ul>WADY DPCM decoder and demuxer</ul> + <ul>CBD2 DPCM decoder</ul> + <ul>ssim360 video filter</ul> + <ul>ffmpeg CLI new options: -stats_enc_pre[_fmt], -stats_enc_post[_fmt], -stats_mux_pre[_fmt]</ul> + <ul>hstack_vaapi, vstack_vaapi and xstack_vaapi filters</ul> + <ul>XMD ADPCM decoder and demuxer</ul> + <ul>media100 to mjpegb bsf</ul> + <ul>ffmpeg CLI new option: -fix_sub_duration_heartbeat</ul> + <ul>WavArc decoder and demuxer</ul> + <ul>CrystalHD decoders deprecated</ul> + <ul>SDNS demuxer</ul> + <ul>RKA decoder and demuxer</ul> + <ul>filtergraph syntax in ffmpeg CLI now supports passing file contents</ul> + <ul> as option values, by prefixing option name with '/'</ul> + <ul>hstack_qsv, vstack_qsv and xstack_qsv filters</ul> + </ul> + <p> + We strongly recommend users, distributors, and system integrators to + upgrade unless they use current git master. + </p> + <h3 id="pr5.1">July 22nd, 2022, FFmpeg 5.1 "Riemann"</h3> <p> <a href="download.html#release_5.1">FFmpeg 5.1 "Riemann"</a>, a new ----------------------------------------------------------------------- Summary of changes: src/index | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) hooks/post-receive --

1 0

avcodec/pngdec: read colorspace info when decoding with AVDISCARD_ALL
by Leo Izen 28 Feb '23

28 Feb '23

ffmpeg | branch: master | Leo Izen <leo.izen(a)gmail.com> | Thu Feb 2 10:01:42 2023 -0500| [fadfa147f812a3fe9e68723347d37b9cccd6222d] | committer: Leo Izen avcodec/pngdec: read colorspace info when decoding with AVDISCARD_ALL These chunks are lightweight and it's useful information to have when running ffmpeg -i or ffprobe, for example. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fadfa147f812a3fe9… --- libavcodec/pngdec.c | 136 +++++++++++++++++++++++++++---------------- tests/ref/fate/png-icc | 8 +-- tests/ref/fate/png-side-data | 2 +- 3 files changed, 91 insertions(+), 55 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index d63640345b..9403d72f2f 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -75,6 +75,7 @@ typedef struct PNGDecContext { int have_chrm; uint32_t white_point[2]; uint32_t display_primaries[3][2]; + int gamma; int have_srgb; int have_cicp; enum AVColorPrimaries cicp_primaries; @@ -641,6 +642,83 @@ static int decode_phys_chunk(AVCodecContext *avctx, PNGDecContext *s, return 0; } +/* + * This populates AVCodecContext fields so it must be called before + * ff_thread_finish_setup() to avoid a race condition with respect to the + * generic copying of avctx fields. + */ +static int populate_avctx_color_fields(AVCodecContext *avctx, AVFrame *frame) +{ + PNGDecContext *s = avctx->priv_data; + + if (s->have_cicp) { + if (s->cicp_primaries >= AVCOL_PRI_NB) + av_log(avctx, AV_LOG_WARNING, "unrecognized cICP primaries\n"); + else + avctx->color_primaries = frame->color_primaries = s->cicp_primaries; + if (s->cicp_trc >= AVCOL_TRC_NB) + av_log(avctx, AV_LOG_WARNING, "unrecognized cICP transfer\n"); + else + avctx->color_trc = frame->color_trc = s->cicp_trc; + if (s->cicp_range == 0) + av_log(avctx, AV_LOG_WARNING, "unsupported tv-range cICP chunk\n"); + } else if (s->iccp_data) { + AVFrameSideData *sd = av_frame_new_side_data(frame, AV_FRAME_DATA_ICC_PROFILE, s->iccp_data_len); + if (!sd) + return AVERROR(ENOMEM); + memcpy(sd->data, s->iccp_data, s->iccp_data_len); + av_dict_set(&sd->metadata, "name", s->iccp_name, 0); + } else if (s->have_srgb) { + avctx->color_primaries = frame->color_primaries = AVCOL_PRI_BT709; + avctx->color_trc = frame->color_trc = AVCOL_TRC_IEC61966_2_1; + } else if (s->have_chrm) { + AVColorPrimariesDesc desc; + enum AVColorPrimaries prim; + desc.wp.x = av_make_q(s->white_point[0], 100000); + desc.wp.y = av_make_q(s->white_point[1], 100000); + desc.prim.r.x = av_make_q(s->display_primaries[0][0], 100000); + desc.prim.r.y = av_make_q(s->display_primaries[0][1], 100000); + desc.prim.g.x = av_make_q(s->display_primaries[1][0], 100000); + desc.prim.g.y = av_make_q(s->display_primaries[1][1], 100000); + desc.prim.b.x = av_make_q(s->display_primaries[2][0], 100000); + desc.prim.b.y = av_make_q(s->display_primaries[2][1], 100000); + prim = av_csp_primaries_id_from_desc(&desc); + if (prim != AVCOL_PRI_UNSPECIFIED) + avctx->color_primaries = frame->color_primaries = prim; + else + av_log(avctx, AV_LOG_WARNING, "unknown cHRM primaries\n"); + } + + /* these chunks override gAMA */ + if (s->iccp_data || s->have_srgb || s->have_cicp) { + av_dict_set(&s->frame_metadata, "gamma", NULL, 0); + } else if (s->gamma) { + /* + * These values are 100000/2.2, 100000/2.8, 100000/2.6, and + * 100000/1.0 respectively. 45455, 35714, and 38462, and 100000. + * There's a 0.001 gamma tolerance here in case of floating + * point issues when the PNG was written. + * + * None of the other enums have a pure gamma curve so it makes + * sense to leave those to sRGB and cICP. + */ + if (s->gamma > 45355 && s->gamma < 45555) + avctx->color_trc = frame->color_trc = AVCOL_TRC_GAMMA22; + else if (s->gamma > 35614 && s->gamma < 35814) + avctx->color_trc = frame->color_trc = AVCOL_TRC_GAMMA28; + else if (s->gamma > 38362 && s->gamma < 38562) + avctx->color_trc = frame->color_trc = AVCOL_TRC_SMPTE428; + else if (s->gamma > 99900 && s->gamma < 100100) + avctx->color_trc = frame->color_trc = AVCOL_TRC_LINEAR; + } + + /* we only support pc-range RGB */ + avctx->colorspace = frame->colorspace = AVCOL_SPC_RGB; + avctx->color_range = frame->color_range = AVCOL_RANGE_JPEG; + + return 0; +} + static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s, GetByteContext *gb, AVFrame *p) { @@ -756,6 +834,8 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s, p->key_frame = 1; p->interlaced_frame = !!s->interlace_type; + if ((ret = populate_avctx_color_fields(avctx, p)) < 0) + return ret; ff_thread_finish_setup(avctx); /* compute the compressed row size */ @@ -1257,6 +1337,10 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, case MKTAG('t', 'E', 'X', 't'): case MKTAG('I', 'D', 'A', 'T'): case MKTAG('t', 'R', 'N', 'S'): + case MKTAG('s', 'R', 'G', 'B'): + case MKTAG('c', 'I', 'C', 'P'): + case MKTAG('c', 'H', 'R', 'M'): + case MKTAG('g', 'A', 'M', 'A'): break; default: continue; @@ -1359,10 +1443,10 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, case MKTAG('g', 'A', 'M', 'A'): { AVBPrint bp; char *gamma_str; - int num = bytestream2_get_be32(&gb_chunk); + s->gamma = bytestream2_get_be32(&gb_chunk); av_bprint_init(&bp, 0, AV_BPRINT_SIZE_UNLIMITED); - av_bprintf(&bp, "%i/%i", num, 100000); + av_bprintf(&bp, "%i/%i", s->gamma, 100000); ret = av_bprint_finalize(&bp, &gamma_str); if (ret < 0) return ret; @@ -1500,56 +1584,8 @@ static void clear_frame_metadata(PNGDecContext *s) static int output_frame(PNGDecContext *s, AVFrame *f) { - AVCodecContext *avctx = s->avctx; int ret; - if (s->have_cicp) { - if (s->cicp_primaries >= AVCOL_PRI_NB) - av_log(avctx, AV_LOG_WARNING, "unrecognized cICP primaries\n"); - else - avctx->color_primaries = f->color_primaries = s->cicp_primaries; - if (s->cicp_trc >= AVCOL_TRC_NB) - av_log(avctx, AV_LOG_WARNING, "unrecognized cICP transfer\n"); - else - avctx->color_trc = f->color_trc = s->cicp_trc; - avctx->color_range = f->color_range = - s->cicp_range == 0 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; - } else if (s->iccp_data) { - AVFrameSideData *sd = av_frame_new_side_data(f, AV_FRAME_DATA_ICC_PROFILE, s->iccp_data_len); - if (!sd) { - ret = AVERROR(ENOMEM); - goto fail; - } - memcpy(sd->data, s->iccp_data, s->iccp_data_len); - - av_dict_set(&sd->metadata, "name", s->iccp_name, 0); - } else if (s->have_srgb) { - avctx->color_primaries = f->color_primaries = AVCOL_PRI_BT709; - avctx->color_trc = f->color_trc = AVCOL_TRC_IEC61966_2_1; - } else if (s->have_chrm) { - AVColorPrimariesDesc desc; - enum AVColorPrimaries prim; - desc.wp.x = av_make_q(s->white_point[0], 100000); - desc.wp.y = av_make_q(s->white_point[1], 100000); - desc.prim.r.x = av_make_q(s->display_primaries[0][0], 100000); - desc.prim.r.y = av_make_q(s->display_primaries[0][1], 100000); - desc.prim.g.x = av_make_q(s->display_primaries[1][0], 100000); - desc.prim.g.y = av_make_q(s->display_primaries[1][1], 100000); - desc.prim.b.x = av_make_q(s->display_primaries[2][0], 100000); - desc.prim.b.y = av_make_q(s->display_primaries[2][1], 100000); - prim = av_csp_primaries_id_from_desc(&desc); - if (prim != AVCOL_PRI_UNSPECIFIED) - avctx->color_primaries = f->color_primaries = prim; - else - av_log(avctx, AV_LOG_WARNING, "unknown cHRM primaries\n"); - } - - /* these chunks override gAMA */ - if (s->iccp_data || s->have_srgb || s->have_cicp) - av_dict_set(&s->frame_metadata, "gamma", NULL, 0); - - avctx->colorspace = f->colorspace = AVCOL_SPC_RGB; - if (s->stereo_mode >= 0) { AVStereo3D *stereo3d = av_stereo3d_create_side_data(f); if (!stereo3d) { diff --git a/tests/ref/fate/png-icc b/tests/ref/fate/png-icc index 14de544639..1f4eab1fb0 100644 --- a/tests/ref/fate/png-icc +++ b/tests/ref/fate/png-icc @@ -1,5 +1,5 @@ -a50d37a0e72bddea2fcbba6fb773e2a0 *tests/data/fate/png-icc.image2 -49397 tests/data/fate/png-icc.image2 +c460cd06a88ace94d7c76a6309aa8fb8 *tests/data/fate/png-icc.image2 +49441 tests/data/fate/png-icc.image2 #tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo @@ -21,7 +21,7 @@ pkt_duration_time=0.040000 duration=1 duration_time=0.040000 pkt_pos=0 -pkt_size=49397 +pkt_size=49441 width=128 height=128 pix_fmt=rgb24 @@ -34,7 +34,7 @@ top_field_first=0 repeat_pict=0 color_range=pc color_space=gbr -color_primaries=unknown +color_primaries=bt709 color_transfer=unknown chroma_location=unspecified [SIDE_DATA] diff --git a/tests/ref/fate/png-side-data b/tests/ref/fate/png-side-data index a4c16eb395..8f955f76bc 100644 --- a/tests/ref/fate/png-side-data +++ b/tests/ref/fate/png-side-data @@ -26,7 +26,7 @@ top_field_first=0 repeat_pict=0 color_range=pc color_space=gbr -color_primaries=unknown +color_primaries=bt709 color_transfer=unknown chroma_location=unspecified [SIDE_DATA]

1 0