mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-24 00:02:52 +00:00
Add PCE support to the ADTS muxer.
Originally committed as revision 18818 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
107815de42
commit
97d4318347
@ -23,6 +23,7 @@
|
||||
#include "libavcodec/get_bits.h"
|
||||
#include "libavcodec/put_bits.h"
|
||||
#include "libavcodec/internal.h"
|
||||
#include "libavcodec/mpeg4audio.h"
|
||||
#include "avformat.h"
|
||||
|
||||
#define ADTS_HEADER_SIZE 7
|
||||
@ -32,11 +33,14 @@ typedef struct {
|
||||
int objecttype;
|
||||
int sample_rate_index;
|
||||
int channel_conf;
|
||||
int pce_size;
|
||||
uint8_t pce_data[MAX_PCE_SIZE];
|
||||
} ADTSContext;
|
||||
|
||||
static int decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t *buf, int size)
|
||||
{
|
||||
GetBitContext gb;
|
||||
PutBitContext pb;
|
||||
|
||||
init_get_bits(&gb, buf, size * 8);
|
||||
adts->objecttype = get_bits(&gb, 5) - 1;
|
||||
@ -51,10 +55,6 @@ static int decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t *buf,
|
||||
av_log(s, AV_LOG_ERROR, "Escape sample rate index illegal in ADTS\n");
|
||||
return -1;
|
||||
}
|
||||
if (adts->channel_conf == 0) {
|
||||
ff_log_missing_feature(s, "PCE based channel configuration", 0);
|
||||
return -1;
|
||||
}
|
||||
if (get_bits(&gb, 1)) {
|
||||
av_log(s, AV_LOG_ERROR, "960/120 MDCT window is not allowed in ADTS\n");
|
||||
return -1;
|
||||
@ -67,6 +67,13 @@ static int decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t *buf,
|
||||
ff_log_missing_feature(s, "Signaled SBR or PS", 0);
|
||||
return -1;
|
||||
}
|
||||
if (!adts->channel_conf) {
|
||||
init_put_bits(&pb, adts->pce_data, MAX_PCE_SIZE);
|
||||
|
||||
put_bits(&pb, 3, 5); //ID_PCE
|
||||
adts->pce_size = (ff_copy_pce_data(&pb, &gb) + 3) / 8;
|
||||
flush_put_bits(&pb);
|
||||
}
|
||||
|
||||
adts->write_adts = 1;
|
||||
|
||||
@ -108,12 +115,16 @@ static int adts_write_frame_header(AVFormatContext *s, int size)
|
||||
/* adts_variable_header */
|
||||
put_bits(&pb, 1, 0); /* copyright_identification_bit */
|
||||
put_bits(&pb, 1, 0); /* copyright_identification_start */
|
||||
put_bits(&pb, 13, ADTS_HEADER_SIZE + size); /* aac_frame_length */
|
||||
put_bits(&pb, 13, ADTS_HEADER_SIZE + size + ctx->pce_size); /* aac_frame_length */
|
||||
put_bits(&pb, 11, 0x7ff); /* adts_buffer_fullness */
|
||||
put_bits(&pb, 2, 0); /* number_of_raw_data_blocks_in_frame */
|
||||
|
||||
flush_put_bits(&pb);
|
||||
put_buffer(s->pb, buf, ADTS_HEADER_SIZE);
|
||||
if (ctx->pce_size) {
|
||||
put_buffer(s->pb, ctx->pce_data, ctx->pce_size);
|
||||
ctx->pce_size = 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user