generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf/adtsenc: Add support for APE tags

Browse Source 
Should fix ticket #2269

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
James Almer 2013-07-11 20:40:17 -03:00 committed by Michael Niedermayer
parent 83922cccb2
commit c994b42830
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@ -64,7 +64,7 @@ OBJS-$(CONFIG_ADF_DEMUXER) += bintext.o sauce.o
OBJS-$(CONFIG_ADP_DEMUXER) += adp.o OBJS-$(CONFIG_ADP_DEMUXER) += adp.o
OBJS-$(CONFIG_ADX_DEMUXER) += adxdec.o OBJS-$(CONFIG_ADX_DEMUXER) += adxdec.o
OBJS-$(CONFIG_ADX_MUXER) += rawenc.o OBJS-$(CONFIG_ADX_MUXER) += rawenc.o
OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o apetag.o
OBJS-$(CONFIG_AEA_DEMUXER) += aea.o pcm.o OBJS-$(CONFIG_AEA_DEMUXER) += aea.o pcm.o
OBJS-$(CONFIG_AFC_DEMUXER) += afc.o OBJS-$(CONFIG_AFC_DEMUXER) += afc.o
OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o pcm.o isom.o \ OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o pcm.o isom.o \

30
libavformat/adtsenc.c
View File

@ -24,16 +24,20 @@
#include "libavcodec/put_bits.h" #include "libavcodec/put_bits.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/mpeg4audio.h" #include "libavcodec/mpeg4audio.h"
#include "libavutil/opt.h"
#include "avformat.h" #include "avformat.h"
#include "apetag.h"
#define ADTS_HEADER_SIZE 7 #define ADTS_HEADER_SIZE 7
typedef struct { typedef struct {
AVClass *class;
int write_adts; int write_adts;
int objecttype; int objecttype;
int sample_rate_index; int sample_rate_index;
int channel_conf; int channel_conf;
int pce_size; int pce_size;
int apetag;
uint8_t pce_data[MAX_PCE_SIZE]; uint8_t pce_data[MAX_PCE_SIZE];
} ADTSContext; } ADTSContext;
@ -162,6 +166,30 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }
static int adts_write_trailer(AVFormatContext *s)
{
ADTSContext *adts = s->priv_data;
if (adts->apetag)
ff_ape_write_tag(s);
return 0;
}
#define ENC AV_OPT_FLAG_ENCODING_PARAM
#define OFFSET(obj) offsetof(ADTSContext, obj)
static const AVOption options[] = {
{ "write_apetag", "Enable APE tag writing", OFFSET(apetag), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, ENC},
{ NULL },
};
static const AVClass adts_muxer_class = {
.class_name = "ADTS muxer",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
AVOutputFormat ff_adts_muxer = { AVOutputFormat ff_adts_muxer = {
.name = "adts", .name = "adts",
.long_name = NULL_IF_CONFIG_SMALL("ADTS AAC (Advanced Audio Coding)"), .long_name = NULL_IF_CONFIG_SMALL("ADTS AAC (Advanced Audio Coding)"),
@ -172,4 +200,6 @@ AVOutputFormat ff_adts_muxer = {
.video_codec = AV_CODEC_ID_NONE, .video_codec = AV_CODEC_ID_NONE,
.write_header = adts_write_header, .write_header = adts_write_header,
.write_packet = adts_write_packet, .write_packet = adts_write_packet,
.write_trailer = adts_write_trailer,
.priv_class = &adts_muxer_class,
}; };