diff mbox series

[FFmpeg-devel] avformat/nutenc: Fix indentation

Message ID AS8P250MB07444E4724B9BB8ABBF7A48A8F412@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit 8b83b52d0fa55c69cf1840075be4b942e4b12f12
Headers show
Series [FFmpeg-devel] avformat/nutenc: Fix indentation | expand

Checks

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

Commit Message

Andreas Rheinhardt Feb. 3, 2024, 7:20 p.m. UTC 
Forgotten after 82beb46e65e5f820b187355bf757725c22a59c45.
Also use loop-scope for iterators while at it.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/nutenc.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

Comments

Leo Izen Feb. 4, 2024, 7:20 a.m. UTC | #1 
On 2/3/24 14:20, Andreas Rheinhardt wrote:
> Forgotten after 82beb46e65e5f820b187355bf757725c22a59c45.
> Also use loop-scope for iterators while at it.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>   libavformat/nutenc.c | 30 +++++++++++++++---------------
>   1 file changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
> index a5198c7ca9..5e0e36babe 100644
> --- a/libavformat/nutenc.c
> +++ b/libavformat/nutenc.c
> @@ -1063,21 +1063,21 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt)
>           ffio_free_dyn_buf(&dyn_bc);
>   
>           if (nut->write_index) {
> -        if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0)
> -            goto fail;
> -
> -        if ((1ll<<60) % nut->sp_count == 0)
> -            for (i=0; i<s->nb_streams; i++) {
> -                int j;
> -                StreamContext *nus = &nut->stream[i];
> -                av_reallocp_array(&nus->keyframe_pts, 2*nut->sp_count, sizeof(*nus->keyframe_pts));
> -                if (!nus->keyframe_pts) {
> -                    ret = AVERROR(ENOMEM);
> -                    goto fail;
> -                }
> -                for (j=nut->sp_count == 1 ? 0 : nut->sp_count; j<2*nut->sp_count; j++)
> -                    nus->keyframe_pts[j] = AV_NOPTS_VALUE;
> -        }
> +            if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0)
> +                goto fail;
> +
> +            if ((1ll<<60) % nut->sp_count == 0)
> +                for (unsigned i = 0; i < s->nb_streams; i++) {
> +                    StreamContext *nus = &nut->stream[i];
> +                    av_reallocp_array(&nus->keyframe_pts, 2*nut->sp_count, sizeof(*nus->keyframe_pts));
> +                    if (!nus->keyframe_pts) {
> +                        ret = AVERROR(ENOMEM);
> +                        goto fail;
> +                    }
> +                    for (int j = nut->sp_count == 1 ? 0 : nut->sp_count;
> +                         j < 2 * nut->sp_count; j++)
> +                        nus->keyframe_pts[j] = AV_NOPTS_VALUE;
> +            }
>           }
>       }
>       av_assert0(nus->last_pts != AV_NOPTS_VALUE);

If we're changing this block of code anyway, could we possibly replace 
this line:

             if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 
/*unused*/, pkt->dts)) < 0)
                 goto fail;

With something like this?

ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts);
if (ret < 0)
     goto fail;

It's a bit cleaner.
Anton Khirnov Feb. 4, 2024, 9:12 a.m. UTC | #2 
Quoting Leo Izen (2024-02-04 08:20:55)
> 
> If we're changing this block of code anyway, could we possibly replace 
> this line:
> 
>              if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 
> /*unused*/, pkt->dts)) < 0)
>                  goto fail;
> 
> With something like this?
> 
> ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts);
> if (ret < 0)
>      goto fail;
> 
> It's a bit cleaner.

