Mercurial > libavformat.hg
annotate oggparseflac.c @ 5836:2997c88028cd libavformat
Move the probe loop from av_open_input_file() into its own method
av_probe_input_buffer() so that it can be reused. Here are a few
differences to the original way things were probed:
- maximum probe buffer size can be specified as a parameter.
- offset within the stream to probe from can be specified as a parameter.
- instead of seeking back to the start each time a probe fails, stream
data is appended to the reallocated buffer. This lowers the amount
of data read from the stream (there is no repetition) and results in
fewer closed and reopened streams (when seeking fails).
New attempt after r22296, which was revert in r22315 due to a FATE
failure.
See the thread:
Subject: [FFmpeg-devel] [PATCH] Move av_open_input_file probe loop to its own method
Date: 2010-03-05 03:23:57 GMT
Patch by Micah F. Galizia printf("%s%s@%s.%s", "micah", "galizia", "gmail", "com").
author | stefano |
---|---|
date | Sun, 14 Mar 2010 22:40:16 +0000 |
parents | b9f21d75c81a |
children | 536e5527c1e0 |
rev | line source |
---|---|
756 | 1 /* |
2 * Copyright (C) 2005 Matthieu CASTET | |
885 | 3 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1077
diff
changeset
|
4 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1077
diff
changeset
|
5 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1077
diff
changeset
|
6 * FFmpeg is free software; you can redistribute it and/or |
756 | 7 * modify it under the terms of the GNU Lesser General Public |
8 * License as published by the Free Software Foundation; either | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1077
diff
changeset
|
9 * version 2.1 of the License, or (at your option) any later version. |
756 | 10 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1077
diff
changeset
|
11 * FFmpeg is distributed in the hope that it will be useful, |
756 | 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
14 * Lesser General Public License for more details. | |
15 * | |
16 * You should have received a copy of the GNU Lesser General Public | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1077
diff
changeset
|
17 * License along with FFmpeg; if not, write to the Free Software |
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
885
diff
changeset
|
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
756 | 19 */ |
20 | |
21 #include <stdlib.h> | |
4872 | 22 #include "libavcodec/get_bits.h" |
4286
2af9d6b4db07
use function and definitions from libavcodec/flac.h in oggparseflac.c
jbr
parents:
4105
diff
changeset
|
23 #include "libavcodec/flac.h" |
756 | 24 #include "avformat.h" |
2714 | 25 #include "oggdec.h" |
756 | 26 |
4286
2af9d6b4db07
use function and definitions from libavcodec/flac.h in oggparseflac.c
jbr
parents:
4105
diff
changeset
|
27 #define OGG_FLAC_METADATA_TYPE_STREAMINFO 0x7F |
756 | 28 |
29 static int | |
30 flac_header (AVFormatContext * s, int idx) | |
31 { | |
4016 | 32 struct ogg *ogg = s->priv_data; |
33 struct ogg_stream *os = ogg->streams + idx; | |
756 | 34 AVStream *st = s->streams[idx]; |
35 GetBitContext gb; | |
4286
2af9d6b4db07
use function and definitions from libavcodec/flac.h in oggparseflac.c
jbr
parents:
4105
diff
changeset
|
36 FLACStreaminfo si; |
756 | 37 int mdt; |
38 | |
39 if (os->buf[os->pstart] == 0xff) | |
40 return 0; | |
41 | |
42 init_get_bits(&gb, os->buf + os->pstart, os->psize*8); | |
4105 | 43 skip_bits1(&gb); /* metadata_last */ |
756 | 44 mdt = get_bits(&gb, 7); |
45 | |
4286
2af9d6b4db07
use function and definitions from libavcodec/flac.h in oggparseflac.c
jbr
parents:
4105
diff
changeset
|
46 if (mdt == OGG_FLAC_METADATA_TYPE_STREAMINFO) { |
2af9d6b4db07
use function and definitions from libavcodec/flac.h in oggparseflac.c
jbr
parents:
4105
diff
changeset
|
47 uint8_t *streaminfo_start = os->buf + os->pstart + 5 + 4 + 4 + 4; |
4105 | 48 skip_bits_long(&gb, 4*8); /* "FLAC" */ |
756 | 49 if(get_bits(&gb, 8) != 1) /* unsupported major version */ |
50 return -1; | |
4105 | 51 skip_bits_long(&gb, 8 + 16); /* minor version + header count */ |
52 skip_bits_long(&gb, 4*8); /* "fLaC" */ | |
885 | 53 |
756 | 54 /* METADATA_BLOCK_HEADER */ |
2168 | 55 if (get_bits_long(&gb, 32) != FLAC_STREAMINFO_SIZE) |
756 | 56 return -1; |
57 | |
4286
2af9d6b4db07
use function and definitions from libavcodec/flac.h in oggparseflac.c
jbr
parents:
4105
diff
changeset
|
58 ff_flac_parse_streaminfo(st->codec, &si, streaminfo_start); |
885 | 59 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
756
diff
changeset
|
60 st->codec->codec_type = CODEC_TYPE_AUDIO; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
756
diff
changeset
|
61 st->codec->codec_id = CODEC_ID_FLAC; |
756 | 62 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
756
diff
changeset
|
63 st->codec->extradata = |
756 | 64 av_malloc(FLAC_STREAMINFO_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); |
4286
2af9d6b4db07
use function and definitions from libavcodec/flac.h in oggparseflac.c
jbr
parents:
4105
diff
changeset
|
65 memcpy(st->codec->extradata, streaminfo_start, FLAC_STREAMINFO_SIZE); |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
756
diff
changeset
|
66 st->codec->extradata_size = FLAC_STREAMINFO_SIZE; |
1077 | 67 |
68 st->time_base.num = 1; | |
69 st->time_base.den = st->codec->sample_rate; | |
4286
2af9d6b4db07
use function and definitions from libavcodec/flac.h in oggparseflac.c
jbr
parents:
4105
diff
changeset
|
70 } else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) { |
5824
b9f21d75c81a
oggdec: Metadata is per-stream; don't merge multiple streams' together
conrad
parents:
5823
diff
changeset
|
71 ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 4, os->psize - 4); |
756 | 72 } |
73 | |
74 return 1; | |
75 } | |
76 | |
2378 | 77 static int |
78 old_flac_header (AVFormatContext * s, int idx) | |
79 { | |
80 AVStream *st = s->streams[idx]; | |
81 st->codec->codec_type = CODEC_TYPE_AUDIO; | |
82 st->codec->codec_id = CODEC_ID_FLAC; | |
83 | |
84 return 0; | |
85 } | |
86 | |
4016 | 87 const struct ogg_codec ff_flac_codec = { |
756 | 88 .magic = "\177FLAC", |
89 .magicsize = 5, | |
90 .header = flac_header | |
91 }; | |
2378 | 92 |
4016 | 93 const struct ogg_codec ff_old_flac_codec = { |
2378 | 94 .magic = "fLaC", |
95 .magicsize = 4, | |
96 .header = old_flac_header | |
97 }; |