*/
#include <stdlib.h>
-#include "libavcodec/get_bits.h"
+
+#include "libavcodec/bitstream.h"
#include "libavcodec/flac.h"
+
#include "avformat.h"
#include "internal.h"
#include "oggdec.h"
struct ogg *ogg = s->priv_data;
struct ogg_stream *os = ogg->streams + idx;
AVStream *st = s->streams[idx];
- GetBitContext gb;
+ BitstreamContext bc;
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);
+ bitstream_init8(&bc, os->buf + os->pstart, os->psize);
+ bitstream_skip(&bc, 1); /* metadata_last */
+ mdt = bitstream_read(&bc, 7);
if (mdt == OGG_FLAC_METADATA_TYPE_STREAMINFO) {
uint8_t *streaminfo_start = os->buf + os->pstart + 5 + 4 + 4 + 4;
uint32_t samplerate;
- skip_bits_long(&gb, 4*8); /* "FLAC" */
- if(get_bits(&gb, 8) != 1) /* unsupported major version */
+ bitstream_skip(&bc, 4 * 8); /* "FLAC" */
+ if (bitstream_read(&bc, 8) != 1) /* unsupported major version */
return -1;
- skip_bits_long(&gb, 8 + 16); /* minor version + header count */
- skip_bits_long(&gb, 4*8); /* "fLaC" */
+ bitstream_skip(&bc, 8 + 16); /* minor version + header count */
+ bitstream_skip(&bc, 4 * 8); /* "fLaC" */
/* METADATA_BLOCK_HEADER */
- if (get_bits_long(&gb, 32) != FLAC_STREAMINFO_SIZE)
+ if (bitstream_read(&bc, 32) != FLAC_STREAMINFO_SIZE)
return -1;
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = AV_CODEC_ID_FLAC;
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_id = AV_CODEC_ID_FLAC;
st->need_parsing = AVSTREAM_PARSE_HEADERS;
- st->codec->extradata =
+ st->codecpar->extradata =
av_malloc(FLAC_STREAMINFO_SIZE + AV_INPUT_BUFFER_PADDING_SIZE);
- memcpy(st->codec->extradata, streaminfo_start, FLAC_STREAMINFO_SIZE);
- st->codec->extradata_size = FLAC_STREAMINFO_SIZE;
+ memcpy(st->codecpar->extradata, streaminfo_start, FLAC_STREAMINFO_SIZE);
+ st->codecpar->extradata_size = FLAC_STREAMINFO_SIZE;
- samplerate = AV_RB24(st->codec->extradata + 10) >> 4;
+ samplerate = AV_RB24(st->codecpar->extradata + 10) >> 4;
if (!samplerate)
return AVERROR_INVALIDDATA;
old_flac_header (AVFormatContext * s, int idx)
{
AVStream *st = s->streams[idx];
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = AV_CODEC_ID_FLAC;
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_id = AV_CODEC_ID_FLAC;
return 0;
}