Merge remote-tracking branch 'qatar/master'

* qatar/master: rtmp: Add a new option 'rtmp_buffer', for setting the client buffer time rtmp: Set the client buffer time to 3s instead of 0.26s rtmp: Handle server bandwidth packets rtmp: Display a verbose message when an unknown packet type is received lavfi/audio: use av_samples_copy() instead of custom code. configure: add all filters hardcoded into avconv to avconv_deps avfiltergraph: remove a redundant call to avfilter_get_by_name(). lavfi: allow building without swscale. build: Do not delete tests/vsynth2 directory, which is no longer created. lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs lavfi: make AVFilterPad opaque after two major bumps. lavfi: add avfilter_pad_get_type() and avfilter_pad_get_name(). lavfi: make avfilter_get_video_buffer() private on next bump. jack: update to new latency range API as the old one has been deprecated rtmp: Tokenize the AMF connection parameters manually instead of using strtok_r ppc: Rename H.264 optimization template file for consistency. lavfi: add channelsplit audio filter. golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls() sws: fix planar RGB input conversions for 9/10/16 bpp. Conflicts: Changelog configure doc/APIchanges ffmpeg.c libavcodec/golomb.h libavcodec/v210dec.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/formats.c libavfilter/version.h libavfilter/vf_frei0r.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/video.h libavfilter/vsrc_color.c libavformat/rtmpproto.c libswscale/input.c tests/Makefile

Michael Niedermayer committed 14 years ago

Commit c7b9eab2 parents 4a6d790 8517e9c68 files · +757 −220Browse files

Showing the changes to libavfilter/avfiltergraph.c (1 of 68 files). Show all

Unified · Split

