History

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

Hendrik Leppkes committed 14 years ago

Commit 79393a81 parent 2c5b92f17 files · +22 −22Browse files

Unified · Split

17 files
  1. ffmpeg_filter.c +3 −3
  2. libavcodec/libstagefright.cpp +1 −1
  3. libavfilter/avfiltergraph.c +1 −1
  4. libavfilter/vf_colormatrix.c +1 −1
  5. libavfilter/vf_decimate.c +1 −1
  6. libavfilter/vf_deshake.c +2 −2
  7. libavfilter/vf_hflip.c +1 −1
  8. libavfilter/vf_hue.c +1 −1
  9. libavfilter/vf_idet.c +1 −1
  10. libavfilter/vf_overlay.c +1 −1
  11. libavfilter/vf_smartblur.c +1 −1
  12. libavfilter/vf_tinterlace.c +2 −2
  13. libavfilter/video.c +1 −1
  14. libavfilter/vsrc_mptestsrc.c +1 −1
  15. libswscale/swscale_internal.h +2 −2
  16. libswscale/x86/swscale.c +1 −1
  17. tools/fourcc2pixfmt.c +1 −1
ffmpeg_filter.c+3−3
@@ -37,7 +37,7 @@ enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodec *codec, enum AVPixelFo · 36 unmodified lines
37{37{
38 if (codec && codec->pix_fmts) {38 if (codec && codec->pix_fmts) {
39 const enum AVPixelFormat *p = codec->pix_fmts;39 const enum AVPixelFormat *p = codec->pix_fmts;
40 int has_alpha= av_pix_fmt_descriptors[target].nb_components % 2 == 0;40 int has_alpha= av_pix_fmt_desc_get(target)->nb_components % 2 == 0;
41 enum AVPixelFormat best= AV_PIX_FMT_NONE;41 enum AVPixelFormat best= AV_PIX_FMT_NONE;
42 if (st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) {42 if (st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) {
43 if (st->codec->codec_id == AV_CODEC_ID_MJPEG) {43 if (st->codec->codec_id == AV_CODEC_ID_MJPEG) {
@@ -56,9 +56,9 @@ enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodec *codec, enum AVPixelFo · 12 unmodified lines
56 if (target != AV_PIX_FMT_NONE)56 if (target != AV_PIX_FMT_NONE)
57 av_log(NULL, AV_LOG_WARNING,57 av_log(NULL, AV_LOG_WARNING,
58 "Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n",58 "Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n",
59 av_pix_fmt_descriptors[target].name,59 av_get_pix_fmt_name(target),
60 codec->name,60 codec->name,
61 av_pix_fmt_descriptors[best].name);61 av_get_pix_fmt_name(best));
62 return best;62 return best;
63 }63 }
64 }64 }
libavcodec/libstagefright.cpp+1−1
@@ -153,7 +153,7 @@ void* decode_thread(void *arg) · 152 unmodified lines
153{153{
154 AVCodecContext *avctx = (AVCodecContext*)arg;154 AVCodecContext *avctx = (AVCodecContext*)arg;
155 StagefrightContext *s = (StagefrightContext*)avctx->priv_data;155 StagefrightContext *s = (StagefrightContext*)avctx->priv_data;
156 const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[avctx->pix_fmt];156 const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(avctx->pix_fmt);
157 Frame* frame;157 Frame* frame;
158 MediaBuffer *buffer;158 MediaBuffer *buffer;
159 int32_t w, h;159 int32_t w, h;
libavfilter/avfiltergraph.c+1−1
@@ -424,7 +424,7 @@ static int pick_format(AVFilterLink *link, AVFilterLink *ref) · 423 unmodified lines
424 424
425 if (link->type == AVMEDIA_TYPE_VIDEO) {425 if (link->type == AVMEDIA_TYPE_VIDEO) {
426 if(ref && ref->type == AVMEDIA_TYPE_VIDEO){426 if(ref && ref->type == AVMEDIA_TYPE_VIDEO){
427 int has_alpha= av_pix_fmt_descriptors[ref->format].nb_components % 2 == 0;427 int has_alpha= av_pix_fmt_desc_get(ref->format)->nb_components % 2 == 0;
428 enum AVPixelFormat best= AV_PIX_FMT_NONE;428 enum AVPixelFormat best= AV_PIX_FMT_NONE;
429 int i;429 int i;
430 for (i=0; i<link->in_formats->format_count; i++) {430 for (i=0; i<link->in_formats->format_count; i++) {
libavfilter/vf_colormatrix.c+1−1
@@ -308,7 +308,7 @@ static int config_input(AVFilterLink *inlink) · 307 unmodified lines
308{308{
309 AVFilterContext *ctx = inlink->dst;309 AVFilterContext *ctx = inlink->dst;
310 ColorMatrixContext *color = ctx->priv;310 ColorMatrixContext *color = ctx->priv;
311 const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format];311 const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format);
312 312
313 color->hsub = pix_desc->log2_chroma_w;313 color->hsub = pix_desc->log2_chroma_w;
314 color->vsub = pix_desc->log2_chroma_h;314 color->vsub = pix_desc->log2_chroma_h;
libavfilter/vf_decimate.c+1−1
@@ -180,7 +180,7 @@ static int config_input(AVFilterLink *inlink) · 179 unmodified lines
180{180{
181 AVFilterContext *ctx = inlink->dst;181 AVFilterContext *ctx = inlink->dst;
182 DecimateContext *decimate = ctx->priv;182 DecimateContext *decimate = ctx->priv;
183 const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format];183 const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format);
184 decimate->hsub = pix_desc->log2_chroma_w;184 decimate->hsub = pix_desc->log2_chroma_w;
185 decimate->vsub = pix_desc->log2_chroma_h;185 decimate->vsub = pix_desc->log2_chroma_h;
186 186
libavfilter/vf_deshake.c+2−2
@@ -59,8 +59,8 @@ · 58 unmodified lines
59 59
60#include "transform.h"60#include "transform.h"
61 61
62#define CHROMA_WIDTH(link) -((-link->w) >> av_pix_fmt_descriptors[link->format].log2_chroma_w)62#define CHROMA_WIDTH(link) -((-link->w) >> av_pix_fmt_desc_get(link->format)->log2_chroma_w)
63#define CHROMA_HEIGHT(link) -((-link->h) >> av_pix_fmt_descriptors[link->format].log2_chroma_h)63#define CHROMA_HEIGHT(link) -((-link->h) >> av_pix_fmt_desc_get(link->format)->log2_chroma_h)
64 64
65enum SearchMethod {65enum SearchMethod {
66 EXHAUSTIVE, ///< Search all possible positions66 EXHAUSTIVE, ///< Search all possible positions
libavfilter/vf_hflip.c+1−1
@@ -95,7 +95,7 @@ static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) · 94 unmodified lines
95 avfilter_copy_buffer_ref_props(outlink->out_buf, picref);95 avfilter_copy_buffer_ref_props(outlink->out_buf, picref);
96 96
97 /* copy palette if required */97 /* copy palette if required */
98 if (av_pix_fmt_descriptors[inlink->format].flags & PIX_FMT_PAL)98 if (av_pix_fmt_desc_get(inlink->format)->flags & PIX_FMT_PAL)
99 memcpy(inlink->dst->outputs[0]->out_buf->data[1], picref->data[1], AVPALETTE_SIZE);99 memcpy(inlink->dst->outputs[0]->out_buf->data[1], picref->data[1], AVPALETTE_SIZE);
100 100
101 return ff_start_frame(outlink, avfilter_ref_buffer(outlink->out_buf, ~0));101 return ff_start_frame(outlink, avfilter_ref_buffer(outlink->out_buf, ~0));
libavfilter/vf_hue.c+1−1
@@ -252,7 +252,7 @@ static int query_formats(AVFilterContext *ctx) · 251 unmodified lines
252static int config_props(AVFilterLink *inlink)252static int config_props(AVFilterLink *inlink)
253{253{
254 HueContext *hue = inlink->dst->priv;254 HueContext *hue = inlink->dst->priv;
255 const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[inlink->format];255 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
256 256
257 hue->hsub = desc->log2_chroma_w;257 hue->hsub = desc->log2_chroma_w;
258 hue->vsub = desc->log2_chroma_h;258 hue->vsub = desc->log2_chroma_h;
libavfilter/vf_idet.c+1−1
@@ -195,7 +195,7 @@ static int end_frame(AVFilterLink *link) · 194 unmodified lines
195 return 0;195 return 0;
196 196
197 if (!idet->csp)197 if (!idet->csp)
198 idet->csp = &av_pix_fmt_descriptors[link->format];198 idet->csp = av_pix_fmt_desc_get(link->format);
199 if (idet->csp->comp[0].depth_minus1 / 8 == 1)199 if (idet->csp->comp[0].depth_minus1 / 8 == 1)
200 idet->filter_line = (void*)filter_line_c_16bit;200 idet->filter_line = (void*)filter_line_c_16bit;
201 201
libavfilter/vf_overlay.c+1−1
@@ -217,7 +217,7 @@ static int config_input_overlay(AVFilterLink *inlink) · 216 unmodified lines
217 char *expr;217 char *expr;
218 double var_values[VAR_VARS_NB], res;218 double var_values[VAR_VARS_NB], res;
219 int ret;219 int ret;
220 const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format];220 const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format);
221 221
222 av_image_fill_max_pixsteps(over->overlay_pix_step, NULL, pix_desc);222 av_image_fill_max_pixsteps(over->overlay_pix_step, NULL, pix_desc);
223 223
libavfilter/vf_smartblur.c+1−1
@@ -169,7 +169,7 @@ static int alloc_sws_context(FilterParam *f, int width, int height, unsigned int · 168 unmodified lines
169static int config_props(AVFilterLink *inlink)169static int config_props(AVFilterLink *inlink)
170{170{
171 SmartblurContext *sblur = inlink->dst->priv;171 SmartblurContext *sblur = inlink->dst->priv;
172 const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[inlink->format];172 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
173 173
174 sblur->hsub = desc->log2_chroma_w;174 sblur->hsub = desc->log2_chroma_w;
175 sblur->vsub = desc->log2_chroma_h;175 sblur->vsub = desc->log2_chroma_h;
libavfilter/vf_tinterlace.c+2−2
@@ -130,7 +130,7 @@ static int config_out_props(AVFilterLink *outlink) · 129 unmodified lines
130{130{
131 AVFilterContext *ctx = outlink->src;131 AVFilterContext *ctx = outlink->src;
132 AVFilterLink *inlink = outlink->src->inputs[0];132 AVFilterLink *inlink = outlink->src->inputs[0];
133 const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[outlink->format];133 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(outlink->format);
134 TInterlaceContext *tinterlace = ctx->priv;134 TInterlaceContext *tinterlace = ctx->priv;
135 135
136 tinterlace->vsub = desc->log2_chroma_h;136 tinterlace->vsub = desc->log2_chroma_h;
@@ -179,7 +179,7 @@ void copy_picture_field(uint8_t *dst[4], int dst_linesize[4], · 42 unmodified lines
179 enum AVPixelFormat format, int w, int src_h,179 enum AVPixelFormat format, int w, int src_h,
180 int src_field, int interleave, int dst_field)180 int src_field, int interleave, int dst_field)
181{181{
182 const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[format];182 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format);
183 int plane, vsub = desc->log2_chroma_h;183 int plane, vsub = desc->log2_chroma_h;
184 int k = src_field == FIELD_UPPER_AND_LOWER ? 1 : 2;184 int k = src_field == FIELD_UPPER_AND_LOWER ? 1 : 2;
185 185
libavfilter/video.c+1−1
@@ -286,7 +286,7 @@ int ff_start_frame(AVFilterLink *link, AVFilterBufferRef *picref) · 285 unmodified lines
286 avfilter_copy_buffer_ref_props(link->cur_buf, link->src_buf);286 avfilter_copy_buffer_ref_props(link->cur_buf, link->src_buf);
287 287
288 /* copy palette if required */288 /* copy palette if required */
289 if (av_pix_fmt_descriptors[link->format].flags & PIX_FMT_PAL)289 if (av_pix_fmt_desc_get(link->format)->flags & PIX_FMT_PAL)
290 memcpy(link->cur_buf->data[1], link->src_buf-> data[1], AVPALETTE_SIZE);290 memcpy(link->cur_buf->data[1], link->src_buf-> data[1], AVPALETTE_SIZE);
291 }291 }
292 else292 else
libavfilter/vsrc_mptestsrc.c+1−1
@@ -298,7 +298,7 @@ static int config_props(AVFilterLink *outlink) · 297 unmodified lines
298{298{
299 AVFilterContext *ctx = outlink->src;299 AVFilterContext *ctx = outlink->src;
300 MPTestContext *test = ctx->priv;300 MPTestContext *test = ctx->priv;
301 const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[outlink->format];301 const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(outlink->format);
302 302
303 test->hsub = pix_desc->log2_chroma_w;303 test->hsub = pix_desc->log2_chroma_w;
304 test->vsub = pix_desc->log2_chroma_h;304 test->vsub = pix_desc->log2_chroma_h;
libswscale/swscale_internal.h+2−2
@@ -602,8 +602,8 @@ static av_always_inline int isRGB(enum AVPixelFormat pix_fmt) · 601 unmodified lines
602 602
603#if 0 // FIXME603#if 0 // FIXME
604#define isGray(x) \604#define isGray(x) \
605 (!(av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) && \605 (!(av_pix_fmt_desc_get(x)->flags & PIX_FMT_PAL) && \
606 av_pix_fmt_descriptors[x].nb_components <= 2)606 av_pix_fmt_desc_get(x)->nb_components <= 2)
607#else607#else
608#define isGray(x) \608#define isGray(x) \
609 ((x) == AV_PIX_FMT_GRAY8 || \609 ((x) == AV_PIX_FMT_GRAY8 || \
libswscale/x86/swscale.c+1−1
@@ -402,7 +402,7 @@ av_cold void ff_sws_init_swScale_mmx(SwsContext *c) · 401 unmodified lines
402 } else if (c->srcBpc == 12) { \402 } else if (c->srcBpc == 12) { \
403 hscalefn = c->dstBpc <= 14 ? ff_hscale12to15_ ## filtersize ## _ ## opt2 : \403 hscalefn = c->dstBpc <= 14 ? ff_hscale12to15_ ## filtersize ## _ ## opt2 : \
404 ff_hscale12to19_ ## filtersize ## _ ## opt1; \404 ff_hscale12to19_ ## filtersize ## _ ## opt1; \
405 } else if (c->srcBpc == 14 || ((c->srcFormat==AV_PIX_FMT_PAL8||isAnyRGB(c->srcFormat)) && av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1<15)) { \405 } else if (c->srcBpc == 14 || ((c->srcFormat==AV_PIX_FMT_PAL8||isAnyRGB(c->srcFormat)) && av_pix_fmt_desc_get(c->srcFormat)->comp[0].depth_minus1<15)) { \
406 hscalefn = c->dstBpc <= 14 ? ff_hscale14to15_ ## filtersize ## _ ## opt2 : \406 hscalefn = c->dstBpc <= 14 ? ff_hscale14to15_ ## filtersize ## _ ## opt2 : \
407 ff_hscale14to19_ ## filtersize ## _ ## opt1; \407 ff_hscale14to19_ ## filtersize ## _ ## opt1; \
408 } else { /* c->srcBpc == 16 */ \408 } else { /* c->srcBpc == 16 */ \
tools/fourcc2pixfmt.c+1−1
@@ -98,7 +98,7 @@ int main(int argc, char **argv) · 97 unmodified lines
98 98
99 if (list_pix_fmt_fourccs) {99 if (list_pix_fmt_fourccs) {
100 for (i = 0; i < AV_PIX_FMT_NB; i++) {100 for (i = 0; i < AV_PIX_FMT_NB; i++) {
101 const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[i];101 const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(i);
102 if (!pix_desc->name || pix_desc->flags & PIX_FMT_HWACCEL)102 if (!pix_desc->name || pix_desc->flags & PIX_FMT_HWACCEL)
103 continue;103 continue;
104 printf("%s: ", pix_desc->name);104 printf("%s: ", pix_desc->name);

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