[FFmpeg-devel] [PATCH 1/3] lavc/encode: make sure frame timebase matches encoder, when set

[FFmpeg-devel] [PATCH 1/3] lavc/encode: make sure frame timebase matches encoder, when set

[Anton Khirnov]

AVFrame.time_base has been added recently, but is currently not used for
anything. Prepare for its use in encoders by rejecting frames where
time_base is set, but differs from the AVCodecContext one.
---
 libavcodec/avcodec.h | 4 ++++
 libavcodec/encode.c  | 8 ++++++++
 libavutil/frame.h    | 5 +++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 7365eb5cc0..4030675d4f 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2645,6 +2645,10 @@ int avcodec_receive_frame(AVCodecContext *avctx, AVFrame *frame);
  *                  packets are ignored, and sending frames will return
  *                  AVERROR_EOF.
  *
+ *                  frame->time_base should be set to the same value as
+ *                  avctx->time_base. This is not required yet, but may be in
+ *                  the future.
+ *
  *                  For audio:
  *                  If AV_CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
  *                  can have any number of samples.
diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index b275344bd1..0f78012747 100644
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@@ -386,6 +386,14 @@ static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src)
     AVFrame *dst = avci->buffer_frame;
     int ret;
 
+    /* make sure the frame's timebase (if set) matches the encoder one */
+    if (src->time_base.num &&
+        (src->time_base.num != avctx->time_base.num ||
+         src->time_base.den != avctx->time_base.den)) {
+        av_log(avctx, AV_LOG_ERROR, "Mismatching frame/encoder time base\n");
+        return AVERROR(EINVAL);
+    }
+
     if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) {
         /* extract audio service type metadata */
         AVFrameSideData *sd = av_frame_get_side_data(src, AV_FRAME_DATA_AUDIO_SERVICE_TYPE);
diff --git a/libavutil/frame.h b/libavutil/frame.h
index 6d9563bc5d..c5e2de85b3 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -441,8 +441,9 @@ typedef struct AVFrame {
     /**
      * Time base for the timestamps in this frame.
      * In the future, this field may be set on frames output by decoders or
-     * filters, but its value will be by default ignored on input to encoders
-     * or filters.
+     * filters; its value will be by default ignored on input to filters.
+     * For frames sent to encoders, it should be set by the user to the same
+     * value as AVCodecContext.time_base.
      */
     AVRational time_base;
 
-- 
2.35.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] [PATCH 2/3] lavc/encode: generalize a check for setting dts=pts

[Anton Khirnov]

DTS may be different from PTS only if both of these are true:
- the codec supports reordering
- the encoder has delay
---
 libavcodec/encode.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index 0f78012747..fb3ab0db3c 100644
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@@ -211,7 +211,7 @@ int ff_encode_encode_cb(AVCodecContext *avctx, AVPacket *avpkt,
 
         if (avctx->codec->type == AVMEDIA_TYPE_VIDEO &&
             !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY))
-            avpkt->pts = avpkt->dts = frame->pts;
+            avpkt->pts = frame->pts;
         if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) {
             if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) {
                 if (avpkt->pts == AV_NOPTS_VALUE)
@@ -221,9 +221,12 @@ int ff_encode_encode_cb(AVCodecContext *avctx, AVPacket *avpkt,
                                                               frame->nb_samples);
             }
         }
-        if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) {
+
+        // dts equals pts unless there is reordering
+        // there can be no reordering if there is no encoder delay
+        if (!(avctx->codec_descriptor->props & AV_CODEC_PROP_REORDER) ||
+            !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY))
             avpkt->dts = avpkt->pts;
-        }
     } else {
 unref:
         av_packet_unref(avpkt);
-- 
2.35.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] [PATCH 3/3] lavc/encode: combine setting no-delay pts for video/audio

[Anton Khirnov]

---
 libavcodec/encode.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index fb3ab0db3c..a1bc10fa3a 100644
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@@ -209,13 +209,13 @@ int ff_encode_encode_cb(AVCodecContext *avctx, AVPacket *avpkt,
             av_assert0(avpkt->buf);
         }
 
