[FFmpeg-devel] [PATCH 1/7] avcodec/cbs_mpeg2: Remove redundant counter

[FFmpeg-devel] [PATCH 1/7] avcodec/cbs_mpeg2: Remove redundant counter

[Andreas Rheinhardt]

Use -1 as the position in ff_cbs_insert_unit_data()
which implicitly reuses frag->nb_units as the counter.

Also switch to a do-while-loop, as it is more natural
than a for-loop now that the counter is gone.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/cbs_mpeg2.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
index 26400f279f..4395bbf047 100644
--- a/libavcodec/cbs_mpeg2.c
+++ b/libavcodec/cbs_mpeg2.c
@@ -148,7 +148,8 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
     CodedBitstreamUnitType unit_type;
     uint32_t start_code = -1;
     size_t unit_size;
-    int err, i, final = 0;
+    int err;
+    int final = 0;
 
     start = avpriv_find_start_code(frag->data, frag->data + frag->data_size,
                                    &start_code);
@@ -157,7 +158,7 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
         return AVERROR_INVALIDDATA;
     }
 
-    for (i = 0;; i++) {
+    do {
         unit_type = start_code & 0xff;
 
         if (start == frag->data + frag->data_size) {
@@ -185,16 +186,13 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
            final     = 1;
         }
 
-        err = ff_cbs_insert_unit_data(frag, i, unit_type, (uint8_t*)start,
+        err = ff_cbs_insert_unit_data(frag, -1, unit_type, (uint8_t*)start,
                                       unit_size, frag->data_ref);
         if (err < 0)
             return err;
 
-        if (final)
-            break;
-
         start = end;
-    }
+    } while (!final);
 
     return 0;
 }
-- 
2.32.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".

[FFmpeg-devel] [PATCH 2/7] avcodec/cbs_jpeg: Remove redundant counter

[Andreas Rheinhardt]

Use -1 as the position in ff_cbs_insert_unit_data()
which implicitly reuses frag->nb_units as the counter.

Also switch to a do-while-loop, as it is more natural
than a for-loop now that the counter is gone.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/cbs_jpeg.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c
index 7d3e10fcc8..ae263ba038 100644
--- a/libavcodec/cbs_jpeg.c
+++ b/libavcodec/cbs_jpeg.c
@@ -110,7 +110,7 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx,
     AVBufferRef *data_ref;
     uint8_t *data;
     size_t data_size;
