diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-01 19:01:03 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-02 20:16:42 +0200 |
| commit | 7eed125dbbcc5c97db0d922f5f10cd7598f40e19 (patch) | |
| tree | 26fd92e3b095e9ac450deb459632edf3f64807bb /libavcodec/mpeg4audio.h | |
| parent | 5c94b6694ac74c057bc1c2f93d15d0c709da950b (diff) | |
avcodec/mpeg4audio: Move ff_copy_pce_data() to a header of its own
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.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/mpeg4audio.h')
| -rw-r--r-- | libavcodec/mpeg4audio.h | 43 |
1 files changed, 0 insertions, 43 deletions
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 */ |