History

Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'

* commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0': lavfi: rename AVFilterFormats.format_count to nb_formats Conflicts: libavfilter/avfiltergraph.c libavfilter/filtfmts.c libavfilter/formats.c

Michael Niedermayer committed 13 years ago

Commit 74cb7ef2 parents 937af7f b01f6046 files · +29 −29Browse files

Unified · Split

6 files
  1. libavfilter/avfiltergraph.c +15 −15
  2. libavfilter/filtfmts.c +2 −2
  3. libavfilter/formats.c +8 −8
  4. libavfilter/formats.h +1 −1
  5. libavfilter/vf_extractplanes.c +2 −2
  6. libavfilter/vf_format.c +1 −1
libavfilter/avfiltergraph.c+15−15
@@ -503,28 +503,28 @@ static int pick_format(AVFilterLink *link, AVFilterLink *ref) · 502 unmodified lines
503503 int has_alpha= av_pix_fmt_desc_get(ref->format)->nb_components % 2 == 0;
504504 enum AVPixelFormat best= AV_PIX_FMT_NONE;
505505 int i;
506− for (i=0; i<link->in_formats->format_count; i++) {
506+ for (i=0; i<link->in_formats->nb_formats; i++) {
507507 enum AVPixelFormat p = link->in_formats->formats[i];
508508 best= avcodec_find_best_pix_fmt_of_2(best, p, ref->format, has_alpha, NULL);
509509 }
510510 av_log(link->src,AV_LOG_DEBUG, "picking %s out of %d ref:%s alpha:%d\n",
511− av_get_pix_fmt_name(best), link->in_formats->format_count,
511+ av_get_pix_fmt_name(best), link->in_formats->nb_formats,
512512 av_get_pix_fmt_name(ref->format), has_alpha);
513513 link->in_formats->formats[0] = best;
514514 }
515515 }
516516
517− link->in_formats->format_count = 1;
517+ link->in_formats->nb_formats = 1;
518518 link->format = link->in_formats->formats[0];
519519
520520 if (link->type == AVMEDIA_TYPE_AUDIO) {
521− if (!link->in_samplerates->format_count) {
521+ if (!link->in_samplerates->nb_formats) {
522522 av_log(link->src, AV_LOG_ERROR, "Cannot select sample rate for"
523523 " the link between filters %s and %s.\n", link->src->name,
524524 link->dst->name);
525525 return AVERROR(EINVAL);
526526 }
527− link->in_samplerates->format_count = 1;
527+ link->in_samplerates->nb_formats = 1;
528528 link->sample_rate = link->in_samplerates->formats[0];
529529
530530 if (link->in_channel_layouts->all_layouts) {
@@ -591,9 +591,9 @@ static int reduce_formats_on_filter(AVFilterContext *filter) · 60 unmodified lines
591591 int i, j, k, ret = 0;
592592
593593 REDUCE_FORMATS(int, AVFilterFormats, formats, formats,
594− format_count, ff_add_format);
594+ nb_formats, ff_add_format);
595595 REDUCE_FORMATS(int, AVFilterFormats, samplerates, formats,
596− format_count, ff_add_format);
596+ nb_formats, ff_add_format);
597597
598598 /* reduce channel layouts */
599599 for (i = 0; i < filter->nb_inputs; i++) {
@@ -656,7 +656,7 @@ static void swap_samplerates_on_filter(AVFilterContext *filter) · 56 unmodified lines
656656 link = filter->inputs[i];
657657
658658 if (link->type == AVMEDIA_TYPE_AUDIO &&
659− link->out_samplerates->format_count == 1)
659+ link->out_samplerates->nb_formats== 1)
660660 break;
661661 }
662662 if (i == filter->nb_inputs)
@@ -669,10 +669,10 @@ static void swap_samplerates_on_filter(AVFilterContext *filter) · 6 unmodified lines
669669 int best_idx, best_diff = INT_MAX;
670670
671671 if (outlink->type != AVMEDIA_TYPE_AUDIO ||
672− outlink->in_samplerates->format_count < 2)
672+ outlink->in_samplerates->nb_formats < 2)
673673 continue;
674674
675− for (j = 0; j < outlink->in_samplerates->format_count; j++) {
675+ for (j = 0; j < outlink->in_samplerates->nb_formats; j++) {
676676 int diff = abs(sample_rate - outlink->in_samplerates->formats[j]);
677677
678678 if (diff < best_diff) {
@@ -834,7 +834,7 @@ static void swap_sample_fmts_on_filter(AVFilterContext *filter) · 155 unmodified lines
834834 link = filter->inputs[i];
835835
836836 if (link->type == AVMEDIA_TYPE_AUDIO &&
837− link->out_formats->format_count == 1)
837+ link->out_formats->nb_formats == 1)
838838 break;
839839 }
840840 if (i == filter->nb_inputs)
@@ -848,10 +848,10 @@ static void swap_sample_fmts_on_filter(AVFilterContext *filter) · 7 unmodified lines
848848 int best_idx = -1, best_score = INT_MIN;
849849
850850 if (outlink->type != AVMEDIA_TYPE_AUDIO ||
851− outlink->in_formats->format_count < 2)
851+ outlink->in_formats->nb_formats < 2)
852852 continue;
853853
854− for (j = 0; j < outlink->in_formats->format_count; j++) {
854+ for (j = 0; j < outlink->in_formats->nb_formats; j++) {
855855 int out_format = outlink->in_formats->formats[j];
856856 int out_bps = av_get_bytes_per_sample(out_format);
857857 int score;
@@ -904,7 +904,7 @@ static int pick_formats(AVFilterGraph *graph) · 46 unmodified lines
904904 AVFilterContext *filter = graph->filters[i];
905905 if (filter->nb_inputs){
906906 for (j = 0; j < filter->nb_inputs; j++){
907− if(filter->inputs[j]->in_formats && filter->inputs[j]->in_formats->format_count == 1) {
907+ if(filter->inputs[j]->in_formats && filter->inputs[j]->in_formats->nb_formats == 1) {
908908 if ((ret = pick_format(filter->inputs[j], NULL)) < 0)
909909 return ret;
910910 change = 1;
@@ -913,7 +913,7 @@ static int pick_formats(AVFilterGraph *graph) · 2 unmodified lines
913913 }
914914 if (filter->nb_outputs){
915915 for (j = 0; j < filter->nb_outputs; j++){
916− if(filter->outputs[j]->in_formats && filter->outputs[j]->in_formats->format_count == 1) {
916+ if(filter->outputs[j]->in_formats && filter->outputs[j]->in_formats->nb_formats == 1) {
917917 if ((ret = pick_format(filter->outputs[j], NULL)) < 0)
918918 return ret;
919919 change = 1;
libavfilter/filtfmts.c+2−2
@@ -35,7 +35,7 @@ static void print_formats(AVFilterContext *filter_ctx) · 34 unmodified lines
3535 if (filter_ctx->inout##puts[i]->type == AVMEDIA_TYPE_VIDEO) { \
3636 AVFilterFormats *fmts = \
3737 filter_ctx->inout##puts[i]->outin##_formats; \
38− for (j = 0; j < fmts->format_count; j++) \
38+ for (j = 0; j < fmts->nb_formats; j++) \
3939 if(av_get_pix_fmt_name(fmts->formats[j])) \
4040 printf(#INOUT "PUT[%d] %s: fmt:%s\n", \
4141 i, filter_ctx->filter->inout##puts[i].name, \
@@ -45,7 +45,7 @@ static void print_formats(AVFilterContext *filter_ctx) · 3 unmodified lines
4545 AVFilterChannelLayouts *layouts; \
4646 \
4747 fmts = filter_ctx->inout##puts[i]->outin##_formats; \
48− for (j = 0; j < fmts->format_count; j++) \
48+ for (j = 0; j < fmts->nb_formats; j++) \
4949 printf(#INOUT "PUT[%d] %s: fmt:%s\n", \
5050 i, filter_ctx->filter->inout##puts[i].name, \
5151 av_get_sample_fmt_name(fmts->formats[j])); \
libavfilter/formats.c+8−8
@@ -108,8 +108,8 @@ AVFilterFormats *ff_merge_formats(AVFilterFormats *a, AVFilterFormats *b, · 107 unmodified lines
108108 To avoid that, pretend that there are no common formats to force the
109109 insertion of a conversion filter. */
110110 if (type == AVMEDIA_TYPE_VIDEO)
111− for (i = 0; i < a->format_count; i++)
112− for (j = 0; j < b->format_count; j++) {
111+ for (i = 0; i < a->nb_formats; i++)
112+ for (j = 0; j < b->nb_formats; j++) {
113113 const AVPixFmtDescriptor *adesc = av_pix_fmt_desc_get(a->formats[i]);
114114 const AVPixFmtDescriptor *bdesc = av_pix_fmt_desc_get(b->formats[j]);
115115 alpha2 |= adesc->flags & bdesc->flags & AV_PIX_FMT_FLAG_ALPHA;
@@ -124,7 +124,7 @@ AVFilterFormats *ff_merge_formats(AVFilterFormats *a, AVFilterFormats *b, · 8 unmodified lines
124124 if (alpha2 > alpha1 || chroma2 > chroma1)
125125 return NULL;
126126
127− MERGE_FORMATS(ret, a, b, formats, format_count, AVFilterFormats, fail);
127+ MERGE_FORMATS(ret, a, b, formats, nb_formats, AVFilterFormats, fail);
128128
129129 return ret;
130130 fail:
@@ -143,9 +143,9 @@ AVFilterFormats *ff_merge_samplerates(AVFilterFormats *a, · 12 unmodified lines
143143
144144 if (a == b) return a;
145145
146− if (a->format_count && b->format_count) {
147− MERGE_FORMATS(ret, a, b, formats, format_count, AVFilterFormats, fail);
148− } else if (a->format_count) {
146+ if (a->nb_formats && b->nb_formats) {
147+ MERGE_FORMATS(ret, a, b, formats, nb_formats, AVFilterFormats, fail);
148+ } else if (a->nb_formats) {
149149 MERGE_REF(a, b, formats, AVFilterFormats, fail);
150150 ret = a;
151151 } else {
@@ -307,7 +307,7 @@ int64_t *ff_copy_int64_list(const int64_t * const list) · 155 unmodified lines
307307
308308 AVFilterFormats *ff_make_format_list(const int *fmts)
309309 {
310− MAKE_FORMAT_LIST(AVFilterFormats, formats, format_count);
310+ MAKE_FORMAT_LIST(AVFilterFormats, formats, nb_formats);
311311 while (count--)
312312 formats->formats[count] = fmts[count];
313313
@@ -343,7 +343,7 @@ do { \ · 29 unmodified lines
343343
344344 int ff_add_format(AVFilterFormats **avff, int64_t fmt)
345345 {
346− ADD_FORMAT(avff, fmt, int, formats, format_count);
346+ ADD_FORMAT(avff, fmt, int, formats, nb_formats);
347347 return 0;
348348 }
349349
libavfilter/formats.h+1−1
@@ -62,7 +62,7 @@ · 61 unmodified lines
6262 * pointer to each of the pointers to itself.
6363 */
6464 struct AVFilterFormats {
65− unsigned format_count; ///< number of formats
65+ unsigned nb_formats; ///< number of formats
6666 int *formats; ///< list of media formats
6767
6868 unsigned refcount; ///< number of references to this list
libavfilter/vf_extractplanes.c+2−2
@@ -100,7 +100,7 @@ static int query_formats(AVFilterContext *ctx) · 99 unmodified lines
100100 int i, depth = 0, be = 0;
101101
102102 if (!ctx->inputs[0]->in_formats ||
103− !ctx->inputs[0]->in_formats->format_count) {
103+ !ctx->inputs[0]->in_formats->nb_formats) {
104104 return AVERROR(EAGAIN);
105105 }
106106
@@ -111,7 +111,7 @@ static int query_formats(AVFilterContext *ctx) · 4 unmodified lines
111111 desc = av_pix_fmt_desc_get(avff->formats[0]);
112112 depth = desc->comp[0].depth_minus1;
113113 be = desc->flags & AV_PIX_FMT_FLAG_BE;
114− for (i = 1; i < avff->format_count; i++) {
114+ for (i = 1; i < avff->nb_formats; i++) {
115115 desc = av_pix_fmt_desc_get(avff->formats[i]);
116116 if (depth != desc->comp[0].depth_minus1 ||
117117 be != (desc->flags & AV_PIX_FMT_FLAG_BE)) {
libavfilter/vf_format.c+1−1
@@ -89,7 +89,7 @@ static AVFilterFormats *make_format_list(FormatContext *s, int flag) · 88 unmodified lines
8989
9090 for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++)
9191 if (s->listed_pix_fmt_flags[pix_fmt] == flag)
92− formats->formats[formats->format_count++] = pix_fmt;
92+ formats->formats[formats->nb_formats++] = pix_fmt;
9393
9494 return formats;
9595 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t