Mercurial > libavformat.hg

comparison vocenc.c @ 1694:bbb1abaa43cb libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove now useless codec_tag setting code in voc muxer
author aurel
date Sun, 21 Jan 2007 22:41:37 +0000
parents ba58d49d4685
children 06083249909c
comparison
equal deleted inserted replaced
1693:1597a7219cff 1694:bbb1abaa43cb
49 voc_enc_context_t *voc = s->priv_data; 49 voc_enc_context_t *voc = s->priv_data;
50 AVCodecContext *enc = s->streams[0]->codec; 50 AVCodecContext *enc = s->streams[0]->codec;
51 ByteIOContext *pb = &s->pb; 51 ByteIOContext *pb = &s->pb;
52 52
53 if (!voc->param_written) { 53 if (!voc->param_written) {
54 int format = codec_get_tag(voc_codec_tags, enc->codec_id); 54 if (enc->codec_tag > 0xFF) {
55
56 if (format > 0xFF) {
57 put_byte(pb, VOC_TYPE_NEW_VOICE_DATA); 55 put_byte(pb, VOC_TYPE_NEW_VOICE_DATA);
58 put_le24(pb, pkt->size + 12); 56 put_le24(pb, pkt->size + 12);
59 put_le32(pb, enc->sample_rate); 57 put_le32(pb, enc->sample_rate);
60 put_byte(pb, enc->bits_per_sample); 58 put_byte(pb, enc->bits_per_sample);
61 put_byte(pb, enc->channels); 59 put_byte(pb, enc->channels);
62 put_le16(pb, format); 60 put_le16(pb, enc->codec_tag);
63 put_le32(pb, 0); 61 put_le32(pb, 0);
64 } else { 62 } else {
65 if (s->streams[0]->codec->channels > 1) { 63 if (s->streams[0]->codec->channels > 1) {
66 put_byte(pb, VOC_TYPE_EXTENDED); 64 put_byte(pb, VOC_TYPE_EXTENDED);
67 put_le24(pb, 4); 65 put_le24(pb, 4);
68 put_le16(pb, 65536-256000000/(enc->sample_rate*enc->channels)); 66 put_le16(pb, 65536-256000000/(enc->sample_rate*enc->channels));
69 put_byte(pb, format); 67 put_byte(pb, enc->codec_tag);
70 put_byte(pb, enc->channels - 1); 68 put_byte(pb, enc->channels - 1);
71 } 69 }
72 put_byte(pb, VOC_TYPE_VOICE_DATA); 70 put_byte(pb, VOC_TYPE_VOICE_DATA);
73 put_le24(pb, pkt->size + 2); 71 put_le24(pb, pkt->size + 2);
74 put_byte(pb, 256 - 1000000 / enc->sample_rate); 72 put_byte(pb, 256 - 1000000 / enc->sample_rate);
75 put_byte(pb, format); 73 put_byte(pb, enc->codec_tag);
76 } 74 }
77 voc->param_written = 1; 75 voc->param_written = 1;
78 } else { 76 } else {
79 put_byte(pb, VOC_TYPE_VOICE_DATA_CONT); 77 put_byte(pb, VOC_TYPE_VOICE_DATA_CONT);
80 put_le24(pb, pkt->size); 78 put_le24(pb, pkt->size);