diff options
| author | Diego Biurrun <diego@biurrun.de> | 2017-04-26 18:57:54 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-05-02 18:50:34 +0200 |
| commit | b5f19f7478492307e4b4763aeac3180faf50e17f (patch) | |
| tree | 0fb69992023b946295a3130e2066256e3caf88fe /libavcodec/aac_parser.c | |
| parent | 0ac1fec1c3dacedabbf3dd4122ef4bf8523e688c (diff) | |
| download | ffmpeg-b5f19f7478492307e4b4763aeac3180faf50e17f.tar.gz | |
aac: Split function to parse ADTS header data into public and private part
This makes the currently semi-public avpriv_aac_parse_header() function
private to libavcodec and adds a proper public API function to return
the parts of the ADTS header required in libavformat.
Diffstat (limited to 'libavcodec/aac_parser.c')
| -rw-r--r-- | libavcodec/aac_parser.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c index eae120a249..41b301ca17 100644 --- a/libavcodec/aac_parser.c +++ b/libavcodec/aac_parser.c @@ -22,7 +22,8 @@ #include "parser.h" #include "aac_ac3_parser.h" -#include "aacadtsdec.h" +#include "adts_header.h" +#include "adts_parser.h" #include "get_bits.h" #include "mpeg4audio.h" @@ -38,9 +39,10 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info, } tmp; tmp.u64 = av_be2ne64(state); - init_get_bits(&bits, tmp.u8+8-AAC_ADTS_HEADER_SIZE, AAC_ADTS_HEADER_SIZE * 8); + init_get_bits(&bits, tmp.u8 + 8 - AV_AAC_ADTS_HEADER_SIZE, + AV_AAC_ADTS_HEADER_SIZE * 8); - if ((size = avpriv_aac_parse_header(&bits, &hdr)) < 0) + if ((size = ff_adts_header_parse(&bits, &hdr)) < 0) return 0; *need_next_header = 0; *new_frame_start = 1; @@ -54,7 +56,7 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info, static av_cold int aac_parse_init(AVCodecParserContext *s1) { AACAC3ParseContext *s = s1->priv_data; - s->header_size = AAC_ADTS_HEADER_SIZE; + s->header_size = AV_AAC_ADTS_HEADER_SIZE; s->sync = aac_sync; return 0; } |