-    int unit, start, end, marker, next_start, next_marker;
+    int start, end, marker, next_start, next_marker;
     int err, i, j, length;
 
     if (frag->data_size < 4) {
@@ -144,7 +144,7 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx,
     marker = frag->data[i];
     start  = i + 1;
 
-    for (unit = 0;; unit++) {
+    do {
         if (marker == JPEG_MARKER_EOI) {
             break;
         } else if (marker == JPEG_MARKER_SOS) {
@@ -226,16 +226,14 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx,
             data_ref  = frag->data_ref;
         }
 
-        err = ff_cbs_insert_unit_data(frag, unit, marker,
+        err = ff_cbs_insert_unit_data(frag, -1, marker,
                                       data, data_size, data_ref);
         if (err < 0)
             return err;
 
-        if (next_marker == -1)
-            break;
         marker = next_marker;
         start  = next_start;
-    }
+    } while (next_marker != -1);
 
     return 0;
 }
-- 
2.32.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".

[FFmpeg-devel] [PATCH 3/7] avcodec/cbs: Make ff_cbs_insert_unit_data() always append the new unit

[Andreas Rheinhardt]

All split functions (the only users of this function) only
append units.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/cbs.c       | 22 +++++++++++++++-------
 libavcodec/cbs.h       |  5 ++---
 libavcodec/cbs_av1.c   |  2 +-
 libavcodec/cbs_h2645.c |  2 +-
 libavcodec/cbs_jpeg.c  |  2 +-
 libavcodec/cbs_mpeg2.c |  2 +-
 libavcodec/cbs_vp9.c   |  4 ++--
 7 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c
index d7aa67c3af..e829caa0a0 100644
--- a/libavcodec/cbs.c
+++ b/libavcodec/cbs.c
@@ -789,18 +789,16 @@ int ff_cbs_insert_unit_content(CodedBitstreamFragment *frag,
     return 0;
 }
 
-int ff_cbs_insert_unit_data(CodedBitstreamFragment *frag,
-                            int position,
-                            CodedBitstreamUnitType type,
-                            uint8_t *data, size_t data_size,
-                            AVBufferRef *data_buf)
+static int cbs_insert_unit_data(CodedBitstreamFragment *frag,
+                                CodedBitstreamUnitType type,
+                                uint8_t *data, size_t data_size,
+                                AVBufferRef *data_buf,
+                                int position)
 {
     CodedBitstreamUnit *unit;
     AVBufferRef *data_ref;
     int err;
 
-    if (position == -1)
-        position = frag->nb_units;
     av_assert0(position >= 0 && position <= frag->nb_units);
 
     if (data_buf)
@@ -828,6 +826,16 @@ int ff_cbs_insert_unit_data(CodedBitstreamFragment *frag,
     return 0;
 }
 
+int ff_cbs_append_unit_data(CodedBitstreamFragment *frag,
+                            CodedBitstreamUnitType type,
+                            uint8_t *data, size_t data_size,
+                            AVBufferRef *data_buf)
+{
+    return cbs_insert_unit_data(frag, type,
+                                data, data_size, data_buf,
+                                frag->nb_units);
+}
+
 void ff_cbs_delete_unit(CodedBitstreamFragment *frag,
                         int position)
 {
diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h
index 87ea14cd07..5583063b5e 100644
--- a/libavcodec/cbs.h
+++ b/libavcodec/cbs.h
@@ -393,14 +393,13 @@ int ff_cbs_insert_unit_content(CodedBitstreamFragment *frag,
                                AVBufferRef *content_buf);
 
 /**
- * Insert a new unit into a fragment with the given data bitstream.
+ * Add a new unit to a fragment with the given data bitstream.
  *
  * If data_buf is not supplied then data must have been allocated with
  * av_malloc() and will on success become owned by the unit after this
  * call or freed on error.
  */
-int ff_cbs_insert_unit_data(CodedBitstreamFragment *frag,
-                            int position,
+int ff_cbs_append_unit_data(CodedBitstreamFragment *frag,
                             CodedBitstreamUnitType type,
                             uint8_t *data, size_t data_size,
                             AVBufferRef *data_buf);
diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
index 302e1f38f5..04314443de 100644
--- a/libavcodec/cbs_av1.c
+++ b/libavcodec/cbs_av1.c
@@ -828,7 +828,7 @@ static int cbs_av1_split_fragment(CodedBitstreamContext *ctx,
             goto fail;
         }
 
-        err = ff_cbs_insert_unit_data(frag, -1, header.obu_type,
+        err = ff_cbs_append_unit_data(frag, header.obu_type,
                                       data, obu_length, frag->data_ref);
         if (err < 0)
             goto fail;
diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
index 3396c059c9..10b3bcc70b 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -493,7 +493,7 @@ static int cbs_h2645_fragment_add_nals(CodedBitstreamContext *ctx,
         ref = (nal->data == nal->raw_data) ? frag->data_ref
                                            : packet->rbsp.rbsp_buffer_ref;
 
-        err = ff_cbs_insert_unit_data(frag, -1, nal->type,
+        err = ff_cbs_append_unit_data(frag, nal->type,
                             (uint8_t*)nal->data, size, ref);
         if (err < 0)
             return err;
diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c
index ae263ba038..da7ee808cf 100644
--- a/libavcodec/cbs_jpeg.c
+++ b/libavcodec/cbs_jpeg.c
@@ -226,7 +226,7 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx,
             data_ref  = frag->data_ref;
         }
 
-        err = ff_cbs_insert_unit_data(frag, -1, marker,
+        err = ff_cbs_append_unit_data(frag, marker,
                                       data, data_size, data_ref);
         if (err < 0)
             return err;
diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
index 4395bbf047..2bf38c6001 100644
--- a/libavcodec/cbs_mpeg2.c
+++ b/libavcodec/cbs_mpeg2.c
@@ -186,7 +186,7 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
            final     = 1;
         }
 
-        err = ff_cbs_insert_unit_data(frag, -1, unit_type, (uint8_t*)start,
+        err = ff_cbs_append_unit_data(frag, unit_type, (uint8_t*)start,
                                       unit_size, frag->data_ref);
         if (err < 0)
             return err;
diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c
index e0b8c02ac2..333d70ba4e 100644
--- a/libavcodec/cbs_vp9.c
+++ b/libavcodec/cbs_vp9.c
@@ -451,7 +451,7 @@ static int cbs_vp9_split_fragment(CodedBitstreamContext *ctx,
                 return AVERROR_INVALIDDATA;
             }
 
-            err = ff_cbs_insert_unit_data(frag, -1, 0,
+            err = ff_cbs_append_unit_data(frag, 0,
                                           frag->data + pos,
                                           sfi.frame_sizes[i],
                                           frag->data_ref);
@@ -469,7 +469,7 @@ static int cbs_vp9_split_fragment(CodedBitstreamContext *ctx,
         return 0;
 
     } else {
-        err = ff_cbs_insert_unit_data(frag, -1, 0,
+        err = ff_cbs_append_unit_data(frag, 0,
                                       frag->data, frag->data_size,
                                       frag->data_ref);
         if (err < 0)
-- 
2.32.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".

[FFmpeg-devel] [PATCH 4/7] avcodec/cbs_mpeg2: Simplify splitting fragment

[Andreas Rheinhardt]

avpriv_find_start_code() supports non-contiguous buffers
by maintaining a state that allows to find start codes
that span across multiple buffers; a consequence thereof
is that avpriv_find_start_code() is given a zero-sized
buffer, it does not modify this state, so that it appears
as if a start code was found if the state contained a start code.

This can e.g. happen with Sequence End units in MPEG-2 and
to counter this, cbs_mpeg2_split_fragment() reset the state
when it has already encountered the end of the fragment
in order to add the last unit (if it is only of the form 00 00 01 xy)
only once; it also used a flag to set whether this is the final unit.

Yet this can be improved by simply resetting state unconditionally
(thereby avoiding a branch); the flag can be removed by just checking
whether we have a valid start code (of the next unit to add)
at the end.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/cbs_mpeg2.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
index 2bf38c6001..90d667ddc8 100644
--- a/libavcodec/cbs_mpeg2.c
+++ b/libavcodec/cbs_mpeg2.c
@@ -149,7 +149,6 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
     uint32_t start_code = -1;
     size_t unit_size;
     int err;
-    int final = 0;
 
     start = avpriv_find_start_code(frag->data, frag->data + frag->data_size,
                                    &start_code);
@@ -161,14 +160,11 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
     do {
         unit_type = start_code & 0xff;
 
-        if (start == frag->data + frag->data_size) {
-            // The last four bytes form a start code which constitutes
-            // a unit of its own.  In this situation avpriv_find_start_code
-            // won't modify start_code at all so modify start_code so that
-            // the next unit will be treated as the last unit.
-            start_code = 0;
-        }
-
+        // Reset start_code to ensure that avpriv_find_start_code()
+        // really reads a new start code and does not reuse the old
+        // start code in any way (as e.g. happens when there is a
+        // Sequence End unit at the very end of a packet).
+        start_code = UINT32_MAX;
         end = avpriv_find_start_code(start--, frag->data + frag->data_size,
                                      &start_code);
 
@@ -183,7 +179,6 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
         } else {
            // We didn't find a start code, so this is the final unit.
            unit_size = end - start;
-           final     = 1;
         }
 
         err = ff_cbs_append_unit_data(frag, unit_type, (uint8_t*)start,
@@ -192,7 +187,7 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
             return err;
 
         start = end;
-    } while (!final);
+    } while ((start_code >> 8) == 0x000001);
 
     return 0;
 }
-- 
2.32.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".

Re: [FFmpeg-devel] [PATCH 4/7] avcodec/cbs_mpeg2: Simplify splitting fragment

[Scott Theisen]

On 2/4/22 10:16, Andreas Rheinhardt wrote:
> avpriv_find_start_code() supports non-contiguous buffers
> by maintaining a state that allows to find start codes
> that span across multiple buffers; a consequence thereof
> is that avpriv_find_start_code() is given a zero-sized
> buffer, it does not modify this state, so that it appears
> as if a start code was found if the state contained a start code.
>
> This can e.g. happen with Sequence End units in MPEG-2 and
> to counter this, cbs_mpeg2_split_fragment() reset the state
> when it has already encountered the end of the fragment
> in order to add the last unit (if it is only of the form 00 00 01 xy)
> only once; it also used a flag to set whether this is the final unit.
>
> Yet this can be improved by simply resetting state unconditionally
> (thereby avoiding a branch); the flag can be removed by just checking
> whether we have a valid start code (of the next unit to add)
> at the end.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>   libavcodec/cbs_mpeg2.c | 17 ++++++-----------
>   1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
> index 2bf38c6001..90d667ddc8 100644
> --- a/libavcodec/cbs_mpeg2.c
> +++ b/libavcodec/cbs_mpeg2.c
> @@ -149,7 +149,6 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
>       uint32_t start_code = -1;
>       size_t unit_size;
>       int err;
> -    int final = 0;
>   
>       start = avpriv_find_start_code(frag->data, frag->data + frag->data_size,
>                                      &start_code);
> @@ -161,14 +160,11 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
>       do {
>           unit_type = start_code & 0xff;
>   
> -        if (start == frag->data + frag->data_size) {
> -            // The last four bytes form a start code which constitutes
> -            // a unit of its own.  In this situation avpriv_find_start_code
> -            // won't modify start_code at all so modify start_code so that
> -            // the next unit will be treated as the last unit.
> -            start_code = 0;
> -        }
> -
> +        // Reset start_code to ensure that avpriv_find_start_code()
> +        // really reads a new start code and does not reuse the old
> +        // start code in any way (as e.g. happens when there is a
> +        // Sequence End unit at the very end of a packet).
> +        start_code = UINT32_MAX;
>           end = avpriv_find_start_code(start--, frag->data + frag->data_size,
>                                        &start_code);
>   
> @@ -183,7 +179,6 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
>           } else {
>              // We didn't find a start code, so this is the final unit.
>              unit_size = end - start;
> -           final     = 1;
>           }
>   
>           err = ff_cbs_append_unit_data(frag, unit_type, (uint8_t*)start,
> @@ -192,7 +187,7 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
>               return err;
>   
>           start = end;
> -    } while (!final);
> +    } while ((start_code >> 8) == 0x000001);
>   
>       return 0;
>   }

I assume this is inspired by my patch series.  Did you see v2 of my 
patch series where I made similar and more extensive clarifications?

The check for sequence_end_codes should not be in the loop.  It harms 
readability, although you also eliminated the branch.

Regards,
Scott
_______________________________________________
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 4/7] avcodec/cbs_mpeg2: Simplify splitting fragment

[Scott Theisen]

On 2/4/22 14:01, Scott Theisen wrote:
>
> I assume this is inspired by my patch series.  Did you see v2 of my 
> patch series where I made similar and more extensive clarifications?
>
> The check for sequence_end_codes should not be in the loop.  It harms 
> readability, although you also eliminated the branch.

I retract my comments.

-Scott
_______________________________________________
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 5/7] all: Remove unnecessary libavcodec/internal.h inclusions

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/aac_adtstoasc_bsf.c | 1 -
 libavcodec/aliaspixenc.c       | 1 -
 libavcodec/av1_parser.c        | 1 -
 libavcodec/avpacket.c          | 6 ++----
 libavcodec/cbs_av1.c           | 2 +-
 libavcodec/cbs_vp9.c           | 1 -
 libavcodec/cljrenc.c           | 2 --
 libavcodec/dca_core.c          | 1 +
 libavcodec/dca_core.h          | 2 --
 libavcodec/dca_lbr.c           | 1 +
 libavcodec/dca_lbr.h           | 2 --
 libavcodec/dca_xll.c           | 1 +
 libavcodec/dca_xll.h           | 2 --
 libavcodec/dcadec.c            | 1 +
 libavcodec/dv.c                | 7 -------
 libavcodec/dvbsub_parser.c     | 1 -
 libavcodec/dxtory.c            | 1 -
 libavcodec/ffv1.c              | 6 ------
 libavcodec/ffv1.h              | 4 ----
 libavcodec/fitsenc.c           | 1 -
 libavcodec/flacdata.c          | 2 +-
 libavcodec/flacdata.h          | 2 +-
 libavcodec/h264_ps.c           | 1 -
 libavcodec/h264_refs.c         | 1 -
 libavcodec/hevc_parser.c       | 1 -
 libavcodec/hevc_refs.c         | 2 --
 libavcodec/hevcdec.c           | 1 +
 libavcodec/hevcdec.h           | 2 --
 libavcodec/ituh263dec.c        | 1 -
 libavcodec/jpeg2000dwt.c       | 1 -
 libavcodec/motion_est.c        | 1 -
 libavcodec/opusenc.h           | 1 -
 libavcodec/parser.c            | 1 -
 libavcodec/ratecontrol.c       | 1 -
 libavcodec/scpr.h              | 5 -----
 libavcodec/sheervideo.c        | 5 -----
 libavcodec/ttadata.c           | 1 +
 libavcodec/ttadata.h           | 2 +-
 libavcodec/twinvq.h            | 1 -
 libavcodec/vaapi_mpeg2.c       | 1 -
 libavcodec/vaapi_mpeg4.c       | 1 -
 libavcodec/vaapi_vc1.c         | 1 -
 libavcodec/vc1_parser.c        | 1 -
 libavcodec/vdpau_h264.c        | 1 -
 libavcodec/vdpau_hevc.c        | 1 -
 libavcodec/vdpau_vp9.c         | 1 -
 libavcodec/vp9mvs.c            | 1 -
 libavcodec/wma.c               | 1 -
 libavcodec/xbmenc.c            | 1 -
 libavcodec/xfaceenc.c          | 1 -
 libavcodec/xwdenc.c            | 2 --
 libavcodec/yuv4enc.c           | 1 -
 libavformat/assdec.c           | 1 -
 libavformat/h264dec.c          | 1 -
 libavformat/hcom.c             | 1 -
 libavformat/ipudec.c           | 1 -
 libavformat/jacosubdec.c       | 1 -
 libavformat/network.c          | 1 -
 libavformat/samidec.c          | 2 --
 libavformat/subviewerdec.c     | 1 -
 60 files changed, 12 insertions(+), 87 deletions(-)

diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c
index 69453c706f..267ef97572 100644
--- a/libavcodec/aac_adtstoasc_bsf.c
+++ b/libavcodec/aac_adtstoasc_bsf.c
@@ -26,7 +26,6 @@
 #include "put_bits.h"
 #include "get_bits.h"
 #include "mpeg4audio.h"
-#include "internal.h"
 
 typedef struct AACBSFContext {
     int first_frame_done;
diff --git a/libavcodec/aliaspixenc.c b/libavcodec/aliaspixenc.c
index fa273df9c2..27b7d1d8de 100644
--- a/libavcodec/aliaspixenc.c
+++ b/libavcodec/aliaspixenc.c
@@ -24,7 +24,6 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "encode.h"
-#include "internal.h"
 
 #define ALIAS_HEADER_SIZE 10
 
diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c
index d2dfdb3580..4cbd7408a0 100644
--- a/libavcodec/av1_parser.c
+++ b/libavcodec/av1_parser.c
@@ -23,7 +23,6 @@
 #include "libavutil/avassert.h"
 #include "cbs.h"
 #include "cbs_av1.h"
-#include "internal.h"
 #include "parser.h"
 
 typedef struct AV1ParseContext {
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index 4f7a6b255c..bcbc4166cb 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -22,14 +22,12 @@
 #include <string.h>
 
 #include "libavutil/avassert.h"
-#include "libavutil/common.h"
-#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/mem.h"
 #include "libavutil/rational.h"
 
-#include "bytestream.h"
-#include "internal.h"
+#include "defs.h"
 #include "packet.h"
 #include "packet_internal.h"
 
diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
index 04314443de..1229480567 100644
--- a/libavcodec/cbs_av1.c
+++ b/libavcodec/cbs_av1.c
@@ -20,10 +20,10 @@
 #include "libavutil/opt.h"
 #include "libavutil/pixfmt.h"
 
+#include "avcodec.h"
 #include "cbs.h"
 #include "cbs_internal.h"
 #include "cbs_av1.h"
-#include "internal.h"
 
 
 static int cbs_av1_read_uvlc(CodedBitstreamContext *ctx, GetBitContext *gbc,
diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c
index 333d70ba4e..ae7f88a8a3 100644
--- a/libavcodec/cbs_vp9.c
+++ b/libavcodec/cbs_vp9.c
@@ -21,7 +21,6 @@
 #include "cbs.h"
 #include "cbs_internal.h"
 #include "cbs_vp9.h"
-#include "internal.h"
 
 
 static int cbs_vp9_read_s(CodedBitstreamContext *ctx, GetBitContext *gbc,
diff --git a/libavcodec/cljrenc.c b/libavcodec/cljrenc.c
index aa53a110d0..21e033753b 100644
--- a/libavcodec/cljrenc.c
+++ b/libavcodec/cljrenc.c
@@ -24,12 +24,10 @@
  * Cirrus Logic AccuPak encoder.
  */
 
-#include "libavutil/common.h"
 #include "libavutil/opt.h"
 
 #include "avcodec.h"
 #include "encode.h"
-#include "internal.h"
 #include "put_bits.h"
 
 typedef struct CLJRContext {
diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c
index 758e3447a6..80f3525b46 100644
--- a/libavcodec/dca_core.c
+++ b/libavcodec/dca_core.c
@@ -25,6 +25,7 @@
 #include "dcahuff.h"
 #include "dcamath.h"
 #include "dca_syncwords.h"
+#include "internal.h"
 
 #if ARCH_ARM
 #include "arm/dca.h"
diff --git a/libavcodec/dca_core.h b/libavcodec/dca_core.h
index 86bfa62203..cb8e38a94b 100644
--- a/libavcodec/dca_core.h
+++ b/libavcodec/dca_core.h
@@ -21,13 +21,11 @@
 #ifndef AVCODEC_DCA_CORE_H
 #define AVCODEC_DCA_CORE_H
 
-#include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/fixed_dsp.h"
 #include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
-#include "internal.h"
 #include "get_bits.h"
 #include "dca.h"
 #include "dca_exss.h"
diff --git a/libavcodec/dca_lbr.c b/libavcodec/dca_lbr.c
index 481a8df7e6..c1e3b0ddc3 100644
--- a/libavcodec/dca_lbr.c
+++ b/libavcodec/dca_lbr.c
@@ -28,6 +28,7 @@
 #include "dcahuff.h"
 #include "dca_syncwords.h"
 #include "bytestream.h"
+#include "internal.h"
 
 #define AMP_MAX     56
 
diff --git a/libavcodec/dca_lbr.h b/libavcodec/dca_lbr.h
index 2eccbe1ff2..db7a676c31 100644
--- a/libavcodec/dca_lbr.h
+++ b/libavcodec/dca_lbr.h
@@ -21,12 +21,10 @@
 #ifndef AVCODEC_DCA_LBR_H
 #define AVCODEC_DCA_LBR_H
 
-#include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
-#include "internal.h"
 #include "get_bits.h"
 #include "dca.h"
 #include "dca_exss.h"
diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c
index ab14dbcc88..316045b588 100644
--- a/libavcodec/dca_xll.c
+++ b/libavcodec/dca_xll.c
@@ -23,6 +23,7 @@
 #include "dcadata.h"
 #include "dcamath.h"
 #include "dca_syncwords.h"
+#include "internal.h"
 #include "unary.h"
 
 static int get_linear(GetBitContext *gb, int n)
diff --git a/libavcodec/dca_xll.h b/libavcodec/dca_xll.h
index 3aaad6d370..d223133019 100644
--- a/libavcodec/dca_xll.h
+++ b/libavcodec/dca_xll.h
@@ -21,11 +21,9 @@
 #ifndef AVCODEC_DCA_XLL_H
 #define AVCODEC_DCA_XLL_H
 
-#include "libavutil/common.h"
 #include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
-#include "internal.h"
 #include "get_bits.h"
 #include "dca.h"
 #include "dcadsp.h"
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 43694b51f7..49b52f805f 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -25,6 +25,7 @@
 #include "dcadec.h"
 #include "dcahuff.h"
 #include "dca_syncwords.h"
+#include "internal.h"
 #include "profiles.h"
 
 #define MIN_PACKET_SIZE     16
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 8a4cac859e..e2550c4cc1 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -38,15 +38,8 @@
  * DV codec.
  */
 
-#include "libavutil/internal.h"
-#include "libavutil/pixdesc.h"
-
 #include "avcodec.h"
 #include "dv.h"
-#include "dvdata.h"
-#include "internal.h"
-#include "put_bits.h"
-#include "simple_idct.h"
 
 static inline void dv_calc_mb_coordinates(const AVDVProfile *d, int chan,
                                           int seq, int slot, uint16_t *tbl)
diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c
index 88bf5b9d74..b2d5446867 100644
--- a/libavcodec/dvbsub_parser.c
+++ b/libavcodec/dvbsub_parser.c
@@ -25,7 +25,6 @@
 #include "libavutil/intreadwrite.h"
 
 #include "avcodec.h"
-#include "internal.h"
 
 /* Parser (mostly) copied from dvdsub.c */
 
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 914131e742..36c30c1dbc 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -29,7 +29,6 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "unary.h"
 #include "thread.h"
 
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index d8a0c39254..7eaa72f244 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -27,15 +27,9 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
-#include "libavutil/crc.h"
-#include "libavutil/opt.h"
-#include "libavutil/imgutils.h"
-#include "libavutil/pixdesc.h"
 
 #include "avcodec.h"
-#include "internal.h"
 #include "rangecoder.h"
-#include "mathops.h"
 #include "ffv1.h"
 
 av_cold int ff_ffv1_common_init(AVCodecContext *avctx)
diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h
index 8ffe5ab433..ba612bc258 100644
--- a/libavcodec/ffv1.h
+++ b/libavcodec/ffv1.h
@@ -28,13 +28,9 @@
  * FF Video Codec 1 (a lossless codec)
  */
 
-#include "libavutil/crc.h"
-#include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
-#include "libavutil/pixdesc.h"
 #include "avcodec.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "mathops.h"
 #include "put_bits.h"
 #include "rangecoder.h"
diff --git a/libavcodec/fitsenc.c b/libavcodec/fitsenc.c
index dfaa04cdbd..3ac1141b69 100644
--- a/libavcodec/fitsenc.c
+++ b/libavcodec/fitsenc.c
@@ -33,7 +33,6 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "encode.h"
-#include "internal.h"
 
 static int fits_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                             const AVFrame *pict, int *got_packet)
diff --git a/libavcodec/flacdata.c b/libavcodec/flacdata.c
index 1954f32d32..d96e3e0966 100644
--- a/libavcodec/flacdata.c
+++ b/libavcodec/flacdata.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "internal.h"
+#include "flacdata.h"
 
 const int ff_flac_sample_rate_table[16] =
 { 0,
diff --git a/libavcodec/flacdata.h b/libavcodec/flacdata.h
index e2c1e5d7f2..ef21840777 100644
--- a/libavcodec/flacdata.h
+++ b/libavcodec/flacdata.h
@@ -22,7 +22,7 @@
 #ifndef AVCODEC_FLACDATA_H
 #define AVCODEC_FLACDATA_H
 
-#include "internal.h"
+#include <stdint.h>
 
 extern const int ff_flac_sample_rate_table[16];
 
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 6927fa7198..051f06692c 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -28,7 +28,6 @@
 #include <inttypes.h>
 
 #include "libavutil/imgutils.h"
-#include "internal.h"
 #include "mathops.h"
 #include "avcodec.h"
 #include "h264data.h"
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 94b473257f..50bbe94917 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -28,7 +28,6 @@
 #include <inttypes.h>
 
 #include "libavutil/avassert.h"
-#include "internal.h"
 #include "avcodec.h"
 #include "h264.h"
 #include "h264dec.h"
diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c
index c944a6aacd..59f9a0ff3e 100644
--- a/libavcodec/hevc_parser.c
+++ b/libavcodec/hevc_parser.c
@@ -28,7 +28,6 @@
 #include "hevc_ps.h"
 #include "hevc_sei.h"
 #include "h2645_parse.h"
-#include "internal.h"
 #include "parser.h"
 
 #define START_CODE 0x000001 ///< start_code_prefix_one_3bytes
diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
index 06e42d9c53..d496918feb 100644
--- a/libavcodec/hevc_refs.c
+++ b/libavcodec/hevc_refs.c
@@ -22,9 +22,7 @@
  */
 
 #include "libavutil/avassert.h"
-#include "libavutil/pixdesc.h"
 
-#include "internal.h"
 #include "thread.h"
 #include "hevc.h"
 #include "hevcdec.h"
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index 8d7a4f7147..ed012c4e75 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -44,6 +44,7 @@
 #include "hevc_parse.h"
 #include "hevcdec.h"
 #include "hwconfig.h"
+#include "internal.h"
 #include "profiles.h"
 
 const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 };
diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h
index 157bc6926f..8e26c852db 100644
--- a/libavcodec/hevcdec.h
+++ b/libavcodec/hevcdec.h
@@ -26,7 +26,6 @@
 #include <stdatomic.h>
 
 #include "libavutil/buffer.h"
-#include "libavutil/md5.h"
 #include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
@@ -41,7 +40,6 @@
 #include "hevc_sei.h"
 #include "hevcdsp.h"
 #include "h274.h"
-#include "internal.h"
 #include "thread.h"
 #include "videodsp.h"
 
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index 7d7a1f01a2..445d5f3f36 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -40,7 +40,6 @@
 #include "h263.h"
 #include "h263data.h"
 #include "h263dec.h"
-#include "internal.h"
 #include "mathops.h"
 #include "mpegutils.h"
 #include "unary.h"
diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c
index f9a0977407..ed24091fe8 100644
--- a/libavcodec/jpeg2000dwt.c
+++ b/libavcodec/jpeg2000dwt.c
@@ -28,7 +28,6 @@
 #include "libavutil/common.h"
 #include "libavutil/mem.h"
 #include "jpeg2000dwt.h"
-#include "internal.h"
 
 /* Defines for 9/7 DWT lifting parameters.
  * Parameters are in float. */
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 5b0958733c..9c548c1567 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -32,7 +32,6 @@
 #include <limits.h>
 
 #include "avcodec.h"
-#include "internal.h"
 #include "mathops.h"
 #include "motion_est.h"
 #include "mpegutils.h"
diff --git a/libavcodec/opusenc.h b/libavcodec/opusenc.h
index b623b3e948..32d23deead 100644
--- a/libavcodec/opusenc.h
+++ b/libavcodec/opusenc.h
@@ -22,7 +22,6 @@
 #ifndef AVCODEC_OPUSENC_H
 #define AVCODEC_OPUSENC_H
 
-#include "internal.h"
 #include "opus_celt.h"
 
 /* Determines the maximum delay the psychoacoustic system will use for lookahead */
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 3b459cc125..24fe44eb30 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include "libavutil/avassert.h"
-#include "libavutil/internal.h"
 #include "libavutil/mem.h"
 
 #include "internal.h"
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 6b77ccd006..9cfc21df64 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -29,7 +29,6 @@
 #include "libavutil/internal.h"
 
 #include "avcodec.h"
-#include "internal.h"
 #include "ratecontrol.h"
 #include "mpegutils.h"
 #include "mpegvideo.h"
diff --git a/libavcodec/scpr.h b/libavcodec/scpr.h
index 15cb87c464..d161a42c6e 100644
--- a/libavcodec/scpr.h
+++ b/libavcodec/scpr.h
@@ -23,13 +23,8 @@
 #ifndef AVCODEC_SCPR_H
 #define AVCODEC_SCPR_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "avcodec.h"
 #include "bytestream.h"
-#include "internal.h"
 #include "scpr3.h"
 
 typedef struct RangeCoder {
diff --git a/libavcodec/sheervideo.c b/libavcodec/sheervideo.c
index fb5a39303e..dbe8e4f516 100644
--- a/libavcodec/sheervideo.c
+++ b/libavcodec/sheervideo.c
@@ -19,17 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #define CACHED_BITSTREAM_READER !ARCH_X86_32
 #define SHEER_VLC_BITS 12
 
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "thread.h"
 #include "sheervideodata.h"
 
diff --git a/libavcodec/ttadata.c b/libavcodec/ttadata.c
index aa9f418a7d..297d709480 100644
--- a/libavcodec/ttadata.c
+++ b/libavcodec/ttadata.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <string.h>
 #include "ttadata.h"
 
 const uint32_t ff_tta_shift_1[] = {
diff --git a/libavcodec/ttadata.h b/libavcodec/ttadata.h
index 48c4cd0354..1ec1d749ce 100644
--- a/libavcodec/ttadata.h
+++ b/libavcodec/ttadata.h
@@ -21,7 +21,7 @@
 #ifndef AVCODEC_TTADATA_H
 #define AVCODEC_TTADATA_H
 
-#include "internal.h"
+#include <stdint.h>
 
 #define MAX_ORDER 16
 typedef struct TTAFilter {
diff --git a/libavcodec/twinvq.h b/libavcodec/twinvq.h
index 24e5ebcd0b..234604f581 100644
--- a/libavcodec/twinvq.h
+++ b/libavcodec/twinvq.h
@@ -29,7 +29,6 @@
 #include "libavutil/float_dsp.h"
 #include "avcodec.h"
 #include "fft.h"
-#include "internal.h"
 
 enum TwinVQCodec {
     TWINVQ_CODEC_VQF,
diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index 26e0cd827c..ba70ddef31 100644
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -23,7 +23,6 @@
 #include "hwconfig.h"
 #include "mpegutils.h"
 #include "mpegvideo.h"
-#include "internal.h"
 #include "vaapi_decode.h"
 
 /** Reconstruct bitstream f_code */
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
index 71e155154c..bc11a7e417 100644
--- a/libavcodec/vaapi_mpeg4.c
+++ b/libavcodec/vaapi_mpeg4.c
@@ -22,7 +22,6 @@
 
 #include "h263.h"
 #include "hwconfig.h"
-#include "internal.h"
 #include "mpeg4video.h"
 #include "mpegvideo.h"
 #include "vaapi_decode.h"
diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c
index 4e9607d9be..d82b5b31f8 100644
--- a/libavcodec/vaapi_vc1.c
+++ b/libavcodec/vaapi_vc1.c
@@ -21,7 +21,6 @@
  */
 
 #include "hwconfig.h"
-#include "internal.h"
 #include "vaapi_decode.h"
 #include "vc1.h"
 #include "vc1data.h"
diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c
index 00896ddb09..8257e0ccfa 100644
--- a/libavcodec/vc1_parser.c
+++ b/libavcodec/vc1_parser.c
@@ -29,7 +29,6 @@
 #include "parser.h"
 #include "vc1.h"
 #include "get_bits.h"
-#include "internal.h"
 
 /** The maximum number of bytes of a sequence, entry point or
  *  frame header whose values we pay any attention to */
diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c
index 5ba73dafd4..525e208495 100644
--- a/libavcodec/vdpau_h264.c
+++ b/libavcodec/vdpau_h264.c
@@ -24,7 +24,6 @@
 #include <vdpau/vdpau.h>
 
 #include "avcodec.h"
-#include "internal.h"
 #include "h264dec.h"
 #include "h264_ps.h"
 #include "hwconfig.h"
diff --git a/libavcodec/vdpau_hevc.c b/libavcodec/vdpau_hevc.c
index c17de0c5d0..2669040f78 100644
--- a/libavcodec/vdpau_hevc.c
+++ b/libavcodec/vdpau_hevc.c
@@ -23,7 +23,6 @@
 #include <vdpau/vdpau.h>
 
 #include "avcodec.h"
-#include "internal.h"
 #include "hevc_data.h"
 #include "hevcdec.h"
 #include "hwconfig.h"
diff --git a/libavcodec/vdpau_vp9.c b/libavcodec/vdpau_vp9.c
index a8609d647e..49fe18189b 100644
--- a/libavcodec/vdpau_vp9.c
+++ b/libavcodec/vdpau_vp9.c
@@ -23,7 +23,6 @@
 #include <vdpau/vdpau.h>
 #include "libavutil/pixdesc.h"
 #include "avcodec.h"
-#include "internal.h"
 #include "vp9data.h"
 #include "vp9dec.h"
 #include "hwconfig.h"
diff --git a/libavcodec/vp9mvs.c b/libavcodec/vp9mvs.c
index 88db1c341c..774aaa3910 100644
--- a/libavcodec/vp9mvs.c
+++ b/libavcodec/vp9mvs.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "internal.h"
 #include "vp56.h"
 #include "vp9.h"
 #include "vp9data.h"
diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index d9fda2dbfa..c73711df48 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -22,7 +22,6 @@
 #include "libavutil/attributes.h"
 
 #include "avcodec.h"
-#include "internal.h"
 #include "sinewin.h"
 #include "wma.h"
 #include "wma_common.h"
diff --git a/libavcodec/xbmenc.c b/libavcodec/xbmenc.c
index 5e552ce820..05e014a0bf 100644
--- a/libavcodec/xbmenc.c
+++ b/libavcodec/xbmenc.c
@@ -22,7 +22,6 @@
 
 #include "avcodec.h"
 #include "encode.h"
-#include "internal.h"
 #include "mathops.h"
 
 #define ANSI_MIN_READLINE 509
diff --git a/libavcodec/xfaceenc.c b/libavcodec/xfaceenc.c
index 55815e5c2f..ae258f559e 100644
--- a/libavcodec/xfaceenc.c
+++ b/libavcodec/xfaceenc.c
@@ -27,7 +27,6 @@
 #include "xface.h"
 #include "avcodec.h"
 #include "encode.h"
-#include "internal.h"
 #include "libavutil/avassert.h"
 
 typedef struct XFaceContext {
diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c
index a65f83abdd..31a263b8df 100644
--- a/libavcodec/xwdenc.c
+++ b/libavcodec/xwdenc.c
@@ -20,12 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/intreadwrite.h"
 #include "libavutil/pixdesc.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "encode.h"
-#include "internal.h"
 #include "xwd.h"
 
 #define WINDOW_NAME         "lavcxwdenc"
diff --git a/libavcodec/yuv4enc.c b/libavcodec/yuv4enc.c
index 5181a46403..11dfc68a0d 100644
--- a/libavcodec/yuv4enc.c
+++ b/libavcodec/yuv4enc.c
@@ -22,7 +22,6 @@
 
 #include "avcodec.h"
 #include "encode.h"
-#include "internal.h"
 
 static int yuv4_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                              const AVFrame *pic, int *got_packet)
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 2ab7fb9efb..0915f6fafd 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -25,7 +25,6 @@
 #include "avformat.h"
 #include "internal.h"
 #include "subtitles.h"
-#include "libavcodec/internal.h"
 #include "libavutil/bprint.h"
 
 typedef struct ASSContext {
diff --git a/libavformat/h264dec.c b/libavformat/h264dec.c
index 199e87fbfa..ac804c0192 100644
--- a/libavformat/h264dec.c
+++ b/libavformat/h264dec.c
@@ -23,7 +23,6 @@
 #include "libavcodec/golomb.h"
 #include "avformat.h"
 #include "rawdec.h"
-#include "libavcodec/internal.h"
 
 #define MAX_SPS_COUNT          32
 #define MAX_PPS_COUNT         256
diff --git a/libavformat/hcom.c b/libavformat/hcom.c
index b7fb7314c8..97f0003210 100644
--- a/libavformat/hcom.c
+++ b/libavformat/hcom.c
@@ -20,7 +20,6 @@
  */
 
 #include "libavutil/intreadwrite.h"
-#include "libavcodec/internal.h"
 #include "avformat.h"
 #include "internal.h"
 #include "pcm.h"
diff --git a/libavformat/ipudec.c b/libavformat/ipudec.c
index a314a89001..4e346f9638 100644
--- a/libavformat/ipudec.c
+++ b/libavformat/ipudec.c
@@ -25,7 +25,6 @@
 #include "rawdec.h"
 
 #include "libavutil/intreadwrite.h"
-#include "libavcodec/internal.h"
 
 static int ipu_read_probe(const AVProbeData *p)
 {
diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c
index 68ed7511d7..0ee4820f62 100644
--- a/libavformat/jacosubdec.c
+++ b/libavformat/jacosubdec.c
@@ -28,7 +28,6 @@
 #include "avformat.h"
 #include "internal.h"
 #include "subtitles.h"
-#include "libavcodec/internal.h"
 #include "libavcodec/jacosub.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
diff --git a/libavformat/network.c b/libavformat/network.c
index 246ffd406d..96fe636745 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -22,7 +22,6 @@
 #include "network.h"
 #include "tls.h"
 #include "url.h"
-#include "libavcodec/internal.h"
 #include "libavutil/avutil.h"
 #include "libavutil/avassert.h"
 #include "libavutil/mem.h"
diff --git a/libavformat/samidec.c b/libavformat/samidec.c
index 698164b6a2..0da299343d 100644
--- a/libavformat/samidec.c
+++ b/libavformat/samidec.c
@@ -27,10 +27,8 @@
 #include "avformat.h"
 #include "internal.h"
 #include "subtitles.h"
-#include "libavcodec/internal.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
-#include "libavutil/intreadwrite.h"
 
 typedef struct {
     FFDemuxSubtitlesQueue q;
diff --git a/libavformat/subviewerdec.c b/libavformat/subviewerdec.c
index bcd103bd86..e3a950fce3 100644
--- a/libavformat/subviewerdec.c
+++ b/libavformat/subviewerdec.c
@@ -28,7 +28,6 @@
 #include "internal.h"
 #include "subtitles.h"
 #include "avio_internal.h"
-#include "libavcodec/internal.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
 #include "libavutil/intreadwrite.h"
-- 
2.32.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".

[FFmpeg-devel] [PATCH 6/7] avcodec/internal.h: Move avpriv_find_start_code() to startcode.h

[Andreas Rheinhardt]

This is by definition the appropriate place for it.
Remove all the now unnecessary libavcodec/internal.h inclusions;
also remove other unnecessary headers from the affected files.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/cavsdec.c                  | 1 +
 libavcodec/cbs_mpeg2.c                | 2 +-
 libavcodec/extract_extradata_bsf.c    | 3 +--
 libavcodec/h264_parser.c              | 3 +--
 libavcodec/internal.h                 | 4 ----
 libavcodec/mpeg12.c                   | 6 +-----
 libavcodec/mpeg12dec.c                | 4 +---
 libavcodec/mpeg4_unpack_bframes_bsf.c | 2 +-
 libavcodec/mpegvideo_parser.c         | 2 +-
 libavcodec/remove_extradata_bsf.c     | 2 +-
 libavcodec/startcode.h                | 4 ++++
 libavcodec/utils.c                    | 6 +-----
 libavcodec/vc1_common.h               | 2 +-
 libavformat/avidec.c                  | 2 +-
 libavformat/avs2dec.c                 | 2 +-
 libavformat/avs3dec.c                 | 2 +-
 libavformat/cavsvideodec.c            | 2 +-
 libavformat/mpegtsenc.c               | 2 +-
 libavformat/mpegvideodec.c            | 2 +-
 libavformat/mxfenc.c                  | 6 ++----
 libavformat/rtpenc_mpv.c              | 2 +-
 21 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c
index 692c77eb39..894aa1b54a 100644
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@ -32,6 +32,7 @@
 #include "cavs.h"
 #include "internal.h"
 #include "mpeg12data.h"
+#include "startcode.h"
 
 static const uint8_t mv_scan[4] = {
     MV_FWD_X0, MV_FWD_X1,
diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
index 90d667ddc8..8d45d1ceeb 100644
--- a/libavcodec/cbs_mpeg2.c
+++ b/libavcodec/cbs_mpeg2.c
@@ -21,7 +21,7 @@
 #include "cbs.h"
 #include "cbs_internal.h"
 #include "cbs_mpeg2.h"
-#include "internal.h"
+#include "startcode.h"
 
 
 #define HEADER(name) do { \
diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c
index dbcb8508b0..027a578af1 100644
--- a/libavcodec/extract_extradata_bsf.c
+++ b/libavcodec/extract_extradata_bsf.c
@@ -18,8 +18,6 @@
 
 #include <stdint.h>
 
-#include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 
@@ -31,6 +29,7 @@
 #include "h2645_parse.h"
 #include "h264.h"
 #include "hevc.h"
+#include "startcode.h"
 #include "vc1_common.h"
 
 typedef struct ExtractExtradataContext {
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index 4002bcad77..50810f1789 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -27,7 +27,6 @@
 
 #define UNCHECKED_BITSTREAM_READER 1
 
-#include <assert.h>
 #include <stdint.h>
 
 #include "libavutil/avutil.h"
@@ -46,9 +45,9 @@
 #include "h264_ps.h"
 #include "h2645_parse.h"
 #include "h264data.h"
-#include "internal.h"
 #include "mpegutils.h"
 #include "parser.h"
+#include "startcode.h"
 
 typedef struct H264ParseContext {
     ParseContext pc;
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 72ca1553f6..57a1c6206f 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -285,10 +285,6 @@ int ff_thread_can_start_frame(AVCodecContext *avctx);
 
 int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx);
 
-const uint8_t *avpriv_find_start_code(const uint8_t *p,
-                                      const uint8_t *end,
-                                      uint32_t *state);
-
 int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec);
 
 /**
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 58e03c05d4..5520960b74 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -29,18 +29,14 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
-#include "libavutil/timecode.h"
 #include "libavutil/thread.h"
 
-#include "internal.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
-#include "error_resilience.h"
 #include "mpeg12.h"
 #include "mpeg12data.h"
 #include "mpegvideodata.h"
-#include "bytestream.h"
-#include "thread.h"
+#include "startcode.h"
 
 static const uint8_t table_mb_ptype[7][2] = {
     { 3, 5 }, // 0x01 MB_INTRA
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 4a7bd6d466..860e86aa74 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -34,14 +34,11 @@
 #include "libavutil/mem_internal.h"
 #include "libavutil/stereo3d.h"
 #include "libavutil/timecode.h"
-#include "libavutil/video_enc_params.h"
 
 #include "avcodec.h"
-#include "bytestream.h"
 #include "error_resilience.h"
 #include "hwconfig.h"
 #include "idctdsp.h"
-#include "internal.h"
 #include "mpeg_er.h"
 #include "mpeg12.h"
 #include "mpeg12data.h"
@@ -49,6 +46,7 @@
 #include "mpegvideo.h"
 #include "mpegvideodata.h"
 #include "profiles.h"
+#include "startcode.h"
 #include "thread.h"
 #include "xvmc_internal.h"
 
diff --git a/libavcodec/mpeg4_unpack_bframes_bsf.c b/libavcodec/mpeg4_unpack_bframes_bsf.c
index 6f8595713d..ae2c129d88 100644
--- a/libavcodec/mpeg4_unpack_bframes_bsf.c
+++ b/libavcodec/mpeg4_unpack_bframes_bsf.c
@@ -21,8 +21,8 @@
 
 #include "bsf.h"
 #include "bsf_internal.h"
-#include "internal.h"
 #include "mpeg4video.h"
+#include "startcode.h"
 
 typedef struct UnpackBFramesBSFContext {
     AVBufferRef *b_frame_ref;
diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c
index c5dc867d24..22666c85d9 100644
--- a/libavcodec/mpegvideo_parser.c
+++ b/libavcodec/mpegvideo_parser.c
@@ -23,7 +23,7 @@
 #include "parser.h"
 #include "mpeg12.h"
 #include "mpeg12data.h"
-#include "internal.h"
+#include "startcode.h"
 
 struct MpvParseContext {
     ParseContext pc;
diff --git a/libavcodec/remove_extradata_bsf.c b/libavcodec/remove_extradata_bsf.c
index 1d5f193f89..c698d1d7f9 100644
--- a/libavcodec/remove_extradata_bsf.c
+++ b/libavcodec/remove_extradata_bsf.c
@@ -26,7 +26,7 @@
 #include "bsf_internal.h"
 #include "h264.h"
 #include "hevc.h"
-#include "internal.h"
+#include "startcode.h"
 #include "vc1_common.h"
 
 enum RemoveFreq {
diff --git a/libavcodec/startcode.h b/libavcodec/startcode.h
index cfa02b0860..8b75832aaf 100644
--- a/libavcodec/startcode.h
+++ b/libavcodec/startcode.h
@@ -27,6 +27,10 @@
 
 #include <stdint.h>
 
+const uint8_t *avpriv_find_start_code(const uint8_t *p,
+                                      const uint8_t *end,
+                                      uint32_t *state);
+
 int ff_startcode_find_candidate_c(const uint8_t *buf, int size);
 
 #endif /* AVCODEC_STARTCODE_H */
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index b19befef21..c7c7323351 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -27,7 +27,6 @@
 
 #include "config.h"
 #include "libavutil/avassert.h"
-#include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
@@ -40,12 +39,9 @@
 #include "thread.h"
 #include "internal.h"
 #include "put_bits.h"
-#include "raw.h"
+#include "startcode.h"
 #include <stdlib.h>
-#include <stdarg.h>
-#include <stdatomic.h>
 #include <limits.h>
-#include <float.h>
 
 void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size)
 {
diff --git a/libavcodec/vc1_common.h b/libavcodec/vc1_common.h
index b46c33f7e2..c0f0c8c2eb 100644
--- a/libavcodec/vc1_common.h
+++ b/libavcodec/vc1_common.h
@@ -26,7 +26,7 @@
 #include <stdint.h>
 
 #include "libavutil/attributes.h"
-#include "internal.h"
+#include "startcode.h"
 
 /** Markers used in VC-1 AP frame data */
 //@{
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 86f857b1e3..0f0e6846da 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -36,7 +36,7 @@
 #include "riff.h"
 #include "libavcodec/bytestream.h"
 #include "libavcodec/exif.h"
-#include "libavcodec/internal.h"
+#include "libavcodec/startcode.h"
 
 typedef struct AVIStream {
     int64_t frame_offset;   /* current frame (video) or byte (audio) counter
diff --git a/libavformat/avs2dec.c b/libavformat/avs2dec.c
index 51908d2b63..0d5b23b65e 100644
--- a/libavformat/avs2dec.c
+++ b/libavformat/avs2dec.c
@@ -22,7 +22,7 @@
 
 #include "avformat.h"
 #include "rawdec.h"
-#include "libavcodec/internal.h"
+#include "libavcodec/startcode.h"
 #include "libavutil/intreadwrite.h"
 
 #define AVS2_ISSQH(x)  ((x) == 0xB0)
diff --git a/libavformat/avs3dec.c b/libavformat/avs3dec.c
index 253caa7c1d..2395df171b 100644
--- a/libavformat/avs3dec.c
+++ b/libavformat/avs3dec.c
@@ -22,7 +22,7 @@
  */
 
 #include "libavcodec/avs3.h"
-#include "libavcodec/internal.h"
+#include "libavcodec/startcode.h"
 #include "avformat.h"
 #include "rawdec.h"
 
diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c
index 8900b97597..1fa3aa5e92 100644
--- a/libavformat/cavsvideodec.c
+++ b/libavformat/cavsvideodec.c
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/startcode.h"
 #include "avformat.h"
 #include "rawdec.h"
-#include "libavcodec/internal.h"
 
 #define CAVS_SEQ_START_CODE       0x000001b0
 #define CAVS_PIC_I_START_CODE     0x000001b3
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 92b4cc8087..971b3f55d8 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -28,7 +28,7 @@
 #include "libavutil/opt.h"
 
 #include "libavcodec/ac3_parser_internal.h"
-#include "libavcodec/internal.h"
+#include "libavcodec/startcode.h"
 
 #include "avformat.h"
 #include "avio_internal.h"
diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c
index 2d6f81aaa1..33c5d79794 100644
--- a/libavformat/mpegvideodec.c
+++ b/libavformat/mpegvideodec.c
@@ -24,7 +24,7 @@
 #include "rawdec.h"
 
 #include "libavutil/intreadwrite.h"
-#include "libavcodec/internal.h"
+#include "libavcodec/startcode.h"
 
 #define SEQ_START_CODE          0x000001b3
 #define GOP_START_CODE          0x000001b8
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 5e068c8220..1e87dc6111 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -48,12 +48,10 @@
 #include "libavutil/mastering_display_metadata.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/time_internal.h"
-#include "libavcodec/bytestream.h"
-#include "libavcodec/dv_profile.h"
-#include "libavcodec/h264_ps.h"
 #include "libavcodec/golomb.h"
-#include "libavcodec/internal.h"
+#include "libavcodec/h264.h"
 #include "libavcodec/packet_internal.h"
+#include "libavcodec/startcode.h"
 #include "avformat.h"
 #include "avio_internal.h"
 #include "internal.h"
diff --git a/libavformat/rtpenc_mpv.c b/libavformat/rtpenc_mpv.c
index 4b45f51772..c18c75082f 100644
--- a/libavformat/rtpenc_mpv.c
+++ b/libavformat/rtpenc_mpv.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/internal.h"
+#include "libavcodec/startcode.h"
 #include "avformat.h"
 #include "rtpenc.h"
 
-- 
2.32.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".

Re: [FFmpeg-devel] [PATCH 6/7] avcodec/internal.h: Move avpriv_find_start_code() to startcode.h

[Scott Theisen]

On 2/4/22 10:16, Andreas Rheinhardt wrote:
> This is by definition the appropriate place for it.
> Remove all the now unnecessary libavcodec/internal.h inclusions;
> also remove other unnecessary headers from the affected files.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---

>
> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
> index b19befef21..c7c7323351 100644
> --- a/libavcodec/utils.c
> +++ b/libavcodec/utils.c
> @@ -27,7 +27,6 @@
>   
>   #include "config.h"
>   #include "libavutil/avassert.h"
> -#include "libavutil/avstring.h"
>   #include "libavutil/channel_layout.h"
>   #include "libavutil/intreadwrite.h"
>   #include "libavutil/mem.h"
> @@ -40,12 +39,9 @@
>   #include "thread.h"
>   #include "internal.h"
>   #include "put_bits.h"
> -#include "raw.h"
> +#include "startcode.h"
>   #include <stdlib.h>
> -#include <stdarg.h>
> -#include <stdatomic.h>
>   #include <limits.h>
> -#include <float.h>
>   
>   void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size)
>   {

Shouldn't you also move the definition to startcode.c as well? Then 
utils.c doesn't need startcode.h.
_______________________________________________
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 6/7] avcodec/internal.h: Move avpriv_find_start_code() to startcode.h

[Andreas Rheinhardt]

Scott Theisen:
> On 2/4/22 10:16, Andreas Rheinhardt wrote:
>> This is by definition the appropriate place for it.
>> Remove all the now unnecessary libavcodec/internal.h inclusions;
>> also remove other unnecessary headers from the affected files.
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>> ---
> 
>>
>> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
>> index b19befef21..c7c7323351 100644
>> --- a/libavcodec/utils.c
>> +++ b/libavcodec/utils.c
>> @@ -27,7 +27,6 @@
>>     #include "config.h"
>>   #include "libavutil/avassert.h"
>> -#include "libavutil/avstring.h"
>>   #include "libavutil/channel_layout.h"
>>   #include "libavutil/intreadwrite.h"
>>   #include "libavutil/mem.h"
>> @@ -40,12 +39,9 @@
>>   #include "thread.h"
>>   #include "internal.h"
>>   #include "put_bits.h"
>> -#include "raw.h"
>> +#include "startcode.h"
>>   #include <stdlib.h>
>> -#include <stdarg.h>
>> -#include <stdatomic.h>
>>   #include <limits.h>
>> -#include <float.h>
>>     void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t
>> min_size)
>>   {
> 
> Shouldn't you also move the definition to startcode.c as well? Then
> utils.c doesn't need startcode.h.

startcode.c is only compiled conditionally and the check is done in
configure, so I would have to add new configure dependencies. Yet
configure dependencies only take effect after a reconfigure, but there
is no good way to force a reconfigure (only adding a new codec, filter
or format forces this).
(There is a workaround: Modify the files containing the codecs, filters
or formats lists somehow, but this is not nice.)

- 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-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 7/7] avcodec/cbs_mpeg2: Use smaller scope for variables

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/cbs_mpeg2.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
index 8d45d1ceeb..dfea12ef1b 100644
--- a/libavcodec/cbs_mpeg2.c
+++ b/libavcodec/cbs_mpeg2.c
@@ -144,10 +144,8 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
                                     CodedBitstreamFragment *frag,
                                     int header)
 {
-    const uint8_t *start, *end;
-    CodedBitstreamUnitType unit_type;
+    const uint8_t *start;
     uint32_t start_code = -1;
-    size_t unit_size;
     int err;
 
     start = avpriv_find_start_code(frag->data, frag->data + frag->data_size,
@@ -158,7 +156,9 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
     }
 
     do {
-        unit_type = start_code & 0xff;
+        CodedBitstreamUnitType unit_type = start_code & 0xff;
+        const uint8_t *end;
+        size_t unit_size;
 
         // Reset start_code to ensure that avpriv_find_start_code()
         // really reads a new start code and does not reuse the old
-- 
2.32.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".

[FFmpeg-devel] [PATCH] cbs_mpeg2_split_fragment(): cache the buffer end

[Scott Theisen]

It is constant, so instead of recalculating it every time, only
calculate it once.

Also add a few clarifying comments.
---
 libavcodec/cbs_mpeg2.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
index dfea12ef1b..d3204b885a 100644
--- a/libavcodec/cbs_mpeg2.c
+++ b/libavcodec/cbs_mpeg2.c
@@ -144,12 +144,12 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
                                     CodedBitstreamFragment *frag,
                                     int header)
 {
-    const uint8_t *start;
+    const uint8_t *start = frag->data;
+    const uint8_t * const buf_end = frag->data + frag->data_size;
     uint32_t start_code = -1;
     int err;
 
-    start = avpriv_find_start_code(frag->data, frag->data + frag->data_size,
-                                   &start_code);
+    start = avpriv_find_start_code(start, buf_end, &start_code);
     if (start_code >> 8 != 0x000001) {
         // No start code found.
         return AVERROR_INVALIDDATA;
@@ -165,10 +165,9 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
         // start code in any way (as e.g. happens when there is a
         // Sequence End unit at the very end of a packet).
         start_code = UINT32_MAX;
-        end = avpriv_find_start_code(start--, frag->data + frag->data_size,
-                                     &start_code);
-
-        // start points to the byte containing the start_code_identifier
+        end = avpriv_find_start_code(start, buf_end, &start_code);
+        start--;
+        // decrement so start points to the byte containing the start_code_identifier
         // (may be the last byte of fragment->data); end points to the byte
         // following the byte containing the start code identifier (or to
         // the end of fragment->data).
@@ -178,6 +177,7 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
             unit_size = (end - 4) - start;
         } else {
            // We didn't find a start code, so this is the final unit.
+           // There is no start code to remove from end, hence not (end - 4).
            unit_size = end - start;
         }
 
-- 
2.32.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".

Re: [FFmpeg-devel] [PATCH 1/7] avcodec/cbs_mpeg2: Remove redundant counter

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Use -1 as the position in ff_cbs_insert_unit_data()
> which implicitly reuses frag->nb_units as the counter.
> 
> Also switch to a do-while-loop, as it is more natural
> than a for-loop now that the counter is gone.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/cbs_mpeg2.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
> index 26400f279f..4395bbf047 100644
> --- a/libavcodec/cbs_mpeg2.c
> +++ b/libavcodec/cbs_mpeg2.c
> @@ -148,7 +148,8 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
>      CodedBitstreamUnitType unit_type;
>      uint32_t start_code = -1;
>      size_t unit_size;
> -    int err, i, final = 0;
> +    int err;
> +    int final = 0;
>  
>      start = avpriv_find_start_code(frag->data, frag->data + frag->data_size,
>                                     &start_code);
> @@ -157,7 +158,7 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
>          return AVERROR_INVALIDDATA;
>      }
>  
> -    for (i = 0;; i++) {
> +    do {
>          unit_type = start_code & 0xff;
>  
>          if (start == frag->data + frag->data_size) {
> @@ -185,16 +186,13 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
>             final     = 1;
>          }
>  
> -        err = ff_cbs_insert_unit_data(frag, i, unit_type, (uint8_t*)start,
> +        err = ff_cbs_insert_unit_data(frag, -1, unit_type, (uint8_t*)start,
>                                        unit_size, frag->data_ref);
>          if (err < 0)
>              return err;
>  
> -        if (final)
> -            break;
> -
>          start = end;
> -    }
> +    } while (!final);
>  
>      return 0;
>  }

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-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH] cbs_mpeg2_split_fragment(): cache the buffer end

[Scott Theisen]

Also add a few clarifying comments.
---
 libavcodec/cbs_mpeg2.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
index 33bd3e0998..47732562d1 100644
--- a/libavcodec/cbs_mpeg2.c
+++ b/libavcodec/cbs_mpeg2.c
@@ -144,12 +144,12 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
                                     CodedBitstreamFragment *frag,
                                     int header)
 {
-    const uint8_t *start;
+    const uint8_t *start = frag->data;
+    const uint8_t * const buf_end = frag->data + frag->data_size;
     uint32_t start_code = -1;
     int err;
 
-    start = avpriv_find_start_code(frag->data, frag->data + frag->data_size,
-                                   &start_code);
+    start = avpriv_find_start_code(start, buf_end, &start_code);
     if (start_code >> 8 != 0x000001) {
         // No start code found.
         return AVERROR_INVALIDDATA;
@@ -165,12 +165,11 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
         // start code in any way (as e.g. happens when there is a
         // Sequence End unit at the very end of a packet).
         start_code = UINT32_MAX;
-        end = avpriv_find_start_code(start--, frag->data + frag->data_size,
-                                     &start_code);
-
-        // start points to the byte containing the start_code_identifier
+        end = avpriv_find_start_code(start, buf_end, &start_code);
+        start--;
+        // decrement so start points to the byte containing the start_code_identifier
         // (may be the last byte of fragment->data); end points to the byte
-        // following the byte containing the start code identifier (or to
+        // following the byte containing the next start code identifier (or to
         // the end of fragment->data).
         if (start_code >> 8 == 0x000001) {
             // Unit runs from start to the beginning of the start code
@@ -178,6 +177,7 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
             unit_size = (end - 4) - start;
         } else {
            // We didn't find a start code, so this is the final unit.
+           // There is no start code to remove from end, hence not (end - 4).
            unit_size = end - start;
         }
 
-- 
2.32.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".

Re: [FFmpeg-devel] [PATCH] cbs_mpeg2_split_fragment(): cache the buffer end

[Scott Theisen]

Ping; it still applies cleanly.

-Scott Theisen

On 2/8/22 15:32, Scott Theisen wrote:
> Also add a few clarifying comments.
> ---
>   libavcodec/cbs_mpeg2.c | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
> index 33bd3e0998..47732562d1 100644
> --- a/libavcodec/cbs_mpeg2.c
> +++ b/libavcodec/cbs_mpeg2.c
> @@ -144,12 +144,12 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
>                                       CodedBitstreamFragment *frag,
>                                       int header)
>   {
> -    const uint8_t *start;
> +    const uint8_t *start = frag->data;
> +    const uint8_t * const buf_end = frag->data + frag->data_size;
>       uint32_t start_code = -1;
>       int err;
>   
> -    start = avpriv_find_start_code(frag->data, frag->data + frag->data_size,
> -                                   &start_code);
> +    start = avpriv_find_start_code(start, buf_end, &start_code);
>       if (start_code >> 8 != 0x000001) {
>           // No start code found.
>           return AVERROR_INVALIDDATA;
> @@ -165,12 +165,11 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
>           // start code in any way (as e.g. happens when there is a
>           // Sequence End unit at the very end of a packet).
>           start_code = UINT32_MAX;
> -        end = avpriv_find_start_code(start--, frag->data + frag->data_size,
> -                                     &start_code);
> -
> -        // start points to the byte containing the start_code_identifier
> +        end = avpriv_find_start_code(start, buf_end, &start_code);
> +        start--;
> +        // decrement so start points to the byte containing the start_code_identifier
>           // (may be the last byte of fragment->data); end points to the byte
> -        // following the byte containing the start code identifier (or to
> +        // following the byte containing the next start code identifier (or to
>           // the end of fragment->data).
>           if (start_code >> 8 == 0x000001) {
>               // Unit runs from start to the beginning of the start code
> @@ -178,6 +177,7 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
>               unit_size = (end - 4) - start;
>           } else {
>              // We didn't find a start code, so this is the final unit.
> +           // There is no start code to remove from end, hence not (end - 4).
>              unit_size = end - start;
>           }
>   

_______________________________________________
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] cbs_mpeg2_split_fragment(): cache the buffer end

[Scott Theisen]

Ping; it still applies cleanly.

-Scott Theisen

On 5/15/22 14:50, Scott Theisen wrote:
> Ping; it still applies cleanly.
>
> -Scott Theisen
>
> On 2/8/22 15:32, Scott Theisen wrote:
>> Also add a few clarifying comments.
>> ---
>>   libavcodec/cbs_mpeg2.c | 16 ++++++++--------
>>   1 file changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
>> index 33bd3e0998..47732562d1 100644
>> --- a/libavcodec/cbs_mpeg2.c
>> +++ b/libavcodec/cbs_mpeg2.c
>> @@ -144,12 +144,12 @@ static int 
>> cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
>>                                       CodedBitstreamFragment *frag,
>>                                       int header)
>>   {
>> -    const uint8_t *start;
>> +    const uint8_t *start = frag->data;
>> +    const uint8_t * const buf_end = frag->data + frag->data_size;
>>       uint32_t start_code = -1;
>>       int err;
>>   -    start = avpriv_find_start_code(frag->data, frag->data + 
>> frag->data_size,
>> -                                   &start_code);
>> +    start = avpriv_find_start_code(start, buf_end, &start_code);
>>       if (start_code >> 8 != 0x000001) {
>>           // No start code found.
>>           return AVERROR_INVALIDDATA;
>> @@ -165,12 +165,11 @@ static int 
>> cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
>>           // start code in any way (as e.g. happens when there is a
>>           // Sequence End unit at the very end of a packet).
>>           start_code = UINT32_MAX;
>> -        end = avpriv_find_start_code(start--, frag->data + 
>> frag->data_size,
>> -                                     &start_code);
>> -
>> -        // start points to the byte containing the 
>> start_code_identifier
>> +        end = avpriv_find_start_code(start, buf_end, &start_code);
>> +        start--;
>> +        // decrement so start points to the byte containing the 
>> start_code_identifier
>>           // (may be the last byte of fragment->data); end points to 
>> the byte
>> -        // following the byte containing the start code identifier 
>> (or to
>> +        // following the byte containing the next start code 
>> identifier (or to
>>           // the end of fragment->data).
>>           if (start_code >> 8 == 0x000001) {
>>               // Unit runs from start to the beginning of the start code
>> @@ -178,6 +177,7 @@ static int 
>> cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
>>               unit_size = (end - 4) - start;
>>           } else {
>>              // We didn't find a start code, so this is the final unit.
>> +           // There is no start code to remove from end, hence not 
>> (end - 4).
>>              unit_size = end - start;
>>           }
>

_______________________________________________
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] cbs_mpeg2_split_fragment(): cache the buffer end

[Anton Khirnov]

Quoting Scott Theisen (2022-09-16 19:41:43)
> Ping; it still applies cleanly.

Missing motivation for this change. Is it faster, or why is the new code
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".

Re: [FFmpeg-devel] [PATCH] cbs_mpeg2_split_fragment(): cache the buffer end

[Scott Theisen]

On 9/22/22 10:59, Anton Khirnov wrote:
> Quoting Scott Theisen (2022-09-16 19:41:43)
>> Ping; it still applies cleanly.
> Missing motivation for this change. Is it faster, or why is the new code
> better?
>

To make it easier to read.  `buf_end` is shorter than `frag->data + 
frag->data_size`.  Initialize `start` to `frag->data` so the calls to 
avpriv_find_start_code are the same.

I realize readability is an opinion, but I felt that saving the buffer 
end to a variable and tweaking the comments increased the readability of 
the code.

Regards,

Scott
_______________________________________________
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".