Mercurial > libavformat.hg
annotate vocdec.c @ 4723:a2390c6a35e6 libavformat
Fix index generation in the way that it was supposed to be used. See the
discussion in the ML thread "[PATCH] rmdec.c: merge old/new packet reading
code".
Over time, this code broke somewhat, e.g. seq was never actually written
into (and was thus always 1, therefore the seq condition was always true),
whereas it was supposed to be set to the sequence number of the video slice
in case the video frame is divided over multiple RM packets (slices). The
problem of this is that packets other than those containing the beginning
of a video frame would be indexed as well.
Secondly, flags&2 is supposed to be true for video keyframes and for these
audio packets containing the start of a block. For some codecs (e.g. AAC),
that is every single packet, whereas for others (e.g. cook), that is the
packet containing the first of a series of scrambled packets that are to be
descrambled together. Indexing any of the following would lead to incomplete
and thus useless frames. Problem here is that flags would be reset to 2 to
indicate that the first packet is ready to be returned, and in addition if
no data was left to be returned (which is always true for the first packet),
then we wouldn't actually write the index entry anyway.
All in all, the idea was good and it probably worked at some point, but that
is long ago. This patch should at the very least make it likely for this code
to be executed again at the right times, i.e. the way it was originally
intended to be used.
author | rbultje |
---|---|
date | Sun, 15 Mar 2009 20:14:25 +0000 |
parents | 7d2f3f1b68d8 |
children | 33a244b7ca65 |
rev | line source |
---|---|
937 | 1 /* |
2 * Creative Voice File demuxer. | |
3 * Copyright (c) 2006 Aurelien Jacobs <aurel@gnuage.org> | |
4 * | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1172
diff
changeset
|
5 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1172
diff
changeset
|
6 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1172
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
937 | 8 * modify it under the terms of the GNU Lesser General Public |
9 * 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:
1172
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
937 | 11 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1172
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
937 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * 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:
1172
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
2217 | 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
937 | 20 */ |
21 | |
4201
7d2f3f1b68d8
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents:
4081
diff
changeset
|
22 #include "libavutil/intreadwrite.h" |
937 | 23 #include "voc.h" |
24 | |
25 | |
26 static int voc_probe(AVProbeData *p) | |
27 { | |
28 int version, check; | |
29 | |
3764 | 30 if (memcmp(p->buf, ff_voc_magic, sizeof(ff_voc_magic) - 1)) |
937 | 31 return 0; |
2184 | 32 version = AV_RL16(p->buf + 22); |
33 check = AV_RL16(p->buf + 24); | |
937 | 34 if (~version + 0x1234 != check) |
35 return 10; | |
36 | |
37 return AVPROBE_SCORE_MAX; | |
38 } | |
39 | |
40 static int voc_read_header(AVFormatContext *s, AVFormatParameters *ap) | |
41 { | |
4081 | 42 VocDecContext *voc = s->priv_data; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2276
diff
changeset
|
43 ByteIOContext *pb = s->pb; |
937 | 44 int header_size; |
45 AVStream *st; | |
46 | |
47 url_fskip(pb, 20); | |
48 header_size = get_le16(pb) - 22; | |
49 if (header_size != 4) { | |
1883 | 50 av_log(s, AV_LOG_ERROR, "unknown header size: %d\n", header_size); |
2276
3c1e2d519277
Replace all occurrences of AVERROR_NOTSUPP with AVERROR(ENOSYS).
takis
parents:
2274
diff
changeset
|
51 return AVERROR(ENOSYS); |
937 | 52 } |
53 url_fskip(pb, header_size); | |
54 st = av_new_stream(s, 0); | |
55 if (!st) | |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2217
diff
changeset
|
56 return AVERROR(ENOMEM); |
937 | 57 st->codec->codec_type = CODEC_TYPE_AUDIO; |
58 | |
59 voc->remaining_size = 0; | |
60 return 0; | |
61 } | |
62 | |
63 int | |
64 voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) | |
65 { | |
4081 | 66 VocDecContext *voc = s->priv_data; |
937 | 67 AVCodecContext *dec = st->codec; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2276
diff
changeset
|
68 ByteIOContext *pb = s->pb; |
4081 | 69 VocType type; |
937 | 70 int size; |
71 int sample_rate = 0; | |
72 int channels = 1; | |
73 | |
74 while (!voc->remaining_size) { | |
75 type = get_byte(pb); | |
76 if (type == VOC_TYPE_EOF) | |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
77 return AVERROR(EIO); |
937 | 78 voc->remaining_size = get_le24(pb); |
79 max_size -= 4; | |
80 | |
81 switch (type) { | |
82 case VOC_TYPE_VOICE_DATA: | |
83 dec->sample_rate = 1000000 / (256 - get_byte(pb)); | |
84 if (sample_rate) | |
85 dec->sample_rate = sample_rate; | |
86 dec->channels = channels; | |
3764 | 87 dec->codec_id = codec_get_id(ff_voc_codec_tags, get_byte(pb)); |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3766
diff
changeset
|
88 dec->bits_per_coded_sample = av_get_bits_per_sample(dec->codec_id); |
937 | 89 voc->remaining_size -= 2; |
90 max_size -= 2; | |
91 channels = 1; | |
92 break; | |
93 | |
94 case VOC_TYPE_VOICE_DATA_CONT: | |
95 break; | |
96 | |
97 case VOC_TYPE_EXTENDED: | |
98 sample_rate = get_le16(pb); | |
99 get_byte(pb); | |
100 channels = get_byte(pb) + 1; | |
101 sample_rate = 256000000 / (channels * (65536 - sample_rate)); | |
102 voc->remaining_size = 0; | |
103 max_size -= 4; | |
104 break; | |
105 | |
106 case VOC_TYPE_NEW_VOICE_DATA: | |
107 dec->sample_rate = get_le32(pb); | |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3766
diff
changeset
|
108 dec->bits_per_coded_sample = get_byte(pb); |
937 | 109 dec->channels = get_byte(pb); |
3764 | 110 dec->codec_id = codec_get_id(ff_voc_codec_tags, get_le16(pb)); |
937 | 111 url_fskip(pb, 4); |
112 voc->remaining_size -= 12; | |
113 max_size -= 12; | |
114 break; | |
115 | |
116 default: | |
117 url_fskip(pb, voc->remaining_size); | |
118 max_size -= voc->remaining_size; | |
119 voc->remaining_size = 0; | |
120 break; | |
121 } | |
122 } | |
123 | |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3766
diff
changeset
|
124 dec->bit_rate = dec->sample_rate * dec->bits_per_coded_sample; |
937 | 125 |
126 if (max_size <= 0) | |
1884 | 127 max_size = 2048; |
937 | 128 size = FFMIN(voc->remaining_size, max_size); |
129 voc->remaining_size -= size; | |
130 return av_get_packet(pb, pkt, size); | |
131 } | |
132 | |
133 static int voc_read_packet(AVFormatContext *s, AVPacket *pkt) | |
134 { | |
135 return voc_get_packet(s, pkt, s->streams[0], 0); | |
136 } | |
137 | |
1169 | 138 AVInputFormat voc_demuxer = { |
937 | 139 "voc", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
2771
diff
changeset
|
140 NULL_IF_CONFIG_SMALL("Creative Voice file format"), |
4081 | 141 sizeof(VocDecContext), |
937 | 142 voc_probe, |
143 voc_read_header, | |
144 voc_read_packet, | |
3766
f062deeedb8d
Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents:
3764
diff
changeset
|
145 .codec_tag=(const AVCodecTag* const []){ff_voc_codec_tags, 0}, |
937 | 146 }; |