virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Support remuxing aac_latm.

Browse Source
This commit is contained in:
Carl Eugen Hoyos 2011-09-08 08:22:50 +02:00
parent 1da43f7e99
commit c1fcd7e1ab
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/latmenc.c
View File

@ -25,6 +25,7 @@
#include "libavcodec/mpeg4audio.h" #include "libavcodec/mpeg4audio.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avformat.h" #include "avformat.h"
#include "rawenc.h"
typedef struct { typedef struct {
int off; int off;
@ -75,6 +76,9 @@ static int latm_write_header(AVFormatContext *s)
LATMContext *ctx = s->priv_data; LATMContext *ctx = s->priv_data;
AVCodecContext *avctx = s->streams[0]->codec; AVCodecContext *avctx = s->streams[0]->codec;
if (avctx->codec_id == CODEC_ID_AAC_LATM)
return 0;
if (avctx->extradata_size > 0 && if (avctx->extradata_size > 0 &&
latm_decode_extradata(ctx, avctx->extradata, avctx->extradata_size) < 0) latm_decode_extradata(ctx, avctx->extradata, avctx->extradata_size) < 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -135,6 +139,9 @@ static int latm_write_packet(AVFormatContext *s, AVPacket *pkt)
uint8_t loas_header[] = "\x56\xe0\x00"; uint8_t loas_header[] = "\x56\xe0\x00";
uint8_t *buf; uint8_t *buf;
if (s->streams[0]->codec->codec_id == CODEC_ID_AAC_LATM)
return ff_raw_write_packet(s, pkt);
if (pkt->size > 2 && pkt->data[0] == 0xff && (pkt->data[1] >> 4) == 0xf) { if (pkt->size > 2 && pkt->data[0] == 0xff && (pkt->data[1] >> 4) == 0xf) {
av_log(s, AV_LOG_ERROR, "ADTS header detected - ADTS will not be incorrectly muxed into LATM\n"); av_log(s, AV_LOG_ERROR, "ADTS header detected - ADTS will not be incorrectly muxed into LATM\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;