It is only used by three of the thirty files that (potentially
indirectly) include mpeg4audio.h. Twenty of these files won't
have a put_bits.h inclusion any more after this patch.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavcodec/aac_adtstoasc_bsf.c | 1 +
libavcodec/mpeg4audio.c | 1 -
libavcodec/mpeg4audio.h | 43 --------------------
libavcodec/mpeg4audio_copy_pce.h | 69 ++++++++++++++++++++++++++++++++
libavformat/adtsenc.c | 1 +
libavformat/latmenc.c | 1 +
6 files changed, 72 insertions(+), 44 deletions(-)
create mode 100644 libavcodec/mpeg4audio_copy_pce.h
diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c
index d32fcc5f9d..dd5e8b2a31 100644
--- a/libavcodec/aac_adtstoasc_bsf.c
+++ b/libavcodec/aac_adtstoasc_bsf.c
@@ -26,6 +26,7 @@
#include "put_bits.h"
#include "get_bits.h"
#include "mpeg4audio.h"
+#include "mpeg4audio_copy_pce.h"
typedef struct AACBSFContext {
int first_frame_done;
diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c
index ed72a80f6d..e38a8c0852 100644
--- a/libavcodec/mpeg4audio.c
+++ b/libavcodec/mpeg4audio.c
@@ -21,7 +21,6 @@
*/
#include "get_bits.h"
-#include "put_bits.h"
#include "mpeg4audio.h"
/**
diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h
index c486a3ddef..a6f71cff58 100644
--- a/libavcodec/mpeg4audio.h
+++ b/libavcodec/mpeg4audio.h
@@ -24,10 +24,7 @@
#include <stdint.h>
-#include "libavutil/attributes.h"
-
#include "get_bits.h"
-#include "put_bits.h"
typedef struct MPEG4AudioConfig {
int object_type;
@@ -120,44 +117,4 @@ enum AudioObjectType {
#define MAX_PCE_SIZE 320 ///<Maximum size of a PCE including the 3-bit ID_PCE
///<marker and the comment
-static av_always_inline unsigned int ff_pce_copy_bits(PutBitContext *pb,
- GetBitContext *gb,
- int bits)
-{
- unsigned int el = get_bits(gb, bits);
- put_bits(pb, bits, el);
- return el;
-}
-
-static inline int ff_copy_pce_data(PutBitContext *pb, GetBitContext *gb)
-{
- int five_bit_ch, four_bit_ch, comment_size, bits;
- int offset = put_bits_count(pb);
-
- ff_pce_copy_bits(pb, gb, 10); // Tag, Object Type, Frequency
- five_bit_ch = ff_pce_copy_bits(pb, gb, 4); // Front
- five_bit_ch += ff_pce_copy_bits(pb, gb, 4); // Side
- five_bit_ch += ff_pce_copy_bits(pb, gb, 4); // Back
- four_bit_ch = ff_pce_copy_bits(pb, gb, 2); // LFE
- four_bit_ch += ff_pce_copy_bits(pb, gb, 3); // Data
- five_bit_ch += ff_pce_copy_bits(pb, gb, 4); // Coupling
- if (ff_pce_copy_bits(pb, gb, 1)) // Mono Mixdown
- ff_pce_copy_bits(pb, gb, 4);
- if (ff_pce_copy_bits(pb, gb, 1)) // Stereo Mixdown
- ff_pce_copy_bits(pb, gb, 4);
- if (ff_pce_copy_bits(pb, gb, 1)) // Matrix Mixdown
- ff_pce_copy_bits(pb, gb, 3);
- for (bits = five_bit_ch*5+four_bit_ch*4; bits > 16; bits -= 16)
- ff_pce_copy_bits(pb, gb, 16);
- if (bits)
- ff_pce_copy_bits(pb, gb, bits);
- align_put_bits(pb);
- align_get_bits(gb);
- comment_size = ff_pce_copy_bits(pb, gb, 8);
- for (; comment_size > 0; comment_size--)
- ff_pce_copy_bits(pb, gb, 8);
-
- return put_bits_count(pb) - offset;
-}
-
#endif /* AVCODEC_MPEG4AUDIO_H */
diff --git a/libavcodec/mpeg4audio_copy_pce.h b/libavcodec/mpeg4audio_copy_pce.h
new file mode 100644
index 0000000000..435d33731e
--- /dev/null
+++ b/libavcodec/mpeg4audio_copy_pce.h
@@ -0,0 +1,69 @@
+/*
+ * MPEG-4 Audio PCE copying function
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_MPEG4AUDIO_COPY_PCE_H
+#define AVCODEC_MPEG4AUDIO_COPY_PCE_H
+
+#include "libavutil/attributes.h"
+
+#include "get_bits.h"
+#include "put_bits.h"
+
+static av_always_inline unsigned int ff_pce_copy_bits(PutBitContext *pb,
+ GetBitContext *gb,
+ int bits)
+{
+ unsigned int el = get_bits(gb, bits);
+ put_bits(pb, bits, el);
+ return el;
+}
+
+static inline int ff_copy_pce_data(PutBitContext *pb, GetBitContext *gb)
+{
+ int five_bit_ch, four_bit_ch, comment_size, bits;
+ int offset = put_bits_count(pb);
+
+ ff_pce_copy_bits(pb, gb, 10); // Tag, Object Type, Frequency
+ five_bit_ch = ff_pce_copy_bits(pb, gb, 4); // Front
+ five_bit_ch += ff_pce_copy_bits(pb, gb, 4); // Side
+ five_bit_ch += ff_pce_copy_bits(pb, gb, 4); // Back
+ four_bit_ch = ff_pce_copy_bits(pb, gb, 2); // LFE
+ four_bit_ch += ff_pce_copy_bits(pb, gb, 3); // Data
+ five_bit_ch += ff_pce_copy_bits(pb, gb, 4); // Coupling
+ if (ff_pce_copy_bits(pb, gb, 1)) // Mono Mixdown
+ ff_pce_copy_bits(pb, gb, 4);
+ if (ff_pce_copy_bits(pb, gb, 1)) // Stereo Mixdown
+ ff_pce_copy_bits(pb, gb, 4);
+ if (ff_pce_copy_bits(pb, gb, 1)) // Matrix Mixdown
+ ff_pce_copy_bits(pb, gb, 3);
+ for (bits = five_bit_ch*5+four_bit_ch*4; bits > 16; bits -= 16)
+ ff_pce_copy_bits(pb, gb, 16);
+ if (bits)
+ ff_pce_copy_bits(pb, gb, bits);
+ align_put_bits(pb);
+ align_get_bits(gb);
+ comment_size = ff_pce_copy_bits(pb, gb, 8);
+ for (; comment_size > 0; comment_size--)
+ ff_pce_copy_bits(pb, gb, 8);
+
+ return put_bits_count(pb) - offset;
+}
+
+#endif /* AVCODEC_MPEG4AUDIO_COPY_PCE_H */
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index 3924e678d9..5f2461cc6c 100644
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -26,6 +26,7 @@
#include "libavcodec/codec_par.h"
#include "libavcodec/packet.h"
#include "libavcodec/mpeg4audio.h"
+#include "libavcodec/mpeg4audio_copy_pce.h"
#include "libavutil/opt.h"
#include "avformat.h"
#include "apetag.h"
diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
index 6553c28d9f..6fd36d1484 100644
--- a/libavformat/latmenc.c
+++ b/libavformat/latmenc.c
@@ -25,6 +25,7 @@
#include "libavcodec/codec_par.h"
#include "libavcodec/packet.h"
#include "libavcodec/mpeg4audio.h"
+#include "libavcodec/mpeg4audio_copy_pce.h"
#include "libavutil/opt.h"
#include "avformat.h"
#include "internal.h"
--
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".
