* [FFmpeg-devel] [PATCH 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
@ 2022-10-19 22:47 Christopher Degawa
2022-10-19 22:47 ` [FFmpeg-devel] [PATCH 2/2] avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms Christopher Degawa
0 siblings, 1 reply; 9+ messages in thread
From: Christopher Degawa @ 2022-10-19 22:47 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Christopher Degawa
From: Christopher Degawa <christopher.degawa@intel.com>
compressed_ten_bit_format has been deprecated upstream and has no effect
and can be removed. Plus, technically it was never used in the first place
since it would require the app (ffmpeg) to set it and do additional
processing of the input frames.
Also simplify alloc_buffer by removing calculations relating to the
non-existant processing.
Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
---
libavcodec/libsvtav1.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
index 2f5634cee0..28da206cf8 100644
--- a/libavcodec/libsvtav1.c
+++ b/libavcodec/libsvtav1.c
@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
{
- const int pack_mode_10bit =
- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
- const size_t luma_size_8bit =
- config->source_width * config->source_height * (1 << pack_mode_10bit);
- const size_t luma_size_10bit =
- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
+ const size_t luma_size = config->source_width * config->source_height *
+ (config->encoder_bit_depth > 8 ? 2 : 1);
EbSvtIOFormat *in_data;
- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
+ svt_enc->raw_size = luma_size * 3 / 2;
// allocate buffer for in and out
svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
--
2.38.0
_______________________________________________
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] 9+ messages in thread* [FFmpeg-devel] [PATCH 2/2] avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms
2022-10-19 22:47 [FFmpeg-devel] [PATCH 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer Christopher Degawa
@ 2022-10-19 22:47 ` Christopher Degawa
2022-10-19 22:59 ` James Almer
2022-10-21 3:55 ` [FFmpeg-devel] [PATCH v2 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer Christopher Degawa
0 siblings, 2 replies; 9+ messages in thread
From: Christopher Degawa @ 2022-10-19 22:47 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Christopher Degawa
From: Christopher Degawa <christopher.degawa@intel.com>
svt-av1 v1.2.0 has deprecated vbv_bufsize in favor of using
- maximum_buffer_size_ms (--buf-sz)
- starting_buffer_level_ms (--buf-initial-sz)
- optimal_buffer_level_ms (--buf-optimal-sz)
and vbv_bufsize has not been in use since svt-av1 v0.8.6
Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
---
libavcodec/libsvtav1.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
index 28da206cf8..74dad9892b 100644
--- a/libavcodec/libsvtav1.c
+++ b/libavcodec/libsvtav1.c
@@ -179,7 +179,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
param->min_qp_allowed = avctx->qmin;
}
param->max_bit_rate = avctx->rc_max_rate;
- param->vbv_bufsize = avctx->rc_buffer_size;
+ param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000 / avctx->bit_rate;
if (svt_enc->crf > 0) {
param->qp = svt_enc->crf;
@@ -296,7 +296,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
avctx->bit_rate = param->rate_control_mode > 0 ?
param->target_bit_rate : 0;
avctx->rc_max_rate = param->max_bit_rate;
- avctx->rc_buffer_size = param->vbv_bufsize;
+ avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000;
if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) {
AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx);
--
2.38.0
_______________________________________________
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] 9+ messages in thread* Re: [FFmpeg-devel] [PATCH 2/2] avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms
2022-10-19 22:47 ` [FFmpeg-devel] [PATCH 2/2] avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms Christopher Degawa
@ 2022-10-19 22:59 ` James Almer
2022-10-19 23:11 ` Christopher Degawa
2022-10-21 3:55 ` [FFmpeg-devel] [PATCH v2 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer Christopher Degawa
1 sibling, 1 reply; 9+ messages in thread
From: James Almer @ 2022-10-19 22:59 UTC (permalink / raw)
To: ffmpeg-devel
On 10/19/2022 7:47 PM, Christopher Degawa wrote:
> From: Christopher Degawa <christopher.degawa@intel.com>
>
> svt-av1 v1.2.0 has deprecated vbv_bufsize in favor of using
> - maximum_buffer_size_ms (--buf-sz)
> - starting_buffer_level_ms (--buf-initial-sz)
> - optimal_buffer_level_ms (--buf-optimal-sz)
>
> and vbv_bufsize has not been in use since svt-av1 v0.8.6
>
> Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
> ---
> libavcodec/libsvtav1.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
> index 28da206cf8..74dad9892b 100644
> --- a/libavcodec/libsvtav1.c
> +++ b/libavcodec/libsvtav1.c
> @@ -179,7 +179,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
> param->min_qp_allowed = avctx->qmin;
> }
> param->max_bit_rate = avctx->rc_max_rate;
> - param->vbv_bufsize = avctx->rc_buffer_size;
> + param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000 / avctx->bit_rate;
1000LL. The multiplication could overflow otherwise.
>
> if (svt_enc->crf > 0) {
> param->qp = svt_enc->crf;
> @@ -296,7 +296,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
> avctx->bit_rate = param->rate_control_mode > 0 ?
> param->target_bit_rate : 0;
> avctx->rc_max_rate = param->max_bit_rate;
> - avctx->rc_buffer_size = param->vbv_bufsize;
> + avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000;
>
> if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) {
> AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx);
_______________________________________________
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] 9+ messages in thread* Re: [FFmpeg-devel] [PATCH 2/2] avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms
2022-10-19 22:59 ` James Almer
@ 2022-10-19 23:11 ` Christopher Degawa
0 siblings, 0 replies; 9+ messages in thread
From: Christopher Degawa @ 2022-10-19 23:11 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Wed, Oct 19, 2022 at 7:00 PM James Almer <jamrial@gmail.com> wrote:
> On 10/19/2022 7:47 PM, Christopher Degawa wrote:
> > From: Christopher Degawa <christopher.degawa@intel.com>
> > diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
> > index 28da206cf8..74dad9892b 100644
> > --- a/libavcodec/libsvtav1.c
> > +++ b/libavcodec/libsvtav1.c
> > @@ -179,7 +179,7 @@ static int
> config_enc_params(EbSvtAv1EncConfiguration *param,
> > param->min_qp_allowed = avctx->qmin;
> > }
> > param->max_bit_rate = avctx->rc_max_rate;
> > - param->vbv_bufsize = avctx->rc_buffer_size;
> > + param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000 /
> avctx->bit_rate;
>
> 1000LL. The multiplication could overflow otherwise.
>
Thanks, replaced locally.
_______________________________________________
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] 9+ messages in thread
* [FFmpeg-devel] [PATCH v2 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
2022-10-19 22:47 ` [FFmpeg-devel] [PATCH 2/2] avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms Christopher Degawa
2022-10-19 22:59 ` James Almer
@ 2022-10-21 3:55 ` Christopher Degawa
2022-10-21 3:55 ` [FFmpeg-devel] [PATCH v2 2/2] avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms Christopher Degawa
2022-10-27 15:23 ` [FFmpeg-devel] [PATCH v2 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer Christopher Degawa
1 sibling, 2 replies; 9+ messages in thread
From: Christopher Degawa @ 2022-10-21 3:55 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Christopher Degawa
From: Christopher Degawa <christopher.degawa@intel.com>
compressed_ten_bit_format has been deprecated upstream and has no effect
and can be removed. Plus, technically it was never used in the first place
since it would require the app (ffmpeg) to set it and do additional
processing of the input frames.
Also simplify alloc_buffer by removing calculations relating to the
non-existant processing.
Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
---
libavcodec/libsvtav1.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
index 2f5634cee0..28da206cf8 100644
--- a/libavcodec/libsvtav1.c
+++ b/libavcodec/libsvtav1.c
@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
{
- const int pack_mode_10bit =
- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
- const size_t luma_size_8bit =
- config->source_width * config->source_height * (1 << pack_mode_10bit);
- const size_t luma_size_10bit =
- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
+ const size_t luma_size = config->source_width * config->source_height *
+ (config->encoder_bit_depth > 8 ? 2 : 1);
EbSvtIOFormat *in_data;
- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
+ svt_enc->raw_size = luma_size * 3 / 2;
// allocate buffer for in and out
svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
--
2.38.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] 9+ messages in thread* [FFmpeg-devel] [PATCH v2 2/2] avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms
2022-10-21 3:55 ` [FFmpeg-devel] [PATCH v2 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer Christopher Degawa
@ 2022-10-21 3:55 ` Christopher Degawa
2022-10-27 15:23 ` [FFmpeg-devel] [PATCH v2 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer Christopher Degawa
1 sibling, 0 replies; 9+ messages in thread
From: Christopher Degawa @ 2022-10-21 3:55 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Christopher Degawa
From: Christopher Degawa <christopher.degawa@intel.com>
svt-av1 v1.2.0 has deprecated vbv_bufsize in favor of using
- maximum_buffer_size_ms (--buf-sz)
- starting_buffer_level_ms (--buf-initial-sz)
- optimal_buffer_level_ms (--buf-optimal-sz)
and vbv_bufsize has not been in use since svt-av1 v0.8.6
Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
---
libavcodec/libsvtav1.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
index 28da206cf8..48cd58a0b3 100644
--- a/libavcodec/libsvtav1.c
+++ b/libavcodec/libsvtav1.c
@@ -179,7 +179,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
param->min_qp_allowed = avctx->qmin;
}
param->max_bit_rate = avctx->rc_max_rate;
- param->vbv_bufsize = avctx->rc_buffer_size;
+ param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate;
if (svt_enc->crf > 0) {
param->qp = svt_enc->crf;
@@ -296,7 +296,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
avctx->bit_rate = param->rate_control_mode > 0 ?
param->target_bit_rate : 0;
avctx->rc_max_rate = param->max_bit_rate;
- avctx->rc_buffer_size = param->vbv_bufsize;
+ avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000LL;
if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) {
AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx);
--
2.38.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] 9+ messages in thread* Re: [FFmpeg-devel] [PATCH v2 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
2022-10-21 3:55 ` [FFmpeg-devel] [PATCH v2 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer Christopher Degawa
2022-10-21 3:55 ` [FFmpeg-devel] [PATCH v2 2/2] avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms Christopher Degawa
@ 2022-10-27 15:23 ` Christopher Degawa
2022-11-17 23:23 ` Christopher Degawa
1 sibling, 1 reply; 9+ messages in thread
From: Christopher Degawa @ 2022-10-27 15:23 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Christopher Degawa
On Thu, Oct 20, 2022 at 11:56 PM Christopher Degawa <ccom@randomderp.com>
wrote:
> From: Christopher Degawa <christopher.degawa@intel.com>
>
> compressed_ten_bit_format has been deprecated upstream and has no effect
> and can be removed. Plus, technically it was never used in the first place
> since it would require the app (ffmpeg) to set it and do additional
> processing of the input frames.
>
> Also simplify alloc_buffer by removing calculations relating to the
> non-existant processing.
>
> Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
> ---
>
Ping on this and the other patch?
_______________________________________________
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] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH v2 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
2022-10-27 15:23 ` [FFmpeg-devel] [PATCH v2 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer Christopher Degawa
@ 2022-11-17 23:23 ` Christopher Degawa
2022-11-17 23:29 ` James Almer
0 siblings, 1 reply; 9+ messages in thread
From: Christopher Degawa @ 2022-11-17 23:23 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Christopher Degawa
On Thu, Oct 27, 2022 at 11:23 AM Christopher Degawa <ccom@randomderp.com>
wrote:
>
>
> On Thu, Oct 20, 2022 at 11:56 PM Christopher Degawa <ccom@randomderp.com>
> wrote:
>
>> From: Christopher Degawa <christopher.degawa@intel.com>
>>
>> compressed_ten_bit_format has been deprecated upstream and has no effect
>> and can be removed. Plus, technically it was never used in the first place
>> since it would require the app (ffmpeg) to set it and do additional
>> processing of the input frames.
>>
>> Also simplify alloc_buffer by removing calculations relating to the
>> non-existant processing.
>>
>> Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
>> ---
>>
>
> Ping on this and the other patch?
>
ping again? I don't have push rights or anything and nobody is listed as
the maintainer for libsvtav1.c, so I don't really have anyone I can
specifically ping for these.
>
_______________________________________________
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] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH v2 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
2022-11-17 23:23 ` Christopher Degawa
@ 2022-11-17 23:29 ` James Almer
0 siblings, 0 replies; 9+ messages in thread
From: James Almer @ 2022-11-17 23:29 UTC (permalink / raw)
To: ffmpeg-devel
On 11/17/2022 8:23 PM, Christopher Degawa wrote:
> On Thu, Oct 27, 2022 at 11:23 AM Christopher Degawa <ccom@randomderp.com>
> wrote:
>
>>
>>
>> On Thu, Oct 20, 2022 at 11:56 PM Christopher Degawa <ccom@randomderp.com>
>> wrote:
>>
>>> From: Christopher Degawa <christopher.degawa@intel.com>
>>>
>>> compressed_ten_bit_format has been deprecated upstream and has no effect
>>> and can be removed. Plus, technically it was never used in the first place
>>> since it would require the app (ffmpeg) to set it and do additional
>>> processing of the input frames.
>>>
>>> Also simplify alloc_buffer by removing calculations relating to the
>>> non-existant processing.
>>>
>>> Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
>>> ---
>>>
>>
>> Ping on this and the other patch?
>>
>
> ping again? I don't have push rights or anything and nobody is listed as
> the maintainer for libsvtav1.c, so I don't really have anyone I can
> specifically ping for these.
Done. Sorry for the delay.
_______________________________________________
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] 9+ messages in thread
end of thread, other threads:[~2022-11-17 23:29 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-19 22:47 [FFmpeg-devel] [PATCH 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer Christopher Degawa
2022-10-19 22:47 ` [FFmpeg-devel] [PATCH 2/2] avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms Christopher Degawa
2022-10-19 22:59 ` James Almer
2022-10-19 23:11 ` Christopher Degawa
2022-10-21 3:55 ` [FFmpeg-devel] [PATCH v2 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer Christopher Degawa
2022-10-21 3:55 ` [FFmpeg-devel] [PATCH v2 2/2] avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms Christopher Degawa
2022-10-27 15:23 ` [FFmpeg-devel] [PATCH v2 1/2] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer Christopher Degawa
2022-11-17 23:23 ` Christopher Degawa
2022-11-17 23:29 ` James Almer
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