-        if (avctx->codec->type == AVMEDIA_TYPE_VIDEO &&
-            !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY))
-            avpkt->pts = frame->pts;
+        // set the timestamps for the simple no-delay case
+        // encoders with delay have to set the timestamps themselves
         if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) {
+            if (avpkt->pts == AV_NOPTS_VALUE)
+                avpkt->pts = frame->pts;
+
             if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) {
-                if (avpkt->pts == AV_NOPTS_VALUE)
-                    avpkt->pts = frame->pts;
                 if (!avpkt->duration)
                     avpkt->duration = ff_samples_to_time_base(avctx,
                                                               frame->nb_samples);
-- 
2.35.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".

Re: [FFmpeg-devel] [PATCH 1/3] lavc/encode: make sure frame timebase matches encoder, when set

[Marton Balint]

On Wed, 28 Sep 2022, Anton Khirnov wrote:

> AVFrame.time_base has been added recently, but is currently not used for
> anything. Prepare for its use in encoders by rejecting frames where
> time_base is set, but differs from the AVCodecContext one.

How is that not an API break? Users can encode AVFrames with anything in 
the AVFrame->time_base right now, if you change that behaviour, that will 
surely break some code. That is why it was explicitly documented that 
it will be ignored by encoders by default.

It is the second time people make this mistake, and it is exactly this 
confusion why I was hesitant to accept adding the time base to AVFrame.

Regards,
Marton

> ---
> libavcodec/avcodec.h | 4 ++++
> libavcodec/encode.c  | 8 ++++++++
> libavutil/frame.h    | 5 +++--
> 3 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index 7365eb5cc0..4030675d4f 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -2645,6 +2645,10 @@ int avcodec_receive_frame(AVCodecContext *avctx, AVFrame *frame);
>  *                  packets are ignored, and sending frames will return
>  *                  AVERROR_EOF.
>  *
> + *                  frame->time_base should be set to the same value as
> + *                  avctx->time_base. This is not required yet, but may be in
> + *                  the future.
> + *
>  *                  For audio:
>  *                  If AV_CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
>  *                  can have any number of samples.
> diff --git a/libavcodec/encode.c b/libavcodec/encode.c
> index b275344bd1..0f78012747 100644
> --- a/libavcodec/encode.c
> +++ b/libavcodec/encode.c
> @@ -386,6 +386,14 @@ static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src)
>     AVFrame *dst = avci->buffer_frame;
>     int ret;
>
> +    /* make sure the frame's timebase (if set) matches the encoder one */
> +    if (src->time_base.num &&
> +        (src->time_base.num != avctx->time_base.num ||
> +         src->time_base.den != avctx->time_base.den)) {
> +        av_log(avctx, AV_LOG_ERROR, "Mismatching frame/encoder time base\n");
> +        return AVERROR(EINVAL);
> +    }
> +
>     if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) {
>         /* extract audio service type metadata */
>         AVFrameSideData *sd = av_frame_get_side_data(src, AV_FRAME_DATA_AUDIO_SERVICE_TYPE);
> diff --git a/libavutil/frame.h b/libavutil/frame.h
> index 6d9563bc5d..c5e2de85b3 100644
> --- a/libavutil/frame.h
> +++ b/libavutil/frame.h
> @@ -441,8 +441,9 @@ typedef struct AVFrame {
>     /**
>      * Time base for the timestamps in this frame.
>      * In the future, this field may be set on frames output by decoders or
> -     * filters, but its value will be by default ignored on input to encoders
> -     * or filters.
> +     * filters; its value will be by default ignored on input to filters.
> +     * For frames sent to encoders, it should be set by the user to the same
> +     * value as AVCodecContext.time_base.
>      */
>     AVRational time_base;
>
> -- 
> 2.35.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".

Re: [FFmpeg-devel] [PATCH 1/3] lavc/encode: make sure frame timebase matches encoder, when set

[Anton Khirnov]

Quoting Marton Balint (2022-09-28 21:54:11)
> 
> 
> On Wed, 28 Sep 2022, Anton Khirnov wrote:
> 
> > AVFrame.time_base has been added recently, but is currently not used for
> > anything. Prepare for its use in encoders by rejecting frames where
> > time_base is set, but differs from the AVCodecContext one.
> 
> How is that not an API break? Users can encode AVFrames with anything in 
> the AVFrame->time_base right now, if you change that behaviour, that will 
> surely break some code. That is why it was explicitly documented that 
> it will be ignored by encoders by default.

Why would there be anything in that field? No code we have currently
sets that field or does anything with it. There is no valid reason for
the users to be setting it on the frames they send to lavc.

As for "it would have worked before', there are many precedents where
some nonsensical parameter combination would "work", but then we'd add a
check and it would start returning errors. Callers should not be setting
random fields to random values and expect things to work.

Would applying this patch after a major bump alleviate your concerns? We
wanted to have one for a few months already.

-- 
Anton Khirnov
_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH 1/3] lavc/encode: make sure frame timebase matches encoder, when set

[Marton Balint]

On Tue, 4 Oct 2022, Anton Khirnov wrote:

> Quoting Marton Balint (2022-09-28 21:54:11)
>>
>>
>> On Wed, 28 Sep 2022, Anton Khirnov wrote:
>>
>>> AVFrame.time_base has been added recently, but is currently not used for
>>> anything. Prepare for its use in encoders by rejecting frames where
>>> time_base is set, but differs from the AVCodecContext one.
>>
>> How is that not an API break? Users can encode AVFrames with anything in
>> the AVFrame->time_base right now, if you change that behaviour, that will
>> surely break some code. That is why it was explicitly documented that
>> it will be ignored by encoders by default.
>
> Why would there be anything in that field? No code we have currently
> sets that field or does anything with it.

It is a public field which was explicitly documented to be ignored by 
filters or encoders. The user could store any data in it, because the 
documentation of the field ensured it will not be a problem.

If you read back the old threads which added AVFrame->time_base 
you will find the reasoning behind the original comments, in fact,
you suggested the actual wording for the documentation of the field, and 
now you want now to change the semantics of the field which contradicts 
the existing documentation... Usually we introduce a new field and 
deprecate the old if we want to do something like this.

One could argue that this break is "small" enough, to not dance around it, 
but I don't really see the benefit of the change in the first place. So 
the real question is why do you want to start using AVFrame->time_base in 
encoders, and what is the feature which is undoable with the current 
AVCodecContext->time_base?

Thanks,
Marton

> There is no valid reason for
> the users to be setting it on the frames they send to lavc.
>
> As for "it would have worked before', there are many precedents where
> some nonsensical parameter combination would "work", but then we'd add a
> check and it would start returning errors. Callers should not be setting
> random fields to random values and expect things to work.
>
> Would applying this patch after a major bump alleviate your concerns? We
> wanted to have one for a few months already.
>
> -- 
> Anton Khirnov
> _______________________________________________
> 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".

Re: [FFmpeg-devel] [PATCH 1/3] lavc/encode: make sure frame timebase matches encoder, when set

[Anton Khirnov]

Quoting Marton Balint (2022-10-05 20:54:46)
> 
> 
> On Tue, 4 Oct 2022, Anton Khirnov wrote:
> 
> > Quoting Marton Balint (2022-09-28 21:54:11)
> >>
> >>
> >> On Wed, 28 Sep 2022, Anton Khirnov wrote:
> >>
> >>> AVFrame.time_base has been added recently, but is currently not used for
> >>> anything. Prepare for its use in encoders by rejecting frames where
> >>> time_base is set, but differs from the AVCodecContext one.
> >>
> >> How is that not an API break? Users can encode AVFrames with anything in
> >> the AVFrame->time_base right now, if you change that behaviour, that will
> >> surely break some code. That is why it was explicitly documented that
> >> it will be ignored by encoders by default.
> >
> > Why would there be anything in that field? No code we have currently
> > sets that field or does anything with it.
> 
> It is a public field which was explicitly documented to be ignored by 
> filters or encoders. The user could store any data in it, because the 
> documentation of the field ensured it will not be a problem.
> 
> If you read back the old threads which added AVFrame->time_base 
> you will find the reasoning behind the original comments, in fact,
> you suggested the actual wording for the documentation of the field, and 
> now you want now to change the semantics of the field which contradicts 
> the existing documentation... Usually we introduce a new field and 
> deprecate the old if we want to do something like this.

Honestly I do not remember why I wrote it that way and it now seems like
a mistake to me. We did not add this field as random-number storage for
our callers, we added it to use it in the libraries.

> One could argue that this break is "small" enough, to not dance around it, 
> but I don't really see the benefit of the change in the first place. So 
> the real question is why do you want to start using AVFrame->time_base in 
> encoders, and what is the feature which is undoable with the current 
> AVCodecContext->time_base?

Where I'm going with this is duration handling in encoders. libavcodec
currently disregards AVFrame.duration completely, while properly it
should set output AVPacket.duration from its corresponding
AVFrame.duration. The problem with that is that we cannot just use
AVFrame.duration, because there is no guarantee that the caller is aware
of it and set in the correct timebase. E.g. ffmpeg.c currently does not
touch AVFrame.duration, so whatever value it acquired along the way
(from the decoder or some filter) will linger there in whatever timebase
it was originally in, which is not necessarily equal to the encoder
timebase.

So my idea was to use the timebase being set as an indicator of the
caller being duration-aware. But on more thought, this seems rather
obscure and an explicit option is probably better.

-- 
Anton Khirnov
_______________________________________________
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".