util: added getAvailableFormats/Codecs functions

Clement Champetier · Clement Champetier · commit f78e266a1179 · 2016-03-10T12:15:25.000+01:00
* Call them in other functions.
* Hide them from SWIG (unknown type).
diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
@@ -1,8 +1,6 @@
 #include "util.hpp"
 
 extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
 #include <libavutil/pixdesc.h>
 }
 
@@ -111,16 +109,28 @@ std::string getSampleFormatName(const AVSampleFormat sampleFormat)
     return formatName ? std::string(formatName) : "";
 }
 
-NamesMap getAvailableFormatsNames()
+std::vector<AVOutputFormat*> getAvailableFormats()
 {
-    NamesMap formatsNames;
+    std::vector<AVOutputFormat*> formats;
 
     AVOutputFormat* fmt = NULL;
     while((fmt = av_oformat_next(fmt)))
     {
         if(!fmt->name)
             continue;
 
+        formats.push_back(fmt);
+    }
+    return formats;
+}
+
+NamesMap getAvailableFormatsNames()
+{
+    NamesMap formatsNames;
+    std::vector<AVOutputFormat*> formats = getAvailableFormats();
+    for(size_t i = 0; i < formats.size(); ++i)
+    {
+        AVOutputFormat* fmt = formats.at(i);
         formatsNames.insert(std::make_pair(std::string(fmt->name), std::string(fmt->long_name ? fmt->long_name : "")));
     }
     return formatsNames;
@@ -129,16 +139,13 @@ NamesMap getAvailableFormatsNames()
 NamesMap getAvailableVideoFormatsNames()
 {
     NamesMap formatsNames;
-
-    AVOutputFormat* fmt = NULL;
-    while((fmt = av_oformat_next(fmt)))
+    std::vector<AVOutputFormat*> formats = getAvailableFormats();
+    for(size_t i = 0; i < formats.size(); ++i)
     {
-        if(!fmt->name)
-            continue;
-
+        AVOutputFormat* fmt = formats.at(i);
+        // skip format which cannot handle video
         if(fmt->video_codec == AV_CODEC_ID_NONE)
             continue;
-
         formatsNames.insert(std::make_pair(std::string(fmt->name), std::string(fmt->long_name ? fmt->long_name : "")));
     }
     return formatsNames;
@@ -147,33 +154,42 @@ NamesMap getAvailableVideoFormatsNames()
 NamesMap getAvailableAudioFormatsNames()
 {
     NamesMap formatsNames;
-
-    AVOutputFormat* fmt = NULL;
-    while((fmt = av_oformat_next(fmt)))
+    std::vector<AVOutputFormat*> formats = getAvailableFormats();
+    for(size_t i = 0; i < formats.size(); ++i)
     {
-        if(!fmt->name)
-            continue;
-
+        AVOutputFormat* fmt = formats.at(i);
+        // skip format which cannot handle audio
         if(fmt->audio_codec == AV_CODEC_ID_NONE)
             continue;
-
         formatsNames.insert(std::make_pair(std::string(fmt->name), std::string(fmt->long_name ? fmt->long_name : "")));
     }
     return formatsNames;
 }
 
-NamesMap getAvailableVideoCodecsNames()
+std::vector<AVCodec*> getAvailableCodecs()
 {
-    NamesMap videoCodecsNames;
+    std::vector<AVCodec*> codecs;
 
     AVCodec* c = NULL;
-    while((c = av_codec_next(c)) != NULL)
+    while((c = av_codec_next(c)))
+    {
+        if(!c->name)
+            continue;
+
+        codecs.push_back(c);
+    }
+    return codecs;
+}
+
+NamesMap getAvailableVideoCodecsNames()
+{
+    NamesMap videoCodecsNames;
+    std::vector<AVCodec*> codecs = getAvailableCodecs();
+    for(size_t i = 0; i < codecs.size(); ++i)
     {
+        AVCodec* c = codecs.at(i);
         if(c->type == AVMEDIA_TYPE_VIDEO)
         {
-            if(!c->name)
-                continue;
-
             videoCodecsNames.insert(std::make_pair(std::string(c->name), std::string(c->long_name ? c->long_name : "")));
         }
     }
@@ -183,15 +199,12 @@ NamesMap getAvailableVideoCodecsNames()
 NamesMap getAvailableAudioCodecsNames()
 {
     NamesMap audioCodecsNames;
-
-    AVCodec* c = NULL;
-    while((c = av_codec_next(c)) != NULL)
+    std::vector<AVCodec*> codecs = getAvailableCodecs();
+    for(size_t i = 0; i < codecs.size(); ++i)
     {
+        AVCodec* c = codecs.at(i);
         if(c->type == AVMEDIA_TYPE_AUDIO)
         {
-            if(!c->name)
-                continue;
-
             audioCodecsNames.insert(std::make_pair(std::string(c->name), std::string(c->long_name ? c->long_name : "")));
         }
     }
diff --git a/src/AvTranscoder/util.hpp b/src/AvTranscoder/util.hpp
@@ -5,6 +5,8 @@
 #include "Option.hpp"
 
 extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 #include <libavutil/pixfmt.h>
 #include <libavutil/samplefmt.h>
 }
@@ -57,6 +59,12 @@ std::string AvExport getPixelFormatName(const AVPixelFormat pixelFormat);
  */
 std::string AvExport getSampleFormatName(const AVSampleFormat sampleFormat);
 
+#ifndef SWIG
+/**
+ * @return The list of all formats available by FFmpeg / libav.
+ */
+std::vector<AVOutputFormat*> getAvailableFormats();
+#endif
 /**
  * @brief Get a map of short/long names of all formats available by FFmpeg / libav.
  * @note Need to call preloadCodecsAndFormats before using this function.
@@ -75,6 +83,13 @@ NamesMap AvExport getAvailableVideoFormatsNames();
  */
 NamesMap AvExport getAvailableAudioFormatsNames();
 
+#ifndef SWIG
+/**
+ * @return The list of all codecs available by FFmpeg / libav.
+ */
+std::vector<AVCodec*> getAvailableCodecs();
+#endif
+
 /**
  * @brief Get a map of short/long names of all video codecs available by FFmpeg / libav.
  * @note Need to call preloadCodecsAndFormats before using this function.
