Mercurial > libavformat.hg
annotate vocenc.c @ 6234:0287312dda71 libavformat
rtpdec_asf: Propagate errors from the chained av_open_input_stream
This fixes the crash in issue 2070.
author | mstorsjo |
---|---|
date | Mon, 05 Jul 2010 16:46:00 +0000 |
parents | c7b98381ec2d |
children |
rev | line source |
---|---|
937 | 1 /* |
1535 | 2 * Creative Voice File muxer. |
937 | 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 | |
22 #include "voc.h" | |
6033 | 23 #include "internal.h" |
937 | 24 |
25 | |
26 typedef struct voc_enc_context { | |
27 int param_written; | |
4081 | 28 } VocEncContext; |
937 | 29 |
30 static int voc_write_header(AVFormatContext *s) | |
31 { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2382
diff
changeset
|
32 ByteIOContext *pb = s->pb; |
937 | 33 const int header_size = 26; |
34 const int version = 0x0114; | |
35 | |
36 if (s->nb_streams != 1 | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
4081
diff
changeset
|
37 || s->streams[0]->codec->codec_type != AVMEDIA_TYPE_AUDIO) |
2382
863ea27be885
Use AVERROR_PATCHWELCOME instead of AVERROR(ENOTSUP)
ramiro
parents:
2277
diff
changeset
|
38 return AVERROR_PATCHWELCOME; |
937 | 39 |
3764 | 40 put_buffer(pb, ff_voc_magic, sizeof(ff_voc_magic) - 1); |
937 | 41 put_le16(pb, header_size); |
42 put_le16(pb, version); | |
43 put_le16(pb, ~version + 0x1234); | |
44 | |
45 return 0; | |
46 } | |
47 | |
48 static int voc_write_packet(AVFormatContext *s, AVPacket *pkt) | |
49 { | |
4081 | 50 VocEncContext *voc = s->priv_data; |
937 | 51 AVCodecContext *enc = s->streams[0]->codec; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2382
diff
changeset
|
52 ByteIOContext *pb = s->pb; |
937 | 53 |
54 if (!voc->param_written) { | |
1694
bbb1abaa43cb
remove now useless codec_tag setting code in voc muxer
aurel
parents:
1679
diff
changeset
|
55 if (enc->codec_tag > 0xFF) { |
937 | 56 put_byte(pb, VOC_TYPE_NEW_VOICE_DATA); |
57 put_le24(pb, pkt->size + 12); | |
58 put_le32(pb, enc->sample_rate); | |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3766
diff
changeset
|
59 put_byte(pb, enc->bits_per_coded_sample); |
937 | 60 put_byte(pb, enc->channels); |
1694
bbb1abaa43cb
remove now useless codec_tag setting code in voc muxer
aurel
parents:
1679
diff
changeset
|
61 put_le16(pb, enc->codec_tag); |
937 | 62 put_le32(pb, 0); |
63 } else { | |
64 if (s->streams[0]->codec->channels > 1) { | |
65 put_byte(pb, VOC_TYPE_EXTENDED); | |
66 put_le24(pb, 4); | |
67 put_le16(pb, 65536-256000000/(enc->sample_rate*enc->channels)); | |
1694
bbb1abaa43cb
remove now useless codec_tag setting code in voc muxer
aurel
parents:
1679
diff
changeset
|
68 put_byte(pb, enc->codec_tag); |
937 | 69 put_byte(pb, enc->channels - 1); |
70 } | |
71 put_byte(pb, VOC_TYPE_VOICE_DATA); | |
72 put_le24(pb, pkt->size + 2); | |
73 put_byte(pb, 256 - 1000000 / enc->sample_rate); | |
1694
bbb1abaa43cb
remove now useless codec_tag setting code in voc muxer
aurel
parents:
1679
diff
changeset
|
74 put_byte(pb, enc->codec_tag); |
937 | 75 } |
76 voc->param_written = 1; | |
77 } else { | |
78 put_byte(pb, VOC_TYPE_VOICE_DATA_CONT); | |
79 put_le24(pb, pkt->size); | |
80 } | |
81 | |
82 put_buffer(pb, pkt->data, pkt->size); | |
83 return 0; | |
84 } | |
85 | |
86 static int voc_write_trailer(AVFormatContext *s) | |
87 { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2382
diff
changeset
|
88 put_byte(s->pb, 0); |
937 | 89 return 0; |
90 } | |
91 | |
1169 | 92 AVOutputFormat voc_muxer = { |
937 | 93 "voc", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
2771
diff
changeset
|
94 NULL_IF_CONFIG_SMALL("Creative Voice file format"), |
937 | 95 "audio/x-voc", |
96 "voc", | |
4081 | 97 sizeof(VocEncContext), |
937 | 98 CODEC_ID_PCM_U8, |
99 CODEC_ID_NONE, | |
100 voc_write_header, | |
101 voc_write_packet, | |
102 voc_write_trailer, | |
3766
f062deeedb8d
Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents:
3764
diff
changeset
|
103 .codec_tag=(const AVCodecTag* const []){ff_voc_codec_tags, 0}, |
937 | 104 }; |