util: added getAvailableVideo/AudioFormatsNames functions

Clement Champetier · Clement Champetier · commit 0f56476bd3be · 2016-03-10T11:54:22.000+01:00
diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
@@ -121,8 +121,43 @@ NamesMap getAvailableFormatsNames()
         if(!fmt->name)
             continue;
 
-        formatsNames.insert(
-            std::make_pair(std::string(fmt->name), std::string(fmt->long_name ? fmt->long_name : "")));
+        formatsNames.insert(std::make_pair(std::string(fmt->name), std::string(fmt->long_name ? fmt->long_name : "")));
+    }
+    return formatsNames;
+}
+
+NamesMap getAvailableVideoFormatsNames()
+{
+    NamesMap formatsNames;
+
+    AVOutputFormat* fmt = NULL;
+    while((fmt = av_oformat_next(fmt)))
+    {
+        if(!fmt->name)
+            continue;
+
+        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;
+}
+
+NamesMap getAvailableAudioFormatsNames()
+{
+    NamesMap formatsNames;
+
+    AVOutputFormat* fmt = NULL;
+    while((fmt = av_oformat_next(fmt)))
+    {
+        if(!fmt->name)
+            continue;
+
+        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;
 }
@@ -139,8 +174,7 @@ NamesMap getAvailableVideoCodecsNames()
             if(!c->name)
                 continue;
 
-            videoCodecsNames.insert(
-                std::make_pair(std::string(c->name), std::string(c->long_name ? c->long_name : "")));
+            videoCodecsNames.insert(std::make_pair(std::string(c->name), std::string(c->long_name ? c->long_name : "")));
         }
     }
     return videoCodecsNames;
@@ -158,8 +192,7 @@ NamesMap getAvailableAudioCodecsNames()
             if(!c->name)
                 continue;
 
-            audioCodecsNames.insert(
-                std::make_pair(std::string(c->name), std::string(c->long_name ? c->long_name : "")));
+            audioCodecsNames.insert(std::make_pair(std::string(c->name), std::string(c->long_name ? c->long_name : "")));
         }
     }
     return audioCodecsNames;
diff --git a/src/AvTranscoder/util.hpp b/src/AvTranscoder/util.hpp
@@ -58,19 +58,31 @@ std::string AvExport getPixelFormatName(const AVPixelFormat pixelFormat);
 std::string AvExport getSampleFormatName(const AVSampleFormat sampleFormat);
 
 /**
- * @brief Get a map of short/long names of all format available by FFmpeg / libav.
+ * @brief Get a map of short/long names of all formats available by FFmpeg / libav.
  * @note Need to call preloadCodecsAndFormats before using this function.
  */
 NamesMap AvExport getAvailableFormatsNames();
 
 /**
- * @brief Get a map of short/long names of all video codec available by FFmpeg / libav.
+ * @brief Get a map of short/long names of all formats dedicate for video available by FFmpeg / libav.
+ * @note Need to call preloadCodecsAndFormats before using this function.
+ */
+NamesMap AvExport getAvailableVideoFormatsNames();
+
+/**
+ * @brief Get a map of short/long names of all formats dedicate for video available by FFmpeg / libav.
+ * @note Need to call preloadCodecsAndFormats before using this function.
+ */
+NamesMap AvExport getAvailableAudioFormatsNames();
+
+/**
+ * @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.
  */
 NamesMap AvExport getAvailableVideoCodecsNames();
 
 /**
- * @brief Get a map of short/long names of all audio codec available by FFmpeg / libav.
+ * @brief Get a map of short/long names of all audio codecs available by FFmpeg / libav.
  * @note Need to call preloadCodecsAndFormats before using this function.
  */
 NamesMap AvExport getAvailableAudioCodecsNames();
