Index: mythtv/configure =================================================================== --- mythtv/configure (revision 26508) +++ mythtv/configure (working copy) @@ -252,6 +252,7 @@ and libraw1394 [no] --enable-libdirac enable Dirac support via libdirac [no] --enable-libfaac enable FAAC support via libfaac [no] + --enable-libfaad enable FAAD/LATM support via libfaad [no] --enable-libgsm enable GSM support via libgsm [no] --enable-libmp3lame enable MP3 encoding via libmp3lame [no] --enable-libnut enable NUT (de)muxing via libnut, @@ -1092,6 +1093,7 @@ libdc1394 libdirac libfaac + libfaad libgsm libmp3lame libnut @@ -3235,6 +3237,7 @@ die_license_disabled gpl x11grab die_license_disabled nonfree libfaac +die_license_disabled nonfree libfaad die_license_disabled version3 libopencore_amrnb die_license_disabled version3 libopencore_amrwb @@ -3640,6 +3643,7 @@ require libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init $(pkg-config --libs dirac) && require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac) enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac +enabled libfaad && require2 libfaad "stdint.h neaacdec.h" NeAACDecInit -lfaad enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm enabled libmp3lame && require libmp3lame lame/lame.h lame_init -lmp3lame enabled libnut && require libnut libnut.h nut_demuxer_init -lnut @@ -4278,6 +4282,7 @@ echo "libdc1394 support ${libdc1394-no}" echo "libdirac enabled ${libdirac-no}" echo "libfaac enabled ${libfaac-no}" +echo "libfaad enabled ${libfaad-no}" echo "libgsm enabled ${libgsm-no}" echo "libmp3lame enabled ${libmp3lame-no}" echo "libnut enabled ${libnut-no}" Index: mythtv/external/FFmpeg/libavcodec/latmaac.c =================================================================== --- mythtv/external/FFmpeg/libavcodec/latmaac.c (revision 0) +++ mythtv/external/FFmpeg/libavcodec/latmaac.c (revision 0) @@ -0,0 +1,404 @@ +/* + * copyright (c) 2008 Paul Kendall + * + * This file is part of FFmpeg. + * + * FFmpeg 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, + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file latmaac.c + * LATM wrapped AAC decoder + */ + +#include +#include +#include +#include +#include + +#include "parser.h" +#include "get_bits.h" +#include "put_bits.h" +#include "mpeg4audio.h" +#include "neaacdec.h" + +/* + Note: This decoder filter is intended to decode LATM streams transferred + in MPEG transport streams which only contain one program. + To do a more complex LATM demuxing a separate LATM demuxer should be used. +*/ + +#define SYNC_LATM 0x2b7 // 11 bits +#define MAX_SIZE 8*1024 + +typedef struct AACDecoder +{ + faacDecHandle aac_decoder; + uint8_t initialized; + + // parser data + uint8_t audio_mux_version_A; + uint8_t frameLengthType; + uint8_t extra[64]; // should be way enough + int extrasize; +} AACDecoder; + +static inline int64_t latm_get_value(GetBitContext *b) +{ + uint8_t bytesForValue = get_bits(b, 2); + int64_t value = 0; + int i; + for (i=0; i<=bytesForValue; i++) { + value <<= 8; + value |= get_bits(b, 8); + } + return value; +} + +static void readGASpecificConfig(int audioObjectType, GetBitContext *b, PutBitContext *o) +{ + int framelen_flag; + int dependsOnCoder; + int ext_flag; + + framelen_flag = get_bits(b, 1); + put_bits(o, 1, framelen_flag); + dependsOnCoder = get_bits(b, 1); + put_bits(o, 1, dependsOnCoder); + if (dependsOnCoder) { + int delay = get_bits(b, 14); + put_bits(o, 14, delay); + } + ext_flag = get_bits(b, 1); + put_bits(o, 1, ext_flag); + + if (audioObjectType == 6 || audioObjectType == 20) { + int layerNr = get_bits(b, 3); + put_bits(o, 3, layerNr); + } + if (ext_flag) { + if (audioObjectType == 22) { + skip_bits(b, 5); // numOfSubFrame + skip_bits(b, 11); // layer_length + + put_bits(o, 16, 0); + } + if (audioObjectType == 17 || + audioObjectType == 19 || + audioObjectType == 20 || + audioObjectType == 23) { + + skip_bits(b, 3); // stuff + put_bits(o, 3, 0); + } + + skip_bits(b, 1); // extflag3 + put_bits(o, 1, 0); + } +} + +static int readAudioSpecificConfig(struct AACDecoder *decoder, GetBitContext *b) +{ + PutBitContext o; + int ret = 0; + int audioObjectType; + int samplingFrequencyIndex; + int channelConfiguration; + + init_put_bits(&o, decoder->extra, sizeof(decoder->extra)); + + audioObjectType = get_bits(b, 5); + put_bits(&o, 5, audioObjectType); + if (audioObjectType == 31) { + uint8_t extended = get_bits(b, 6); + put_bits(&o, 6, extended); + audioObjectType = 32 + extended; + } + + samplingFrequencyIndex = get_bits(b, 4); + put_bits(&o, 4, samplingFrequencyIndex); + if (samplingFrequencyIndex == 0x0f) { + uint32_t f = get_bits_long(b, 24); + put_bits(&o, 24, f); + } + channelConfiguration = get_bits(b, 4); + put_bits(&o, 4, channelConfiguration); + + if (audioObjectType == 1 || audioObjectType == 2 || audioObjectType == 3 + || audioObjectType == 4 || audioObjectType == 6 || audioObjectType == 7) { + readGASpecificConfig(audioObjectType, b, &o); + } else if (audioObjectType == 5) { + int sbr_present = 1; + samplingFrequencyIndex = get_bits(b, 4); + if (samplingFrequencyIndex == 0x0f) { + uint32_t f = get_bits_long(b, 24); + put_bits(&o, 24, f); + } + audioObjectType = get_bits(b, 5); + put_bits(&o, 5, audioObjectType); + } else if (audioObjectType >= 17) { + int epConfig; + readGASpecificConfig(audioObjectType, b, &o); + epConfig = get_bits(b, 2); + put_bits(&o, 2, epConfig); + } + + // count the extradata + ret = put_bits_count(&o); + decoder->extrasize = (ret + 7) / 8; + + flush_put_bits(&o); + return ret; +} + +static void readStreamMuxConfig(struct AACDecoder *parser, GetBitContext *b) +{ + int audio_mux_version = get_bits(b, 1); + parser->audio_mux_version_A = 0; + if (audio_mux_version == 1) { // audioMuxVersion + parser->audio_mux_version_A = get_bits(b, 1); + } + + if (parser->audio_mux_version_A == 0) { + int frame_length_type; + + if (audio_mux_version == 1) { + // taraFullness + latm_get_value(b); + } + get_bits(b, 1); // allStreamSameTimeFraming = 1 + get_bits(b, 6); // numSubFrames = 0 + get_bits(b, 4); // numPrograms = 0 + + // for each program (which there is only on in DVB) + get_bits(b, 3); // numLayer = 0 + + // for each layer (which there is only on in DVB) + if (audio_mux_version == 0) { + readAudioSpecificConfig(parser, b); + } else { + int ascLen = latm_get_value(b); + ascLen -= readAudioSpecificConfig(parser, b); + + // skip left over bits + while (ascLen > 16) { + skip_bits(b, 16); + ascLen -= 16; + } + skip_bits(b, ascLen); + } + + // these are not needed... perhaps + frame_length_type = get_bits(b, 3); + parser->frameLengthType = frame_length_type; + if (frame_length_type == 0) { + get_bits(b, 8); + } else if (frame_length_type == 1) { + get_bits(b, 9); + } else if (frame_length_type == 3 || frame_length_type == 4 || frame_length_type == 5) { + // celp_table_index + get_bits(b, 6); + } else if (frame_length_type == 6 || frame_length_type == 7) { + // hvxc_table_index + get_bits(b, 1); + } + + // other data + if (get_bits(b, 1)) { + // other data present + if (audio_mux_version == 1) { + // other_data_bits + latm_get_value(b); + } else { + int esc, tmp; + // other data bits + int64_t other_data_bits = 0; + do { + esc = get_bits(b, 1); + tmp = get_bits(b, 8); + other_data_bits = other_data_bits << 8 | tmp; + } while (esc); + } + } + + // CRC if necessary + if (get_bits(b, 1)) { + // config_crc + get_bits(b, 8); + } + } else { + // TBD + } +} + +static int readPayloadLengthInfo(struct AACDecoder *parser, GetBitContext *b) +{ + if (parser->frameLengthType == 0) { + uint8_t tmp; + int muxSlotLengthBytes = 0; + do { + tmp = get_bits(b, 8); + muxSlotLengthBytes += tmp; + } while (tmp == 255); + return muxSlotLengthBytes; + } else { + if (parser->frameLengthType == 3 || + parser->frameLengthType == 5 || + parser->frameLengthType == 7) { + get_bits(b, 2); + } + return 0; + } +} + +static void readAudioMuxElement(struct AACDecoder *parser, GetBitContext *b, uint8_t *payload, int *payloadsize) +{ + uint8_t use_same_mux = get_bits(b, 1); + if (!use_same_mux) { + readStreamMuxConfig(parser, b); + } + if (parser->audio_mux_version_A == 0) { + int j; + int muxSlotLengthBytes = readPayloadLengthInfo(parser, b); + muxSlotLengthBytes = FFMIN(muxSlotLengthBytes, *payloadsize); + for (j=0; j size) return -1; // not enough data, the parser should have sorted this + + readAudioMuxElement(parser, b, payload, payloadsize); + + return 0; +} + +static void channel_setup(AVCodecContext *avctx) +{ + AACDecoder *decoder = avctx->priv_data; + + if (avctx->request_channels > 0 && avctx->request_channels == 2 && + avctx->request_channels < avctx->channels) { + NeAACDecConfigurationPtr faac_cfg; + avctx->channels = 2; + faac_cfg = NeAACDecGetCurrentConfiguration(decoder->aac_decoder); + faac_cfg->downMatrix = 1; + faac_cfg->defSampleRate = (!avctx->sample_rate) ? 44100 : avctx->sample_rate; + NeAACDecSetConfiguration(decoder->aac_decoder, faac_cfg); + } +} + +static int latm_decode_frame(AVCodecContext *avctx, void *out, int *out_size, AVPacket *avpkt) +{ + AACDecoder *decoder = avctx->priv_data; + uint8_t tempbuf[MAX_SIZE]; + int bufsize = MAX_SIZE; + int max_size = *out_size; + NeAACDecFrameInfo info; + GetBitContext b; + + if(avpkt->size == 0) + return 0; + + init_get_bits(&b, avpkt->data, avpkt->size * 8); + if (readAudioSyncStream(decoder, &b, avpkt->size, tempbuf, &bufsize)) { + return -1; + } + + if (!decoder->initialized) { + // we are going to initialize from decoder specific info when available + if (decoder->extrasize > 0) { + uint32_t sample_rate; + uint8_t channels; + if (NeAACDecInit2(decoder->aac_decoder, decoder->extra, decoder->extrasize, &sample_rate, &channels)) { + return -1; + } + avctx->sample_rate = sample_rate; + avctx->channels = channels; + channel_setup(avctx); + decoder->initialized = 1; + } else { + *out_size = 0; + return avpkt->size; + } + } + + NeAACDecDecode2(decoder->aac_decoder, &info, tempbuf, bufsize, &out, max_size); + if (info.error > 0) { + av_log(avctx, AV_LOG_ERROR, "libfaad: frame decoding failed: %s\n", + NeAACDecGetErrorMessage(info.error)); + return -1; + } + if (!avctx->frame_size) + avctx->frame_size = info.samples/avctx->channels; + + if (out_size) + *out_size = info.samples * sizeof(short); + + return avpkt->size; +} + +static int latm_decode_init(AVCodecContext *avctx) +{ + AACDecoder *decoder = avctx->priv_data; + NeAACDecConfigurationPtr faac_cfg; + + avctx->bit_rate = 0; + avctx->sample_fmt = SAMPLE_FMT_S16; + + decoder->aac_decoder = NeAACDecOpen(); + if (!decoder->aac_decoder) { + return -1; + } + + faac_cfg = NeAACDecGetCurrentConfiguration(decoder->aac_decoder); + if (faac_cfg) { + faac_cfg->outputFormat = FAAD_FMT_16BIT; + faac_cfg->defSampleRate = (!avctx->sample_rate) ? 44100 : avctx->sample_rate; + faac_cfg->defObjectType = LC; + NeAACDecSetConfiguration(decoder->aac_decoder, faac_cfg); + } + + decoder->initialized = 0; + return 0; +} + +static int latm_decode_end(AVCodecContext *avctx) +{ + AACDecoder *decoder = avctx->priv_data; + NeAACDecClose(decoder->aac_decoder); + return 0; +} + +AVCodec libfaad_latm_decoder = { + .name = "libfaad_latm", + .type = CODEC_TYPE_AUDIO, + .id = CODEC_ID_AAC_LATM, + .priv_data_size = sizeof (AACDecoder), + .init = latm_decode_init, + .close = latm_decode_end, + .decode = latm_decode_frame, + .long_name = NULL_IF_CONFIG_SMALL("libfaad AAC LATM (Advanced Audio Codec)"), +}; Index: mythtv/external/FFmpeg/libavcodec/latm_parser.c =================================================================== --- mythtv/external/FFmpeg/libavcodec/latm_parser.c (revision 0) +++ mythtv/external/FFmpeg/libavcodec/latm_parser.c (revision 0) @@ -0,0 +1,118 @@ +/* + * copyright (c) 2008 Paul Kendall + * + * This file is part of FFmpeg. + * + * FFmpeg 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, + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file latm_parser.c + * LATM parser + */ + +#include +#include +#include +#include +#include + +#include "parser.h" + +#define LATM_HEADER 0x56e000 // 0x2b7 (11 bits) +#define LATM_MASK 0xFFE000 // top 11 bits +#define LATM_SIZE_MASK 0x001FFF // bottom 13 bits + +typedef struct LATMParseContext{ + ParseContext pc; + int count; +} LATMParseContext; + +/** + * finds the end of the current frame in the bitstream. + * @return the position of the first byte of the next frame, or -1 + */ +static int latm_find_frame_end(AVCodecParserContext *s1, const uint8_t *buf, + int buf_size) { + LATMParseContext *s = s1->priv_data; + ParseContext *pc = &s->pc; + int pic_found, i; + uint32_t state; + + pic_found = pc->frame_start_found; + state = pc->state; + + i = 0; + if(!pic_found){ + for(i=0; icount = - i; + pic_found=1; + break; + } + } + } + + if(pic_found){ + /* EOF considered as end of frame */ + if (buf_size == 0) + return 0; + if((state & LATM_SIZE_MASK) - s->count <= buf_size) { + pc->frame_start_found = 0; + pc->state = -1; + return (state & LATM_SIZE_MASK) - s->count; + } + } + + s->count += buf_size; + pc->frame_start_found = pic_found; + pc->state = state; + return END_NOT_FOUND; +} + +static int latm_parse(AVCodecParserContext *s1, + AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + LATMParseContext *s = s1->priv_data; + ParseContext *pc = &s->pc; + int next; + + if(s1->flags & PARSER_FLAG_COMPLETE_FRAMES){ + next = buf_size; + }else{ + next = latm_find_frame_end(s1, buf, buf_size); + + if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + } + *poutbuf = buf; + *poutbuf_size = buf_size; + return next; +} + +AVCodecParser latm_parser = { + { CODEC_ID_AAC_LATM }, + sizeof(LATMParseContext), + NULL, + latm_parse, + ff_parse_close +}; Index: mythtv/external/FFmpeg/libavcodec/Makefile =================================================================== --- mythtv/external/FFmpeg/libavcodec/Makefile (revision 26508) +++ mythtv/external/FFmpeg/libavcodec/Makefile (working copy) @@ -540,6 +540,7 @@ OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o OBJS-$(CONFIG_LIBDIRAC_ENCODER) += libdiracenc.o libdirac_libschro.o OBJS-$(CONFIG_LIBFAAC_ENCODER) += libfaac.o +OBJS-$(CONFIG_LIBFAAD_LATM_DECODER) += latmaac.o OBJS-$(CONFIG_LIBGSM_DECODER) += libgsm.o OBJS-$(CONFIG_LIBGSM_ENCODER) += libgsm.o OBJS-$(CONFIG_LIBGSM_MS_DECODER) += libgsm.o @@ -583,6 +584,7 @@ h264_loopfilter.o h264_cabac.o \ h264_cavlc.o h264_ps.o \ mpegvideo.o error_resilience.o +OBJS-$(CONFIG_LATM_PARSER) += latm_parser.o OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \