X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fadtsenc.c;h=e7c9ca6ce11d2c99ae9d02753578f28655e46ae1;hb=929ec39ec4497827f7530f2aaa31646ef35462ee;hp=9916b92ac6ddf6032b080886dc528e2c1f0861a5;hpb=eca406e2843d3daec4567d902d4309a21598bcb5;p=ffmpeg diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index 9916b92ac6d..e7c9ca6ce11 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -3,25 +3,27 @@ * Copyright (c) 2006 Baptiste Coudurier * Mans Rullgard * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/bitstream.h" -#include "libavcodec/internal.h" +#include "libavcodec/get_bits.h" +#include "libavcodec/put_bits.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/mpeg4audio.h" #include "avformat.h" #define ADTS_HEADER_SIZE 7 @@ -31,18 +33,29 @@ 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) +#define ADTS_MAX_FRAME_BYTES ((1 << 13) - 1) + +static int adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t *buf, int size) { GetBitContext gb; + PutBitContext pb; + MPEG4AudioConfig m4ac; + int off; init_get_bits(&gb, buf, size * 8); - adts->objecttype = get_bits(&gb, 5) - 1; - adts->sample_rate_index = get_bits(&gb, 4); - adts->channel_conf = get_bits(&gb, 4); - - if (adts->objecttype > 3) { + off = avpriv_mpeg4audio_get_config(&m4ac, buf, size * 8, 1); + if (off < 0) + return off; + skip_bits_long(&gb, off); + adts->objecttype = m4ac.object_type - 1; + adts->sample_rate_index = m4ac.sampling_index; + adts->channel_conf = m4ac.chan_config; + + if (adts->objecttype > 3U) { av_log(s, AV_LOG_ERROR, "MPEG-4 AOT %d is not allowed in ADTS\n", adts->objecttype+1); return -1; } @@ -50,10 +63,25 @@ 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); + if (get_bits(&gb, 1)) { + av_log(s, AV_LOG_ERROR, "960/120 MDCT window is not allowed in ADTS\n"); + return -1; + } + if (get_bits(&gb, 1)) { + av_log(s, AV_LOG_ERROR, "Scalable configurations are not allowed in ADTS\n"); + return -1; + } + if (get_bits(&gb, 1)) { + av_log(s, AV_LOG_ERROR, "Extension flag is not allowed in ADTS\n"); 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 = (avpriv_copy_pce_data(&pb, &gb) + 3) / 8; + flush_put_bits(&pb); + } adts->write_adts = 1; @@ -65,18 +93,24 @@ static int adts_write_header(AVFormatContext *s) ADTSContext *adts = s->priv_data; AVCodecContext *avc = s->streams[0]->codec; - if(avc->extradata_size > 0 && - decode_extradata(s, adts, avc->extradata, avc->extradata_size) < 0) + if (avc->extradata_size > 0 && + adts_decode_extradata(s, adts, avc->extradata, avc->extradata_size) < 0) return -1; return 0; } -static int adts_write_frame_header(AVFormatContext *s, int size) +static int adts_write_frame_header(ADTSContext *ctx, + uint8_t *buf, int size, int pce_size) { - ADTSContext *ctx = s->priv_data; PutBitContext pb; - uint8_t buf[ADTS_HEADER_SIZE]; + + unsigned full_frame_size = (unsigned)ADTS_HEADER_SIZE + size + pce_size; + if (full_frame_size > ADTS_MAX_FRAME_BYTES) { + av_log(NULL, AV_LOG_ERROR, "ADTS frame size too large: %u (max %d)\n", + full_frame_size, ADTS_MAX_FRAME_BYTES); + return AVERROR_INVALIDDATA; + } init_put_bits(&pb, buf, ADTS_HEADER_SIZE); @@ -95,12 +129,11 @@ 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, full_frame_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); return 0; } @@ -108,26 +141,35 @@ static int adts_write_frame_header(AVFormatContext *s, int size) static int adts_write_packet(AVFormatContext *s, AVPacket *pkt) { ADTSContext *adts = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; + uint8_t buf[ADTS_HEADER_SIZE]; if (!pkt->size) return 0; - if(adts->write_adts) - adts_write_frame_header(s, pkt->size); - put_buffer(pb, pkt->data, pkt->size); - put_flush_packet(pb); + if (adts->write_adts) { + int err = adts_write_frame_header(adts, buf, pkt->size, + adts->pce_size); + if (err < 0) + return err; + avio_write(pb, buf, ADTS_HEADER_SIZE); + if (adts->pce_size) { + avio_write(pb, adts->pce_data, adts->pce_size); + adts->pce_size = 0; + } + } + avio_write(pb, pkt->data, pkt->size); return 0; } -AVOutputFormat adts_muxer = { - "adts", - NULL_IF_CONFIG_SMALL("ADTS AAC"), - "audio/aac", - "aac", - sizeof(ADTSContext), - CODEC_ID_AAC, - CODEC_ID_NONE, - adts_write_header, - adts_write_packet, +AVOutputFormat ff_adts_muxer = { + .name = "adts", + .long_name = NULL_IF_CONFIG_SMALL("ADTS AAC (Advanced Audio Coding)"), + .mime_type = "audio/aac", + .extensions = "aac,adts", + .priv_data_size = sizeof(ADTSContext), + .audio_codec = AV_CODEC_ID_AAC, + .video_codec = AV_CODEC_ID_NONE, + .write_header = adts_write_header, + .write_packet = adts_write_packet, };