Use AVERROR_PATCHWELCOME instead of AVERROR(ENOTSUP)
[libav.git] / libavformat / vocenc.c
index 64e8ccf..ae1ef90 100644 (file)
  *
  * 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 "avformat.h"
-#include "riff.h"    /* for CodecTag */
 #include "voc.h"
 
 
-static const unsigned char voc_magic[] = "Creative Voice File\x1A";
-
-static const CodecTag voc_codec_tags[] = {
-    {CODEC_ID_PCM_U8,        0x00},
-    {CODEC_ID_ADPCM_SBPRO_4, 0x01},
-    {CODEC_ID_ADPCM_SBPRO_3, 0x02},
-    {CODEC_ID_ADPCM_SBPRO_2, 0x03},
-    {CODEC_ID_PCM_S16LE,     0x04},
-    {CODEC_ID_PCM_ALAW,      0x06},
-    {CODEC_ID_PCM_MULAW,     0x07},
-    {CODEC_ID_ADPCM_CT,    0x0200},
-    {0, 0},
-};
-
-
 typedef struct voc_enc_context {
     int param_written;
 } voc_enc_context_t;
@@ -51,7 +34,7 @@ static int voc_write_header(AVFormatContext *s)
 
     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_le16(pb, header_size);
@@ -68,28 +51,26 @@ static int voc_write_packet(AVFormatContext *s, AVPacket *pkt)
     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->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 {
@@ -118,4 +99,5 @@ AVOutputFormat voc_muxer = {
     voc_write_header,
     voc_write_packet,
     voc_write_trailer,
+    .codec_tag=(const AVCodecTag*[]){voc_codec_tags, 0},
 };