mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-02 03:06:28 +02:00
dd8ffc1925
* qatar/master: (47 commits) lavc: hide private symbols. lavc: deprecate img_get_alpha_info(). lavc: use avpriv_ prefix for ff_toupper4. lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits. lavc: use avpriv_ prefix for ff_ac3_parse_header. lavc: use avpriv_ prefix for ff_frame_rate_tab. lavc: rename ff_find_start_code to avpriv_mpv_find_start_code lavc: use avpriv_ prefix for ff_split_xiph_headers. lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header. lavc: use avpriv_ prefix for some dv symbols used in lavf. lavc: use avpriv_ prefix for some flac symbols used in lavf. lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf. lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf. lavc: use avpriv_ prefix for ff_aac_parse_header(). lavf: hide private symbols. lavf: use avpriv_ prefix for some dv functions. lavf: use avpriv_ prefix for ff_new_chapter(). avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2() avcodec: clarify documentation of CODEC_CAP_DELAY ... Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dv.c libavcodec/dvdata.c libavcodec/dvdata.h libavcodec/libspeexenc.c libavcodec/mpegvideo.c libavcodec/version.h libavformat/avidec.c libavformat/dv.c libavformat/dv.h libavformat/flvenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/oggparsespeex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
97 lines
2.9 KiB
C
97 lines
2.9 KiB
C
/*
|
|
* Copyright (C) 2005 Matthieu CASTET
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include "libavcodec/get_bits.h"
|
|
#include "libavcodec/flac.h"
|
|
#include "avformat.h"
|
|
#include "oggdec.h"
|
|
|
|
#define OGG_FLAC_METADATA_TYPE_STREAMINFO 0x7F
|
|
|
|
static int
|
|
flac_header (AVFormatContext * s, int idx)
|
|
{
|
|
struct ogg *ogg = s->priv_data;
|
|
struct ogg_stream *os = ogg->streams + idx;
|
|
AVStream *st = s->streams[idx];
|
|
GetBitContext gb;
|
|
FLACStreaminfo si;
|
|
int mdt;
|
|
|
|
if (os->buf[os->pstart] == 0xff)
|
|
return 0;
|
|
|
|
init_get_bits(&gb, os->buf + os->pstart, os->psize*8);
|
|
skip_bits1(&gb); /* metadata_last */
|
|
mdt = get_bits(&gb, 7);
|
|
|
|
if (mdt == OGG_FLAC_METADATA_TYPE_STREAMINFO) {
|
|
uint8_t *streaminfo_start = os->buf + os->pstart + 5 + 4 + 4 + 4;
|
|
skip_bits_long(&gb, 4*8); /* "FLAC" */
|
|
if(get_bits(&gb, 8) != 1) /* unsupported major version */
|
|
return -1;
|
|
skip_bits_long(&gb, 8 + 16); /* minor version + header count */
|
|
skip_bits_long(&gb, 4*8); /* "fLaC" */
|
|
|
|
/* METADATA_BLOCK_HEADER */
|
|
if (get_bits_long(&gb, 32) != FLAC_STREAMINFO_SIZE)
|
|
return -1;
|
|
|
|
avpriv_flac_parse_streaminfo(st->codec, &si, streaminfo_start);
|
|
|
|
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
|
|
st->codec->codec_id = CODEC_ID_FLAC;
|
|
|
|
st->codec->extradata =
|
|
av_malloc(FLAC_STREAMINFO_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
|
|
memcpy(st->codec->extradata, streaminfo_start, FLAC_STREAMINFO_SIZE);
|
|
st->codec->extradata_size = FLAC_STREAMINFO_SIZE;
|
|
|
|
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
|
|
} else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
|
|
ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 4, os->psize - 4);
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
old_flac_header (AVFormatContext * s, int idx)
|
|
{
|
|
AVStream *st = s->streams[idx];
|
|
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
|
|
st->codec->codec_id = CODEC_ID_FLAC;
|
|
|
|
return 0;
|
|
}
|
|
|
|
const struct ogg_codec ff_flac_codec = {
|
|
.magic = "\177FLAC",
|
|
.magicsize = 5,
|
|
.header = flac_header
|
|
};
|
|
|
|
const struct ogg_codec ff_old_flac_codec = {
|
|
.magic = "fLaC",
|
|
.magicsize = 4,
|
|
.header = old_flac_header
|
|
};
|