[FFmpeg-cvslog] audioconvert: add av_get_channel_description().

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Mon Jul 30 00:33:38 2012 +0200| [33449b1776169f18c96f485e37ab6ae42769621b] | committer: Nicolas George

audioconvert: add av_get_channel_description().

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33449b1776169f18c96f485e37ab6ae42769621b
---

 libavutil/audioconvert.c |   11 +++++++++++
 libavutil/audioconvert.h |    8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index 8e65d59..224db86 100644
--- a/libavutil/audioconvert.c
+++ b/libavutil/audioconvert.c
@@ -219,6 +219,17 @@ const char *av_get_channel_name(uint64_t channel)
     return NULL;
 }
 
+const char *av_get_channel_description(uint64_t channel)
+{
+    int i;
+    if (av_get_channel_layout_nb_channels(channel) != 1)
+        return NULL;
+    for (i = 0; i < FF_ARRAY_ELEMS(channel_names); i++)
+        if ((1ULL<<i) & channel)
+            return channel_names[i].description;
+    return NULL;
+}
+
 uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index)
 {
     int i;
diff --git a/libavutil/audioconvert.h b/libavutil/audioconvert.h
index 25e9cf0..f1399b9 100644
--- a/libavutil/audioconvert.h
+++ b/libavutil/audioconvert.h
@@ -181,6 +181,14 @@ uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
 const char *av_get_channel_name(uint64_t channel);
 
 /**
+ * Get the description of a given channel.
+ *
+ * @param channel  a channel layout with a single channel
+ * @return  channel description on success, NULL on error
+ */
+const char *av_get_channel_description(uint64_t channel);
+
+/**
  * @}
  */