Re: [FFmpeg-devel] [PATCH 1/3] avformat/iamf_writer: Avoid using dynamic buffer

2024-02-02 Thread James Almer 

On 2/2/2024 8:30 AM, Andreas Rheinhardt wrote:

Andreas Rheinhardt:

Signed-off-by: Andreas Rheinhardt 
---
  libavformat/iamf_writer.c | 28 ++--
  1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c
index 99602ae204..f665f45b7a 100644
--- a/libavformat/iamf_writer.c
+++ b/libavformat/iamf_writer.c
@@ -807,31 +807,15 @@ static int iamf_write_mixing_presentation(const 
IAMFContext *iamf,
  
  int ff_iamf_write_descriptors(const IAMFContext *iamf, AVIOContext *pb, void *log_ctx)

  {
-uint8_t header[MAX_IAMF_OBU_HEADER_SIZE];
-PutBitContext pbc;
-AVIOContext *dyn_bc;
-uint8_t *dyn_buf = NULL;
-int dyn_size;
-
-int ret = avio_open_dyn_buf(_bc);
-if (ret < 0)
-return ret;
+int ret;
  
  // Sequence Header

-init_put_bits(, header, sizeof(header));
-put_bits(, 5, IAMF_OBU_IA_SEQUENCE_HEADER);
-put_bits(, 3, 0);
-flush_put_bits();
+avio_w8(pb, IAMF_OBU_IA_SEQUENCE_HEADER << 3);
  
-avio_write(dyn_bc, header, put_bytes_count(, 1));

-ffio_write_leb(dyn_bc, 6);
-avio_wb32(dyn_bc, MKBETAG('i','a','m','f'));
-avio_w8(dyn_bc, iamf->nb_audio_elements > 1); // primary_profile
-avio_w8(dyn_bc, iamf->nb_audio_elements > 1); // additional_profile
-
-dyn_size = avio_close_dyn_buf(dyn_bc, _buf);
-avio_write(pb, dyn_buf, dyn_size);
-av_free(dyn_buf);
+ffio_write_leb(pb, 6);
+avio_wb32(pb, MKBETAG('i','a','m','f'));
+avio_w8(pb, iamf->nb_audio_elements > 1); // primary_profile
+avio_w8(pb, iamf->nb_audio_elements > 1); // additional_profile
  
  for (int i = 0; i < iamf->nb_codec_configs; i++) {

  ret = iamf_write_codec_config(iamf, iamf->codec_configs[i], pb);


Will apply this patchset tomorrow unless there are objections.

- Andreas


Set LGTM, thanks.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/3] avformat/iamf_writer: Avoid using dynamic buffer

2024-02-02 Thread Andreas Rheinhardt 
Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt 
> ---
>  libavformat/iamf_writer.c | 28 ++--
>  1 file changed, 6 insertions(+), 22 deletions(-)
> 
> diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c
> index 99602ae204..f665f45b7a 100644
> --- a/libavformat/iamf_writer.c
> +++ b/libavformat/iamf_writer.c
> @@ -807,31 +807,15 @@ static int iamf_write_mixing_presentation(const 
> IAMFContext *iamf,
>  
>  int ff_iamf_write_descriptors(const IAMFContext *iamf, AVIOContext *pb, void 
> *log_ctx)
>  {
> -uint8_t header[MAX_IAMF_OBU_HEADER_SIZE];
> -PutBitContext pbc;
> -AVIOContext *dyn_bc;
> -uint8_t *dyn_buf = NULL;
> -int dyn_size;
> -
> -int ret = avio_open_dyn_buf(_bc);
> -if (ret < 0)
> -return ret;
> +int ret;
>  
>  // Sequence Header
> -init_put_bits(, header, sizeof(header));
> -put_bits(, 5, IAMF_OBU_IA_SEQUENCE_HEADER);
> -put_bits(, 3, 0);
> -flush_put_bits();
> +avio_w8(pb, IAMF_OBU_IA_SEQUENCE_HEADER << 3);
>  
> -avio_write(dyn_bc, header, put_bytes_count(, 1));
> -ffio_write_leb(dyn_bc, 6);
> -avio_wb32(dyn_bc, MKBETAG('i','a','m','f'));
> -avio_w8(dyn_bc, iamf->nb_audio_elements > 1); // primary_profile
> -avio_w8(dyn_bc, iamf->nb_audio_elements > 1); // additional_profile
> -
> -dyn_size = avio_close_dyn_buf(dyn_bc, _buf);
> -avio_write(pb, dyn_buf, dyn_size);
> -av_free(dyn_buf);
> +ffio_write_leb(pb, 6);
> +avio_wb32(pb, MKBETAG('i','a','m','f'));
> +avio_w8(pb, iamf->nb_audio_elements > 1); // primary_profile
> +avio_w8(pb, iamf->nb_audio_elements > 1); // additional_profile
>  
>  for (int i = 0; i < iamf->nb_codec_configs; i++) {
>  ret = iamf_write_codec_config(iamf, iamf->codec_configs[i], pb);

Will apply this patchset tomorrow unless there are objections.

- Andreas

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 1/3] avformat/iamf_writer: Avoid using dynamic buffer

2024-01-31 Thread Andreas Rheinhardt 
Signed-off-by: Andreas Rheinhardt 
---
 libavformat/iamf_writer.c | 28 ++--
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c
index 99602ae204..f665f45b7a 100644
--- a/libavformat/iamf_writer.c
+++ b/libavformat/iamf_writer.c
@@ -807,31 +807,15 @@ static int iamf_write_mixing_presentation(const 
IAMFContext *iamf,
 
 int ff_iamf_write_descriptors(const IAMFContext *iamf, AVIOContext *pb, void 
*log_ctx)
 {
-uint8_t header[MAX_IAMF_OBU_HEADER_SIZE];
-PutBitContext pbc;
-AVIOContext *dyn_bc;
-uint8_t *dyn_buf = NULL;
-int dyn_size;
-
-int ret = avio_open_dyn_buf(_bc);
-if (ret < 0)
-return ret;
+int ret;
 
 // Sequence Header
-init_put_bits(, header, sizeof(header));
-put_bits(, 5, IAMF_OBU_IA_SEQUENCE_HEADER);
-put_bits(, 3, 0);
-flush_put_bits();
+avio_w8(pb, IAMF_OBU_IA_SEQUENCE_HEADER << 3);
 
-avio_write(dyn_bc, header, put_bytes_count(, 1));
-ffio_write_leb(dyn_bc, 6);
-avio_wb32(dyn_bc, MKBETAG('i','a','m','f'));
-avio_w8(dyn_bc, iamf->nb_audio_elements > 1); // primary_profile
-avio_w8(dyn_bc, iamf->nb_audio_elements > 1); // additional_profile
-
-dyn_size = avio_close_dyn_buf(dyn_bc, _buf);
-avio_write(pb, dyn_buf, dyn_size);
-av_free(dyn_buf);
+ffio_write_leb(pb, 6);
+avio_wb32(pb, MKBETAG('i','a','m','f'));
+avio_w8(pb, iamf->nb_audio_elements > 1); // primary_profile
+avio_w8(pb, iamf->nb_audio_elements > 1); // additional_profile
 
 for (int i = 0; i < iamf->nb_codec_configs; i++) {
 ret = iamf_write_codec_config(iamf, iamf->codec_configs[i], pb);
-- 
2.34.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-requ...@ffmpeg.org with subject "unsubscribe".