lavd/lavfi: support all sample formats.
authorNicolas George <nicolas.george@normalesup.org>
Thu, 16 Feb 2012 14:00:18 +0000 (15:00 +0100)
committerNicolas George <nicolas.george@normalesup.org>
Wed, 22 Feb 2012 10:37:32 +0000 (11:37 +0100)
libavdevice/lavfi.c

index 30c08e0..0a6eb91 100644 (file)
@@ -206,7 +206,11 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
             if (ret < 0)
                 goto end;
         } else if (type == AVMEDIA_TYPE_AUDIO) {
-            enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, -1 };
+            enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_U8,
+                                                  AV_SAMPLE_FMT_S16,
+                                                  AV_SAMPLE_FMT_S32,
+                                                  AV_SAMPLE_FMT_FLT,
+                                                  AV_SAMPLE_FMT_DBL, -1 };
             const int packing_fmts[] = { AVFILTER_PACKED, -1 };
             const int64_t *chlayouts = avfilter_all_channel_layouts;
             AVABufferSinkParams *abuffersink_params = av_abuffersink_params_alloc();
@@ -253,12 +257,16 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
             st       ->sample_aspect_ratio =
             st->codec->sample_aspect_ratio = link->sample_aspect_ratio;
         } else if (link->type == AVMEDIA_TYPE_AUDIO) {
-            st->codec->codec_id    = CODEC_ID_PCM_S16LE;
+            st->codec->codec_id    = av_get_pcm_codec(link->format, -1);
             st->codec->channels    = av_get_channel_layout_nb_channels(link->channel_layout);
             st->codec->sample_fmt  = link->format;
             st->codec->sample_rate = link->sample_rate;
             st->codec->time_base   = link->time_base;
             st->codec->channel_layout = link->channel_layout;
+            if (st->codec->codec_id == CODEC_ID_NONE)
+                av_log(avctx, AV_LOG_ERROR,
+                       "Could not find PCM codec for sample format %s.\n",
+                       av_get_sample_fmt_name(link->format));
         }
     }