I much prefer not to mix whitespace and other changes, it breaks
color-moved, ignore-all-space and similar.
Andreas Rheinhardt Feb. 6, 2024, 9 a.m. UTC | #3 
Andreas Rheinhardt:
> Forgotten after 82beb46e65e5f820b187355bf757725c22a59c45.
> Also use loop-scope for iterators while at it.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavformat/nutenc.c | 30 +++++++++++++++---------------
>  1 file changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
> index a5198c7ca9..5e0e36babe 100644
> --- a/libavformat/nutenc.c
> +++ b/libavformat/nutenc.c
> @@ -1063,21 +1063,21 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt)
>          ffio_free_dyn_buf(&dyn_bc);
>  
>          if (nut->write_index) {
> -        if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0)
> -            goto fail;
> -
> -        if ((1ll<<60) % nut->sp_count == 0)
> -            for (i=0; i<s->nb_streams; i++) {
> -                int j;
> -                StreamContext *nus = &nut->stream[i];
> -                av_reallocp_array(&nus->keyframe_pts, 2*nut->sp_count, sizeof(*nus->keyframe_pts));
> -                if (!nus->keyframe_pts) {
> -                    ret = AVERROR(ENOMEM);
> -                    goto fail;
> -                }
> -                for (j=nut->sp_count == 1 ? 0 : nut->sp_count; j<2*nut->sp_count; j++)
> -                    nus->keyframe_pts[j] = AV_NOPTS_VALUE;
> -        }
> +            if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0)
> +                goto fail;
> +
> +            if ((1ll<<60) % nut->sp_count == 0)
> +                for (unsigned i = 0; i < s->nb_streams; i++) {
> +                    StreamContext *nus = &nut->stream[i];
> +                    av_reallocp_array(&nus->keyframe_pts, 2*nut->sp_count, sizeof(*nus->keyframe_pts));
> +                    if (!nus->keyframe_pts) {
> +                        ret = AVERROR(ENOMEM);
> +                        goto fail;
> +                    }
> +                    for (int j = nut->sp_count == 1 ? 0 : nut->sp_count;
> +                         j < 2 * nut->sp_count; j++)
> +                        nus->keyframe_pts[j] = AV_NOPTS_VALUE;
> +            }
>          }
>      }
>      av_assert0(nus->last_pts != AV_NOPTS_VALUE);

Will apply tonight unless there are objections.

- Andreas
diff mbox series

Patch

diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index a5198c7ca9..5e0e36babe 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -1063,21 +1063,21 @@  static int nut_write_packet(AVFormatContext *s, AVPacket *pkt)
         ffio_free_dyn_buf(&dyn_bc);
 
         if (nut->write_index) {
-        if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0)
-            goto fail;
-
-        if ((1ll<<60) % nut->sp_count == 0)
-            for (i=0; i<s->nb_streams; i++) {
-                int j;
-                StreamContext *nus = &nut->stream[i];
-                av_reallocp_array(&nus->keyframe_pts, 2*nut->sp_count, sizeof(*nus->keyframe_pts));
-                if (!nus->keyframe_pts) {
-                    ret = AVERROR(ENOMEM);
-                    goto fail;
-                }
-                for (j=nut->sp_count == 1 ? 0 : nut->sp_count; j<2*nut->sp_count; j++)
-                    nus->keyframe_pts[j] = AV_NOPTS_VALUE;
-        }
+            if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0)
+                goto fail;
+
+            if ((1ll<<60) % nut->sp_count == 0)
+                for (unsigned i = 0; i < s->nb_streams; i++) {
+                    StreamContext *nus = &nut->stream[i];
+                    av_reallocp_array(&nus->keyframe_pts, 2*nut->sp_count, sizeof(*nus->keyframe_pts));
+                    if (!nus->keyframe_pts) {
+                        ret = AVERROR(ENOMEM);
+                        goto fail;
+                    }
+                    for (int j = nut->sp_count == 1 ? 0 : nut->sp_count;
+                         j < 2 * nut->sp_count; j++)
+                        nus->keyframe_pts[j] = AV_NOPTS_VALUE;
+            }
         }
     }
     av_assert0(nus->last_pts != AV_NOPTS_VALUE);