*
* 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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "voc.h"
static int voc_write_header(AVFormatContext *s)
{
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
const int header_size = 26;
const int version = 0x0114;
if (s->nb_streams != 1
|| s->streams[0]->codec->codec_type != CODEC_TYPE_AUDIO)
- return AVERROR_NOTSUPP;
+ return AVERROR_PATCHWELCOME;
- put_buffer(pb, voc_magic, sizeof(voc_magic) - 1);
+ put_buffer(pb, ff_voc_magic, sizeof(ff_voc_magic) - 1);
put_le16(pb, header_size);
put_le16(pb, version);
put_le16(pb, ~version + 0x1234);
{
voc_enc_context_t *voc = s->priv_data;
AVCodecContext *enc = s->streams[0]->codec;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
if (!voc->param_written) {
- int format = codec_get_tag(voc_codec_tags, enc->codec_id);
-
- if (format > 0xFF) {
+ if (enc->codec_tag > 0xFF) {
put_byte(pb, VOC_TYPE_NEW_VOICE_DATA);
put_le24(pb, pkt->size + 12);
put_le32(pb, enc->sample_rate);
- put_byte(pb, enc->bits_per_sample);
+ put_byte(pb, enc->bits_per_coded_sample);
put_byte(pb, enc->channels);
- put_le16(pb, format);
+ put_le16(pb, enc->codec_tag);
put_le32(pb, 0);
} else {
if (s->streams[0]->codec->channels > 1) {
put_byte(pb, VOC_TYPE_EXTENDED);
put_le24(pb, 4);
put_le16(pb, 65536-256000000/(enc->sample_rate*enc->channels));
- put_byte(pb, format);
+ put_byte(pb, enc->codec_tag);
put_byte(pb, enc->channels - 1);
}
put_byte(pb, VOC_TYPE_VOICE_DATA);
put_le24(pb, pkt->size + 2);
put_byte(pb, 256 - 1000000 / enc->sample_rate);
- put_byte(pb, format);
+ put_byte(pb, enc->codec_tag);
}
voc->param_written = 1;
} else {
static int voc_write_trailer(AVFormatContext *s)
{
- put_byte(&s->pb, 0);
+ put_byte(s->pb, 0);
return 0;
}
AVOutputFormat voc_muxer = {
"voc",
- "Creative Voice File format",
+ NULL_IF_CONFIG_SMALL("Creative Voice file format"),
"audio/x-voc",
"voc",
sizeof(voc_enc_context_t),
voc_write_header,
voc_write_packet,
voc_write_trailer,
+ .codec_tag=(const AVCodecTag* const []){ff_voc_codec_tags, 0},
};