* [FFmpeg-devel] [PATCH v2] avformat/movenc: remove write_colr warning @ 2022-12-12 4:41 Gyan Doshi 2022-12-14 10:51 ` Gyan Doshi 0 siblings, 1 reply; 8+ messages in thread From: Gyan Doshi @ 2022-12-12 4:41 UTC (permalink / raw) To: ffmpeg-devel The old warning is no longer applicable after this block was recomposed in c5b20cfe19. The block is only active for supported formats. --- libavformat/movenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 7b00e65cdd..d1bef25147 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2330,8 +2330,6 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex av_stream_get_side_data(track->st, AV_PKT_DATA_ICC_PROFILE, NULL)) { int prefer_icc = mov->flags & FF_MOV_FLAG_PREFER_ICC || !has_color_info; mov_write_colr_tag(pb, track, prefer_icc); - } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { - av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4.\n"); } } if (track->mode == MODE_MOV || track->mode == MODE_MP4) { -- 2.36.1 _______________________________________________ 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". ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [FFmpeg-devel] [PATCH v2] avformat/movenc: remove write_colr warning 2022-12-12 4:41 [FFmpeg-devel] [PATCH v2] avformat/movenc: remove write_colr warning Gyan Doshi @ 2022-12-14 10:51 ` Gyan Doshi 2022-12-14 11:31 ` "zhilizhao(赵志立)" 0 siblings, 1 reply; 8+ messages in thread From: Gyan Doshi @ 2022-12-14 10:51 UTC (permalink / raw) To: ffmpeg-devel On 2022-12-12 10:11 am, Gyan Doshi wrote: > The old warning is no longer applicable after this block was recomposed in > c5b20cfe19. The block is only active for supported formats. Plan to push tomorrow. > --- > libavformat/movenc.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/libavformat/movenc.c b/libavformat/movenc.c > index 7b00e65cdd..d1bef25147 100644 > --- a/libavformat/movenc.c > +++ b/libavformat/movenc.c > @@ -2330,8 +2330,6 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex > av_stream_get_side_data(track->st, AV_PKT_DATA_ICC_PROFILE, NULL)) { > int prefer_icc = mov->flags & FF_MOV_FLAG_PREFER_ICC || !has_color_info; > mov_write_colr_tag(pb, track, prefer_icc); > - } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { > - av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4.\n"); > } > } > if (track->mode == MODE_MOV || track->mode == MODE_MP4) { _______________________________________________ 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". ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [FFmpeg-devel] [PATCH v2] avformat/movenc: remove write_colr warning 2022-12-14 10:51 ` Gyan Doshi @ 2022-12-14 11:31 ` "zhilizhao(赵志立)" 2022-12-14 11:58 ` [FFmpeg-devel] [PATCH v3] avformat/movenc: correct write_colr warning placement Gyan Doshi 0 siblings, 1 reply; 8+ messages in thread From: "zhilizhao(赵志立)" @ 2022-12-14 11:31 UTC (permalink / raw) To: FFmpeg development discussions and patches > On Dec 14, 2022, at 18:51, Gyan Doshi <ffmpeg@gyani.pro> wrote: > > > On 2022-12-12 10:11 am, Gyan Doshi wrote: >> The old warning is no longer applicable after this block was recomposed in >> c5b20cfe19. The block is only active for supported formats. > > Plan to push tomorrow. > > >> --- >> libavformat/movenc.c | 2 -- >> 1 file changed, 2 deletions(-) >> >> diff --git a/libavformat/movenc.c b/libavformat/movenc.c >> index 7b00e65cdd..d1bef25147 100644 >> --- a/libavformat/movenc.c >> +++ b/libavformat/movenc.c >> @@ -2330,8 +2330,6 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex >> av_stream_get_side_data(track->st, AV_PKT_DATA_ICC_PROFILE, NULL)) { >> int prefer_icc = mov->flags & FF_MOV_FLAG_PREFER_ICC || !has_color_info; >> mov_write_colr_tag(pb, track, prefer_icc); >> - } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { >> - av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4.\n"); >> } >> } Rather than remove the code block, I think the ‘else if’ should be paired with the outer ‘if’. >> if (track->mode == MODE_MOV || track->mode == MODE_MP4) { > > _______________________________________________ > 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". _______________________________________________ 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". ^ permalink raw reply [flat|nested] 8+ messages in thread
* [FFmpeg-devel] [PATCH v3] avformat/movenc: correct write_colr warning placement 2022-12-14 11:31 ` "zhilizhao(赵志立)" @ 2022-12-14 11:58 ` Gyan Doshi 2022-12-14 12:40 ` "zhilizhao(赵志立)" 0 siblings, 1 reply; 8+ messages in thread From: Gyan Doshi @ 2022-12-14 11:58 UTC (permalink / raw) To: ffmpeg-devel The old warning is no longer applicable in the inner block after c5b20cfe19. --- libavformat/movenc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 7b00e65cdd..c427109609 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2330,10 +2330,11 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex av_stream_get_side_data(track->st, AV_PKT_DATA_ICC_PROFILE, NULL)) { int prefer_icc = mov->flags & FF_MOV_FLAG_PREFER_ICC || !has_color_info; mov_write_colr_tag(pb, track, prefer_icc); - } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { - av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4.\n"); } + } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { + av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4 or AVIF.\n"); } + if (track->mode == MODE_MOV || track->mode == MODE_MP4) { mov_write_clli_tag(pb, track); mov_write_mdcv_tag(pb, track); -- 2.36.1 _______________________________________________ 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". ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [FFmpeg-devel] [PATCH v3] avformat/movenc: correct write_colr warning placement 2022-12-14 11:58 ` [FFmpeg-devel] [PATCH v3] avformat/movenc: correct write_colr warning placement Gyan Doshi @ 2022-12-14 12:40 ` "zhilizhao(赵志立)" 2022-12-14 12:48 ` Gyan Doshi 0 siblings, 1 reply; 8+ messages in thread From: "zhilizhao(赵志立)" @ 2022-12-14 12:40 UTC (permalink / raw) To: FFmpeg development discussions and patches > On Dec 14, 2022, at 19:58, Gyan Doshi <ffmpeg@gyani.pro> wrote: > > The old warning is no longer applicable in the inner block after > c5b20cfe19. > --- > libavformat/movenc.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/libavformat/movenc.c b/libavformat/movenc.c > index 7b00e65cdd..c427109609 100644 > --- a/libavformat/movenc.c > +++ b/libavformat/movenc.c > @@ -2330,10 +2330,11 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex > av_stream_get_side_data(track->st, AV_PKT_DATA_ICC_PROFILE, NULL)) { > int prefer_icc = mov->flags & FF_MOV_FLAG_PREFER_ICC || !has_color_info; > mov_write_colr_tag(pb, track, prefer_icc); > - } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { > - av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4.\n"); > } > + } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { > + av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4 or AVIF.\n"); LGTM except the indentation. > } > + > if (track->mode == MODE_MOV || track->mode == MODE_MP4) { > mov_write_clli_tag(pb, track); > mov_write_mdcv_tag(pb, track); > -- > 2.36.1 > > _______________________________________________ > 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". _______________________________________________ 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". ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [FFmpeg-devel] [PATCH v3] avformat/movenc: correct write_colr warning placement 2022-12-14 12:40 ` "zhilizhao(赵志立)" @ 2022-12-14 12:48 ` Gyan Doshi 2022-12-14 14:33 ` Zhao Zhili 0 siblings, 1 reply; 8+ messages in thread From: Gyan Doshi @ 2022-12-14 12:48 UTC (permalink / raw) To: ffmpeg-devel On 2022-12-14 06:10 pm, "zhilizhao(赵志立)" wrote: > >> On Dec 14, 2022, at 19:58, Gyan Doshi <ffmpeg@gyani.pro> wrote: >> >> The old warning is no longer applicable in the inner block after >> c5b20cfe19. >> --- >> libavformat/movenc.c | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/libavformat/movenc.c b/libavformat/movenc.c >> index 7b00e65cdd..c427109609 100644 >> --- a/libavformat/movenc.c >> +++ b/libavformat/movenc.c >> @@ -2330,10 +2330,11 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex >> av_stream_get_side_data(track->st, AV_PKT_DATA_ICC_PROFILE, NULL)) { >> int prefer_icc = mov->flags & FF_MOV_FLAG_PREFER_ICC || !has_color_info; >> mov_write_colr_tag(pb, track, prefer_icc); >> - } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { >> - av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4.\n"); >> } >> + } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { >> + av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4 or AVIF.\n"); > LGTM except the indentation. Do you mean the log line? > >> } >> + >> if (track->mode == MODE_MOV || track->mode == MODE_MP4) { >> mov_write_clli_tag(pb, track); >> mov_write_mdcv_tag(pb, track); >> -- >> 2.36.1 >> >> _______________________________________________ >> 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". > _______________________________________________ > 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". _______________________________________________ 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". ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [FFmpeg-devel] [PATCH v3] avformat/movenc: correct write_colr warning placement 2022-12-14 12:48 ` Gyan Doshi @ 2022-12-14 14:33 ` Zhao Zhili 2022-12-15 10:00 ` Gyan Doshi 0 siblings, 1 reply; 8+ messages in thread From: Zhao Zhili @ 2022-12-14 14:33 UTC (permalink / raw) To: 'FFmpeg development discussions and patches' > -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Gyan Doshi > Sent: 2022年12月14日 20:49 > To: ffmpeg-devel@ffmpeg.org > Subject: Re: [FFmpeg-devel] [PATCH v3] avformat/movenc: correct write_colr warning placement > > > > On 2022-12-14 06:10 pm, "zhilizhao(赵志立)" wrote: > > > >> On Dec 14, 2022, at 19:58, Gyan Doshi <ffmpeg@gyani.pro> wrote: > >> > >> The old warning is no longer applicable in the inner block after > >> c5b20cfe19. > >> --- > >> libavformat/movenc.c | 5 +++-- > >> 1 file changed, 3 insertions(+), 2 deletions(-) > >> > >> diff --git a/libavformat/movenc.c b/libavformat/movenc.c > >> index 7b00e65cdd..c427109609 100644 > >> --- a/libavformat/movenc.c > >> +++ b/libavformat/movenc.c > >> @@ -2330,10 +2330,11 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex > >> av_stream_get_side_data(track->st, AV_PKT_DATA_ICC_PROFILE, NULL)) { > >> int prefer_icc = mov->flags & FF_MOV_FLAG_PREFER_ICC || !has_color_info; > >> mov_write_colr_tag(pb, track, prefer_icc); > >> - } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { > >> - av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4.\n"); > >> } > >> + } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { > >> + av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4 or AVIF.\n"); > > LGTM except the indentation. > > Do you mean the log line? Yes. You can fix it locally before push. > > > > > >> } > >> + > >> if (track->mode == MODE_MOV || track->mode == MODE_MP4) { > >> mov_write_clli_tag(pb, track); > >> mov_write_mdcv_tag(pb, track); > >> -- > >> 2.36.1 > >> > >> _______________________________________________ > >> 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". > > _______________________________________________ > > 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". > > _______________________________________________ > 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". _______________________________________________ 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". ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [FFmpeg-devel] [PATCH v3] avformat/movenc: correct write_colr warning placement 2022-12-14 14:33 ` Zhao Zhili @ 2022-12-15 10:00 ` Gyan Doshi 0 siblings, 0 replies; 8+ messages in thread From: Gyan Doshi @ 2022-12-15 10:00 UTC (permalink / raw) To: ffmpeg-devel On 2022-12-14 08:03 pm, Zhao Zhili wrote: >> -----Original Message----- >> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Gyan Doshi >> Sent: 2022年12月14日 20:49 >> To: ffmpeg-devel@ffmpeg.org >> Subject: Re: [FFmpeg-devel] [PATCH v3] avformat/movenc: correct write_colr warning placement >> >> >> >> On 2022-12-14 06:10 pm, "zhilizhao(赵志立)" wrote: >>>> On Dec 14, 2022, at 19:58, Gyan Doshi <ffmpeg@gyani.pro> wrote: >>>> >>>> The old warning is no longer applicable in the inner block after >>>> c5b20cfe19. >>>> --- >>>> libavformat/movenc.c | 5 +++-- >>>> 1 file changed, 3 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/libavformat/movenc.c b/libavformat/movenc.c >>>> index 7b00e65cdd..c427109609 100644 >>>> --- a/libavformat/movenc.c >>>> +++ b/libavformat/movenc.c >>>> @@ -2330,10 +2330,11 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex >>>> av_stream_get_side_data(track->st, AV_PKT_DATA_ICC_PROFILE, NULL)) { >>>> int prefer_icc = mov->flags & FF_MOV_FLAG_PREFER_ICC || !has_color_info; >>>> mov_write_colr_tag(pb, track, prefer_icc); >>>> - } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { >>>> - av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4.\n"); >>>> } >>>> + } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { >>>> + av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4 or AVIF.\n"); >>> LGTM except the indentation. >> Do you mean the log line? > Yes. You can fix it locally before push. Thanks. Pushed as 9adf02247cd5f1c6cc404ab3dad317a40f4f6e0c Regards, Gyan >> >>>> } >>>> + >>>> if (track->mode == MODE_MOV || track->mode == MODE_MP4) { >>>> mov_write_clli_tag(pb, track); >>>> mov_write_mdcv_tag(pb, track); >>>> -- >>>> 2.36.1 >>>> >>>> _______________________________________________ >>>> 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". >>> _______________________________________________ >>> 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". >> _______________________________________________ >> 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". > _______________________________________________ > 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". _______________________________________________ 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". ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-12-15 10:00 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-12-12 4:41 [FFmpeg-devel] [PATCH v2] avformat/movenc: remove write_colr warning Gyan Doshi 2022-12-14 10:51 ` Gyan Doshi 2022-12-14 11:31 ` "zhilizhao(赵志立)" 2022-12-14 11:58 ` [FFmpeg-devel] [PATCH v3] avformat/movenc: correct write_colr warning placement Gyan Doshi 2022-12-14 12:40 ` "zhilizhao(赵志立)" 2022-12-14 12:48 ` Gyan Doshi 2022-12-14 14:33 ` Zhao Zhili 2022-12-15 10:00 ` Gyan Doshi
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git