diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2013-12-19 12:53:19 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2013-12-20 10:18:35 +0100 |
| commit | 4b3744b74a04304f3af20daef66c23e7ffca2f19 (patch) | |
| tree | 531d429766fefd01ae24c8641caf3735c2bdb626 | |
| parent | 7e7c280e118924fb4d457d4feff5308686bf4bd0 (diff) | |
Use GstAudioInfo to store the audio format information
6 files changed, 7 insertions, 5 deletions
diff --git a/src/modules/emotion/gstreamer1/emotion_alloc.c b/src/modules/emotion/gstreamer1/emotion_alloc.c index a49a42662..a2cba3b33 100644 --- a/src/modules/emotion/gstreamer1/emotion_alloc.c +++ b/src/modules/emotion/gstreamer1/emotion_alloc.c @@ -10,6 +10,7 @@ #include <gst/gst.h> #include <gst/video/gstvideosink.h> #include <gst/video/video.h> +#include <gst/audio/audio.h> #ifdef HAVE_ECORE_X # include <Ecore_X.h> diff --git a/src/modules/emotion/gstreamer1/emotion_convert.c b/src/modules/emotion/gstreamer1/emotion_convert.c index 2a2a327e8..2c703b702 100644 --- a/src/modules/emotion/gstreamer1/emotion_convert.c +++ b/src/modules/emotion/gstreamer1/emotion_convert.c @@ -7,6 +7,7 @@ #include <glib.h> #include <gst/gst.h> +#include <gst/audio/audio.h> #include <gst/video/video.h> #include <gst/video/gstvideosink.h> diff --git a/src/modules/emotion/gstreamer1/emotion_fakeeos.c b/src/modules/emotion/gstreamer1/emotion_fakeeos.c index 25cdb8d40..48eba67e6 100644 --- a/src/modules/emotion/gstreamer1/emotion_fakeeos.c +++ b/src/modules/emotion/gstreamer1/emotion_fakeeos.c @@ -7,6 +7,7 @@ #include <glib.h> #include <gst/gst.h> +#include <gst/audio/audio.h> #include <gst/video/video.h> #include <gst/video/gstvideosink.h> diff --git a/src/modules/emotion/gstreamer1/emotion_gstreamer.c b/src/modules/emotion/gstreamer1/emotion_gstreamer.c index 3d60a8942..475c821f4 100644 --- a/src/modules/emotion/gstreamer1/emotion_gstreamer.c +++ b/src/modules/emotion/gstreamer1/emotion_gstreamer.c @@ -1881,8 +1881,7 @@ _emotion_gstreamer_video_pipeline_parse(Emotion_Gstreamer_Video *ev, ev->audio_streams = eina_list_append(ev->audio_streams, astream); astream->length_time = length_time; - astream->channels = info.channels; - astream->samplerate = info.rate; + astream->info = info; unref_query_a: gst_query_unref(query); @@ -1962,7 +1961,7 @@ _emotion_gstreamer_video_pipeline_parse(Emotion_Gstreamer_Video *ev, if (astream) { DBG("audio channels=%d, rate=%d, length=%"GST_TIME_FORMAT, - astream->channels, astream->samplerate, + astream->info.channels, astream->info.rate, GST_TIME_ARGS((guint64)(astream->length_time * GST_SECOND))); } } diff --git a/src/modules/emotion/gstreamer1/emotion_gstreamer.h b/src/modules/emotion/gstreamer1/emotion_gstreamer.h index 927160f2b..8d83b9e8f 100644 --- a/src/modules/emotion/gstreamer1/emotion_gstreamer.h +++ b/src/modules/emotion/gstreamer1/emotion_gstreamer.h @@ -29,8 +29,7 @@ struct _Emotion_Video_Stream struct _Emotion_Audio_Stream { gdouble length_time; - gint channels; - gint samplerate; + GstAudioInfo info; }; struct _Emotion_Gstreamer_Metadata diff --git a/src/modules/emotion/gstreamer1/emotion_sink.c b/src/modules/emotion/gstreamer1/emotion_sink.c index 387ae9882..69a2776ff 100644 --- a/src/modules/emotion/gstreamer1/emotion_sink.c +++ b/src/modules/emotion/gstreamer1/emotion_sink.c @@ -13,6 +13,7 @@ #include <glib-object.h> #include <gst/video/gstvideosink.h> #include <gst/video/video.h> +#include <gst/audio/audio.h> // forcibly disable x overlay window.. broken badly. #undef HAVE_ECORE_X |