w32thread: call ResetEvent() in pthread_cond_broadcast().

[ffmpeg] / libavfilter / formats.c

diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 3a44cfd5301281e95adb1f27e1832298c2f92b1f..8c5041a8fe6c0dc78a13af4d96aa6646d6867f66 100644 (file)
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -1,25 +1,27 @@
 /*
  * Filter layer - format negotiation
- * copyright (c) 2007 Bobby Bingham
+ * Copyright (c) 2007 Bobby Bingham
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/pixdesc.h"
 #include "avfilter.h"
+#include "internal.h"
 
 /**
  * Add all refs from a to ret and destroy a.
@@ -41,19 +43,21 @@ static void merge_ref(AVFilterFormats *ret, AVFilterFormats *a)
 AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
 {
     AVFilterFormats *ret;
-    unsigned i, j, k = 0;
+    unsigned i, j, k = 0, m_count;
 
     ret = av_mallocz(sizeof(AVFilterFormats));
 
     /* merge list of formats */
-    ret->formats = av_malloc(sizeof(*ret->formats) * FFMIN(a->format_count,
-                                                           b->format_count));
-    for(i = 0; i < a->format_count; i ++)
-        for(j = 0; j < b->format_count; j ++)
-            if(a->formats[i] == b->formats[j])
-                ret->formats[k++] = a->formats[i];
-
-    ret->format_count = k;
+    m_count = FFMIN(a->format_count, b->format_count);
+    if (m_count) {
+        ret->formats = av_malloc(sizeof(*ret->formats) * m_count);
+        for(i = 0; i < a->format_count; i ++)
+            for(j = 0; j < b->format_count; j ++)
+                if(a->formats[i] == b->formats[j])
+                    ret->formats[k++] = a->formats[i];
+
+        ret->format_count = k;
+    }
     /* check that there was at least one common format */
     if(!ret->format_count) {
         av_free(ret->formats);
@@ -69,51 +73,62 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
     return ret;
 }
 
-AVFilterFormats *avfilter_make_format_list(int len, ...)
+int ff_fmt_is_in(int fmt, const int *fmts)
 {
-    AVFilterFormats *ret;
-    int i;
-    va_list vl;
-
-    ret = av_mallocz(sizeof(AVFilterFormats));
-    ret->formats = av_malloc(sizeof(*ret->formats) * len);
-    ret->format_count = len;
+    const int *p;
 
-    va_start(vl, len);
-    for(i = 0; i < len; i ++)
-        ret->formats[i] = va_arg(vl, int);
-    va_end(vl);
-
-    return ret;
+    for (p = fmts; *p != PIX_FMT_NONE; p++) {
+        if (fmt == *p)
+            return 1;
+    }
+    return 0;
 }
 
-AVFilterFormats *avfilter_make_format_list2(enum PixelFormat *pix_fmt)
+AVFilterFormats *avfilter_make_format_list(const int *fmts)
 {
     AVFilterFormats *formats;
     int count;
 
-    for (count = 0; pix_fmt[count] != PIX_FMT_NONE; count++)
+    for (count = 0; fmts[count] != -1; count++)
         ;
 
     formats               = av_mallocz(sizeof(AVFilterFormats));
-    formats->formats      = av_malloc(sizeof(*formats->formats) * count);
+    if (count)
+        formats->formats  = av_malloc(sizeof(*formats->formats) * count);
     formats->format_count = count;
-    memcpy(formats->formats, pix_fmt, sizeof(*formats->formats) * count);
+    memcpy(formats->formats, fmts, sizeof(*formats->formats) * count);
 
     return formats;
 }
 
-AVFilterFormats *avfilter_all_colorspaces(void)
+int avfilter_add_format(AVFilterFormats **avff, int fmt)
 {
-    AVFilterFormats *ret;
-    int i;
+    int *fmts;
 
-    ret = av_mallocz(sizeof(AVFilterFormats));
-    ret->formats = av_malloc(sizeof(*ret->formats) * PIX_FMT_NB);
-    ret->format_count = PIX_FMT_NB;
+    if (!(*avff) && !(*avff = av_mallocz(sizeof(AVFilterFormats))))
+        return AVERROR(ENOMEM);
 
-    for(i = 0; i < PIX_FMT_NB; i ++)
-        ret->formats[i] = i;
+    fmts = av_realloc((*avff)->formats,
+                      sizeof(*(*avff)->formats) * ((*avff)->format_count+1));
+    if (!fmts)
+        return AVERROR(ENOMEM);
+
+    (*avff)->formats = fmts;
+    (*avff)->formats[(*avff)->format_count++] = fmt;
+    return 0;
+}
+
+AVFilterFormats *avfilter_all_formats(enum AVMediaType type)
+{
+    AVFilterFormats *ret = NULL;
+    int fmt;
+    int num_formats = type == AVMEDIA_TYPE_VIDEO ? PIX_FMT_NB    :
+                      type == AVMEDIA_TYPE_AUDIO ? AV_SAMPLE_FMT_NB : 0;
+
+    for (fmt = 0; fmt < num_formats; fmt++)
+        if ((type != AVMEDIA_TYPE_VIDEO) ||
+            (type == AVMEDIA_TYPE_VIDEO && !(av_pix_fmt_descriptors[fmt].flags & PIX_FMT_HWACCEL)))
+            avfilter_add_format(&ret, fmt);
 
     return ret;
 }
@@ -136,7 +151,12 @@ static int find_ref_index(AVFilterFormats **ref)
 
 void avfilter_formats_unref(AVFilterFormats **ref)
 {
-    int idx = find_ref_index(ref);
+    int idx;
+
+    if (!*ref)
+        return;
+
+    idx = find_ref_index(ref);
 
     if(idx >= 0)
         memmove((*ref)->refs + idx, (*ref)->refs + idx+1,