MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '831018b0bbe26a603802a9022472f714a59293be'

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

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-30 17:47:21 -03:00
commit 9ea06d48c2
5 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aac_adtstoasc_bsf.c
View File

@ -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;

40
libavcodec/mpeg4audio.c
View File

@ -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;
}

43
libavcodec/mpeg4audio.h
View File

@ -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 */

2
libavformat/adtsenc.c
View File

@ -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);
}

2
libavformat/latmenc.c
View File

@ -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);
}
}