virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

Write FLAC codec private correctly

Browse Source 
Originally committed as revision 10339 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2007-09-05 00:24:08 +00:00
parent 86be66378b
commit 8a39497c13
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavformat/matroskaenc.c
View File

@ -364,6 +364,28 @@ static int put_xiph_codecpriv(ByteIOContext *pb, AVCodecContext *codec)
return 0; return 0;
} }
#define FLAC_STREAMINFO_SIZE 34
static int put_flac_codecpriv(ByteIOContext *pb, AVCodecContext *codec)
{
offset_t codecpriv = start_ebml_master(pb, MATROSKA_ID_CODECPRIVATE);
// if the extradata_size is greater than FLAC_STREAMINFO_SIZE,
// assume that it's in Matroska's format already
if (codec->extradata_size < FLAC_STREAMINFO_SIZE) {
av_log(codec, AV_LOG_ERROR, "Invalid FLAC extradata\n");
return -1;
} else if (codec->extradata_size == FLAC_STREAMINFO_SIZE) {
// only the streaminfo packet
put_byte(pb, 0);
put_xiph_size(pb, codec->extradata_size);
av_log(codec, AV_LOG_ERROR, "Only one packet\n");
}
put_buffer(pb, codec->extradata, codec->extradata_size);
end_ebml_master(pb, codecpriv);
return 0;
}
static void get_aac_sample_rates(AVCodecContext *codec, int *sample_rate, int *output_sample_rate) static void get_aac_sample_rates(AVCodecContext *codec, int *sample_rate, int *output_sample_rate)
{ {
static const int aac_sample_rates[] = { static const int aac_sample_rates[] = {
@ -440,6 +462,9 @@ static int mkv_write_tracks(AVFormatContext *s)
if (codec->codec_id == CODEC_ID_VORBIS || codec->codec_id == CODEC_ID_THEORA) { if (codec->codec_id == CODEC_ID_VORBIS || codec->codec_id == CODEC_ID_THEORA) {
if (put_xiph_codecpriv(pb, codec) < 0) if (put_xiph_codecpriv(pb, codec) < 0)
return -1; return -1;
} else if (codec->codec_id == CODEC_ID_FLAC) {
if (put_flac_codecpriv(pb, codec) < 0)
return -1;
} else if (codec->extradata_size) { } else if (codec->extradata_size) {
put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codec->extradata, codec->extradata_size); put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codec->extradata, codec->extradata_size);
} }