libavfilter/avfiltergraph.c+39−35

     for (i = 0; i < graph->filter_count; i++) {
         filt = graph->filters[i];
-        for (j = 0; j < filt->input_count; j++) {
+        for (j = 0; j < filt->nb_inputs; j++) {
             if (!filt->inputs[j] || !filt->inputs[j]->src) {
                 av_log(log_ctx, AV_LOG_ERROR,
                        "Input pad \"%s\" for the filter \"%s\" of type \"%s\" not connected to any source\n",
             }
         }
-        for (j = 0; j < filt->output_count; j++) {
+        for (j = 0; j < filt->nb_outputs; j++) {
             if (!filt->outputs[j] || !filt->outputs[j]->dst) {
                 av_log(log_ctx, AV_LOG_ERROR,
                        "Output pad \"%s\" for the filter \"%s\" of type \"%s\" not connected to any destination\n",
     for (i=0; i < graph->filter_count; i++) {
         filt = graph->filters[i];
-        if (!filt->output_count) {
+        if (!filt->nb_outputs) {
             if ((ret = avfilter_config_links(filt)))
                 return ret;
         }
         /* Call query_formats on sources first.
            This is a temporary workaround for amerge,
            until format renegociation is implemented. */
-        if (!graph->filters[i]->input_count == j)
+        if (!graph->filters[i]->nb_inputs == j)
             continue;
         if (graph->filters[i]->filter->query_formats)
             ret = filter_query_formats(graph->filters[i]);
     for (i = 0; i < graph->filter_count; i++) {
         AVFilterContext *filter = graph->filters[i];
-        for (j = 0; j < filter->input_count; j++) {
+        for (j = 0; j < filter->nb_inputs; j++) {
             AVFilterLink *link = filter->inputs[j];
 #if 0
             if (!link) continue;
                 /* couldn't merge format lists. auto-insert conversion filter */
                 switch (link->type) {
                 case AVMEDIA_TYPE_VIDEO:
+                    if (!(filter = avfilter_get_by_name("scale"))) {
+                        av_log(log_ctx, AV_LOG_ERROR, "'scale' filter "
+                               "not present, cannot convert pixel formats.\n");
+                        return AVERROR(EINVAL);
+                    }
                     snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d",
                              scaler_count++);
                     snprintf(scale_args, sizeof(scale_args), "0:0:%s", graph->scale_sws_opts);
-                    if ((ret = avfilter_graph_create_filter(&convert,
+                    if ((ret = avfilter_graph_create_filter(&convert, filter,
-                                                            avfilter_get_by_name("scale"),
                                                             inst_name, scale_args, NULL,
                                                             graph)) < 0)
                         return ret;
                     snprintf(inst_name, sizeof(inst_name), "auto-inserted resampler %d",
                              resampler_count++);
-                    if ((ret = avfilter_graph_create_filter(&convert,
+                    if ((ret = avfilter_graph_create_filter(&convert, filter,
-                                                            avfilter_get_by_name("aresample"),
                                                             inst_name, NULL, NULL, graph)) < 0)
                         return ret;
                     break;
 #define REDUCE_FORMATS(fmt_type, list_type, list, var, nb, add_format) \
 do {                                                                   \
-    for (i = 0; i < filter->input_count; i++) {                        \
+    for (i = 0; i < filter->nb_inputs; i++) {                          \
         AVFilterLink *link = filter->inputs[i];                        \
         fmt_type fmt;                                                  \
                                                                        \
             continue;                                                  \
         fmt = link->out_ ## list->var[0];                              \
                                                                        \
-        for (j = 0; j < filter->output_count; j++) {                   \
+        for (j = 0; j < filter->nb_outputs; j++) {                     \
             AVFilterLink *out_link = filter->outputs[j];               \
             list_type *fmts;                                           \
                                                                        \
     int sample_rate;
     int i, j;
-    for (i = 0; i < filter->input_count; i++) {
+    for (i = 0; i < filter->nb_inputs; i++) {
         link = filter->inputs[i];
         if (link->type == AVMEDIA_TYPE_AUDIO &&
             link->out_samplerates->format_count == 1)
             break;
     }
-    if (i == filter->input_count)
+    if (i == filter->nb_inputs)
         return;
     sample_rate = link->out_samplerates->formats[0];
-    for (i = 0; i < filter->output_count; i++) {
+    for (i = 0; i < filter->nb_outputs; i++) {
         AVFilterLink *outlink = filter->outputs[i];
         int best_idx, best_diff = INT_MAX;
     uint64_t chlayout;
     int i, j;
-    for (i = 0; i < filter->input_count; i++) {
+    for (i = 0; i < filter->nb_inputs; i++) {
         link = filter->inputs[i];
         if (link->type == AVMEDIA_TYPE_AUDIO &&
             link->out_channel_layouts->nb_channel_layouts == 1)
             break;
     }
-    if (i == filter->input_count)
+    if (i == filter->nb_inputs)
         return;
     chlayout = link->out_channel_layouts->channel_layouts[0];
-    for (i = 0; i < filter->output_count; i++) {
+    for (i = 0; i < filter->nb_outputs; i++) {
         AVFilterLink *outlink = filter->outputs[i];
         int best_idx, best_score = INT_MIN;
     int format, bps;
     int i, j;
-    for (i = 0; i < filter->input_count; i++) {
+    for (i = 0; i < filter->nb_inputs; i++) {
         link = filter->inputs[i];
         if (link->type == AVMEDIA_TYPE_AUDIO &&
             link->out_formats->format_count == 1)
             break;
     }
-    if (i == filter->input_count)
+    if (i == filter->nb_inputs)
         return;
     format = link->out_formats->formats[0];
     bps    = av_get_bytes_per_sample(format);
-    for (i = 0; i < filter->output_count; i++) {
+    for (i = 0; i < filter->nb_outputs; i++) {
         AVFilterLink *outlink = filter->outputs[i];
         int best_idx, best_score = INT_MIN;
         change = 0;
         for (i = 0; i < graph->filter_count; i++) {
             AVFilterContext *filter = graph->filters[i];
-            if (filter->input_count){
+            if (filter->nb_inputs){
-                for (j = 0; j < filter->input_count; j++){
+                for (j = 0; j < filter->nb_inputs; j++){
                     if(filter->inputs[j]->in_formats && filter->inputs[j]->in_formats->format_count == 1) {
                         pick_format(filter->inputs[j], NULL);
                         change = 1;
                     }
                 }
             }
-            if (filter->output_count){
+            if (filter->nb_outputs){
-                for (j = 0; j < filter->output_count; j++){
+                for (j = 0; j < filter->nb_outputs; j++){
                     if(filter->outputs[j]->in_formats && filter->outputs[j]->in_formats->format_count == 1) {
                         pick_format(filter->outputs[j], NULL);
                         change = 1;
                     }
                 }
             }
-            if (filter->input_count && filter->output_count && filter->inputs[0]->format>=0) {
+            if (filter->nb_inputs && filter->nb_outputs && filter->inputs[0]->format>=0) {
-                for (j = 0; j < filter->output_count; j++) {
+                for (j = 0; j < filter->nb_outputs; j++) {
                     if(filter->outputs[j]->format<0) {
                         pick_format(filter->outputs[j], filter->inputs[0]);
                         change = 1;
     for (i = 0; i < graph->filter_count; i++) {
         AVFilterContext *filter = graph->filters[i];
-        for (j = 0; j < filter->input_count; j++)
+        for (j = 0; j < filter->nb_inputs; j++)
             if ((ret = pick_format(filter->inputs[j], NULL)) < 0)
                 return ret;
-        for (j = 0; j < filter->output_count; j++)
+        for (j = 0; j < filter->nb_outputs; j++)
             if ((ret = pick_format(filter->outputs[j], NULL)) < 0)
                 return ret;
     }
     for (i = 0; i < graph->filter_count; i++) {
         f = graph->filters[i];
-        for (j = 0; j < f->input_count; j++) {
+        for (j = 0; j < f->nb_inputs; j++) {
             f->inputs[j]->graph     = graph;
             f->inputs[j]->age_index = -1;
         }
-        for (j = 0; j < f->output_count; j++) {
+        for (j = 0; j < f->nb_outputs; j++) {
             f->outputs[j]->graph    = graph;
             f->outputs[j]->age_index= -1;
         }
-        if (!f->output_count) {
+        if (!f->nb_outputs) {
-            if (f->input_count > INT_MAX - sink_links_count)
+            if (f->nb_inputs > INT_MAX - sink_links_count)
                 return AVERROR(EINVAL);
-            sink_links_count += f->input_count;
+            sink_links_count += f->nb_inputs;
         }
     }
     sinks = av_calloc(sink_links_count, sizeof(*sinks));
         return AVERROR(ENOMEM);
     for (i = 0; i < graph->filter_count; i++) {
         f = graph->filters[i];
-        if (!f->output_count) {
+        if (!f->nb_outputs) {
-            for (j = 0; j < f->input_count; j++) {
+            for (j = 0; j < f->nb_inputs; j++) {
                 sinks[n] = f->inputs[j];
                 f->inputs[j]->age_index = n++;
             }

Merge remote-tracking branch 'qatar/master'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code