| Message ID | 20221214115819.1886-1-ffmpeg@gyani.pro |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,v3] avformat/movenc: correct write_colr warning placement | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
> 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".
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".
> -----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".
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".
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);