[FFmpeg-cvslog] Merge commit '831018b0bbe26a603802a9022472f714a59293be'

James Almer git at videolan.org
Mon Oct 30 22:55:27 EET 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 30 17:47:21 2017 -0300| [9ea06d48c2724714b5680122fa720395977a1ac6] | committer: James Almer

Merge commit '831018b0bbe26a603802a9022472f714a59293be'

* commit '831018b0bbe26a603802a9022472f714a59293be':
  mpeg4audio: Make avpriv_copy_pce_data() inline

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ea06d48c2724714b5680122fa720395977a1ac6
---

 libavcodec/aac_adtstoasc_bsf.c |  2 +-
 libavcodec/mpeg4audio.c        | 40 ---------------------------------------
 libavcodec/mpeg4audio.h        | 43 +++++++++++++++++++++++++++++++++++++++++-
 libavformat/adtsenc.c          |  2 +-
 libavformat/latmenc.c          |  2 +-
 5 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c
index 4bcf55b193..d92779ed23 100644
--- a/libavcodec/aac_adtstoasc_bsf.c
+++ b/libavcodec/aac_adtstoasc_bsf.c
@@ -91,7 +91,7 @@ static int aac_adtstoasc_filter(AVBSFContext *bsfc, AVPacket *out)
                 goto fail;
             }
             init_put_bits(&pb, pce_data, MAX_PCE_SIZE);
-            pce_size = avpriv_copy_pce_data(&pb, &gb)/8;
+            pce_size = ff_copy_pce_data(&pb, &gb) / 8;
             flush_put_bits(&pb);
             in->size -= get_bits_count(&gb)/8;
             in->data += get_bits_count(&gb)/8;
diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c
index b6bb323440..219714752f 100644
--- a/libavcodec/mpeg4audio.c
+++ b/libavcodec/mpeg4audio.c
@@ -167,43 +167,3 @@ int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf,
 
     return ff_mpeg4audio_get_config_gb(c, &gb, sync_extension);
 }
-
-static av_always_inline unsigned int copy_bits(PutBitContext *pb,
-                                               GetBitContext *gb,
-                                               int bits)
-{
-    unsigned int el = get_bits(gb, bits);
-    put_bits(pb, bits, el);
-    return el;
-}
-
-int avpriv_copy_pce_data(PutBitContext *pb, GetBitContext *gb)
-{
-    int five_bit_ch, four_bit_ch, comment_size, bits;
-    int offset = put_bits_count(pb);
-
-    copy_bits(pb, gb, 10);                  //Tag, Object Type, Frequency
-    five_bit_ch  = copy_bits(pb, gb, 4);    //Front
-    five_bit_ch += copy_bits(pb, gb, 4);    //Side
-    five_bit_ch += copy_bits(pb, gb, 4);    //Back
-    four_bit_ch  = copy_bits(pb, gb, 2);    //LFE
-    four_bit_ch += copy_bits(pb, gb, 3);    //Data
-    five_bit_ch += copy_bits(pb, gb, 4);    //Coupling
-    if (copy_bits(pb, gb, 1))               //Mono Mixdown
-        copy_bits(pb, gb, 4);
-    if (copy_bits(pb, gb, 1))               //Stereo Mixdown
-        copy_bits(pb, gb, 4);
-    if (copy_bits(pb, gb, 1))               //Matrix Mixdown
-        copy_bits(pb, gb, 3);
-    for (bits = five_bit_ch*5+four_bit_ch*4; bits > 16; bits -= 16)
-        copy_bits(pb, gb, 16);
-    if (bits)
-        copy_bits(pb, gb, bits);
-    avpriv_align_put_bits(pb);
-    align_get_bits(gb);
-    comment_size = copy_bits(pb, gb, 8);
-    for (; comment_size > 0; comment_size--)
-        copy_bits(pb, gb, 8);
-
-    return put_bits_count(pb) - offset;
-}
diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h
index 8fd32f96b3..34471782ab 100644
--- a/libavcodec/mpeg4audio.h
+++ b/libavcodec/mpeg4audio.h
@@ -23,6 +23,9 @@
 #define AVCODEC_MPEG4AUDIO_H
 
 #include <stdint.h>
+
+#include "libavutil/attributes.h"
+
 #include "get_bits.h"
 #include "put_bits.h"
 
@@ -115,6 +118,44 @@ enum AudioObjectType {
 #define MAX_PCE_SIZE 320 ///<Maximum size of a PCE including the 3-bit ID_PCE
                          ///<marker and the comment
 
-int avpriv_copy_pce_data(PutBitContext *pb, GetBitContext *gb);
+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);
+    avpriv_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/libavformat/adtsenc.c b/libavformat/adtsenc.c
index a046c2f2f4..a24f99c447 100644
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -85,7 +85,7 @@ static int adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, const ui
         init_put_bits(&pb, adts->pce_data, MAX_PCE_SIZE);
 
         put_bits(&pb, 3, 5); //ID_PCE
-        adts->pce_size = (avpriv_copy_pce_data(&pb, &gb) + 3) / 8;
+        adts->pce_size = (ff_copy_pce_data(&pb, &gb) + 3) / 8;
         flush_put_bits(&pb);
     }
 
diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
index c919976d49..273197bb54 100644
--- a/libavformat/latmenc.c
+++ b/libavformat/latmenc.c
@@ -128,7 +128,7 @@ static void latm_write_frame_header(AVFormatContext *s, PutBitContext *bs)
                 int ret = init_get_bits8(&gb, par->extradata, par->extradata_size);
                 av_assert0(ret >= 0); // extradata size has been checked already, so this should not fail
                 skip_bits_long(&gb, ctx->off + 3);
-                avpriv_copy_pce_data(bs, &gb);
+                ff_copy_pce_data(bs, &gb);
             }
         }
 


======================================================================

diff --cc libavcodec/mpeg4audio.c
index b6bb323440,e321bcca83..219714752f
--- a/libavcodec/mpeg4audio.c
+++ b/libavcodec/mpeg4audio.c
@@@ -149,61 -143,5 +149,21 @@@ int ff_mpeg4audio_get_config_gb(MPEG4Au
      if ((c->ps == -1 && c->object_type != AOT_AAC_LC) || c->channels & ~0x01)
          c->ps = 0;
  
 -    return specific_config_bitindex;
 +    return specific_config_bitindex - start_bit_index;
 +}
 +
 +int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf,
 +                                 int bit_size, int sync_extension)
 +{
 +    GetBitContext gb;
 +    int ret;
 +
 +    if (bit_size <= 0)
 +        return AVERROR_INVALIDDATA;
 +
 +    ret = init_get_bits(&gb, buf, bit_size);
 +    if (ret < 0)
 +        return ret;
 +
 +    return ff_mpeg4audio_get_config_gb(c, &gb, sync_extension);
  }
- 
- static av_always_inline unsigned int copy_bits(PutBitContext *pb,
-                                                GetBitContext *gb,
-                                                int bits)
- {
-     unsigned int el = get_bits(gb, bits);
-     put_bits(pb, bits, el);
-     return el;
- }
- 
- int avpriv_copy_pce_data(PutBitContext *pb, GetBitContext *gb)
- {
-     int five_bit_ch, four_bit_ch, comment_size, bits;
-     int offset = put_bits_count(pb);
- 
-     copy_bits(pb, gb, 10);                  //Tag, Object Type, Frequency
-     five_bit_ch  = copy_bits(pb, gb, 4);    //Front
-     five_bit_ch += copy_bits(pb, gb, 4);    //Side
-     five_bit_ch += copy_bits(pb, gb, 4);    //Back
-     four_bit_ch  = copy_bits(pb, gb, 2);    //LFE
-     four_bit_ch += copy_bits(pb, gb, 3);    //Data
-     five_bit_ch += copy_bits(pb, gb, 4);    //Coupling
-     if (copy_bits(pb, gb, 1))               //Mono Mixdown
-         copy_bits(pb, gb, 4);
-     if (copy_bits(pb, gb, 1))               //Stereo Mixdown
-         copy_bits(pb, gb, 4);
-     if (copy_bits(pb, gb, 1))               //Matrix Mixdown
-         copy_bits(pb, gb, 3);
-     for (bits = five_bit_ch*5+four_bit_ch*4; bits > 16; bits -= 16)
-         copy_bits(pb, gb, 16);
-     if (bits)
-         copy_bits(pb, gb, bits);
-     avpriv_align_put_bits(pb);
-     align_get_bits(gb);
-     comment_size = copy_bits(pb, gb, 8);
-     for (; comment_size > 0; comment_size--)
-         copy_bits(pb, gb, 8);
- 
-     return put_bits_count(pb) - offset;
- }
diff --cc libavcodec/mpeg4audio.h
index 8fd32f96b3,01f30c6ca7..34471782ab
--- a/libavcodec/mpeg4audio.h
+++ b/libavcodec/mpeg4audio.h
@@@ -112,9 -105,47 +115,47 @@@ enum AudioObjectType 
      AOT_USAC,                  ///< N                       Unified Speech and Audio Coding
  };
  
 -#define MAX_PCE_SIZE 304 ///<Maximum size of a PCE including the 3-bit ID_PCE
 +#define MAX_PCE_SIZE 320 ///<Maximum size of a PCE including the 3-bit ID_PCE
                           ///<marker and the comment
  
- int avpriv_copy_pce_data(PutBitContext *pb, GetBitContext *gb);
+ 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);
+     avpriv_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 --cc libavformat/latmenc.c
index c919976d49,ea13a8a38c..273197bb54
--- a/libavformat/latmenc.c
+++ b/libavformat/latmenc.c
@@@ -124,11 -111,7 +124,11 @@@ static void latm_write_frame_header(AVF
              avpriv_copy_bits(bs, par->extradata, ctx->off + 3);
  
              if (!ctx->channel_conf) {
 +                GetBitContext gb;
 +                int ret = init_get_bits8(&gb, par->extradata, par->extradata_size);
 +                av_assert0(ret >= 0); // extradata size has been checked already, so this should not fail
 +                skip_bits_long(&gb, ctx->off + 3);
-                 avpriv_copy_pce_data(bs, &gb);
+                 ff_copy_pce_data(bs, &gb);
              }
          }
  



More information about the ffmpeg-cvslog mailing list