virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

flac muxer: add option to disable writing the global header

Browse Source 
The global header is not explicitly required for playback, and
omitting it allows for simple concatenation.
This commit is contained in:
Justin Ruggles 2014-01-09 12:11:26 -05:00
parent e6f0bb6527
commit aa69cbc9e0
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavformat/flacenc.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/opt.h"
#include "libavcodec/flac.h" #include "libavcodec/flac.h"
#include "avformat.h" #include "avformat.h"
#include "flacenc.h" #include "flacenc.h"
@ -26,6 +27,11 @@
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
typedef struct FlacMuxerContext {
const AVClass *class;
int write_header;
} FlacMuxerContext;
static int flac_write_block_padding(AVIOContext *pb, unsigned int n_padding_bytes, static int flac_write_block_padding(AVIOContext *pb, unsigned int n_padding_bytes,
int last_block) int last_block)
{ {
@ -68,6 +74,10 @@ static int flac_write_header(struct AVFormatContext *s)
{ {
int ret; int ret;
AVCodecContext *codec = s->streams[0]->codec; AVCodecContext *codec = s->streams[0]->codec;
FlacMuxerContext *c = s->priv_data;
if (!c->write_header)
return 0;
ret = ff_flac_write_header(s->pb, codec, 0); ret = ff_flac_write_header(s->pb, codec, 0);
if (ret) if (ret)
@ -93,6 +103,10 @@ static int flac_write_trailer(struct AVFormatContext *s)
uint8_t *streaminfo; uint8_t *streaminfo;
enum FLACExtradataFormat format; enum FLACExtradataFormat format;
int64_t file_size; int64_t file_size;
FlacMuxerContext *c = s->priv_data;
if (!c->write_header)
return 0;
if (!avpriv_flac_is_extradata_valid(s->streams[0]->codec, &format, &streaminfo)) if (!avpriv_flac_is_extradata_valid(s->streams[0]->codec, &format, &streaminfo))
return -1; return -1;
@ -116,9 +130,22 @@ static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }
static const AVOption flacenc_options[] = {
{ "write_header", "Write the file header", offsetof(FlacMuxerContext, write_header), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM },
{ NULL },
};
static const AVClass flac_muxer_class = {
.class_name = "flac muxer",
.item_name = av_default_item_name,
.option = flacenc_options,
.version = LIBAVUTIL_VERSION_INT,
};
AVOutputFormat ff_flac_muxer = { AVOutputFormat ff_flac_muxer = {
.name = "flac", .name = "flac",
.long_name = NULL_IF_CONFIG_SMALL("raw FLAC"), .long_name = NULL_IF_CONFIG_SMALL("raw FLAC"),
.priv_data_size = sizeof(FlacMuxerContext),
.mime_type = "audio/x-flac", .mime_type = "audio/x-flac",
.extensions = "flac", .extensions = "flac",
.audio_codec = AV_CODEC_ID_FLAC, .audio_codec = AV_CODEC_ID_FLAC,
@ -127,4 +154,5 @@ AVOutputFormat ff_flac_muxer = {
.write_packet = flac_write_packet, .write_packet = flac_write_packet,
.write_trailer = flac_write_trailer, .write_trailer = flac_write_trailer,
.flags = AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
.priv_class = &flac_muxer_class,
}; };

2
libavformat/version.h
View File

@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MAJOR 55
#define LIBAVFORMAT_VERSION_MINOR 10 #define LIBAVFORMAT_VERSION_MINOR 10
#define LIBAVFORMAT_VERSION_MICRO 1 #define LIBAVFORMAT_VERSION_MICRO 2
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \