The function is going to be used to represent also audio data.
Originally committed as revision 24846 to svn://svn.ffmpeg.org/ffmpeg/trunk
| ... | ... |
@@ -191,21 +191,21 @@ int avfilter_config_links(AVFilterContext *filter) |
| 191 | 191 |
return 0; |
| 192 | 192 |
} |
| 193 | 193 |
|
| 194 |
-void ff_dprintf_picref(void *ctx, AVFilterBufferRef *picref, int end) |
|
| 194 |
+void ff_dprintf_ref(void *ctx, AVFilterBufferRef *ref, int end) |
|
| 195 | 195 |
{
|
| 196 | 196 |
dprintf(ctx, |
| 197 |
- "picref[%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64, |
|
| 198 |
- picref, |
|
| 199 |
- picref->data[0], |
|
| 200 |
- picref->linesize[0], picref->linesize[1], picref->linesize[2], picref->linesize[3], |
|
| 201 |
- picref->pts, picref->pos); |
|
| 197 |
+ "ref[%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64, |
|
| 198 |
+ ref, |
|
| 199 |
+ ref->data[0], |
|
| 200 |
+ ref->linesize[0], ref->linesize[1], ref->linesize[2], ref->linesize[3], |
|
| 201 |
+ ref->pts, ref->pos); |
|
| 202 | 202 |
|
| 203 |
- if (picref->video) {
|
|
| 203 |
+ if (ref->video) {
|
|
| 204 | 204 |
dprintf(ctx, " a:%d/%d s:%dx%d i:%c", |
| 205 |
- picref->video->pixel_aspect.num, picref->video->pixel_aspect.den, |
|
| 206 |
- picref->video->w, picref->video->h, |
|
| 207 |
- !picref->video->interlaced ? 'P' : /* Progressive */ |
|
| 208 |
- picref->video->top_field_first ? 'T' : 'B'); /* Top / Bottom */ |
|
| 205 |
+ ref->video->pixel_aspect.num, ref->video->pixel_aspect.den, |
|
| 206 |
+ ref->video->w, ref->video->h, |
|
| 207 |
+ !ref->video->interlaced ? 'P' : /* Progressive */ |
|
| 208 |
+ ref->video->top_field_first ? 'T' : 'B'); /* Top / Bottom */ |
|
| 209 | 209 |
} |
| 210 | 210 |
dprintf(ctx, "]%s", end ? "\n" : ""); |
| 211 | 211 |
} |
| ... | ... |
@@ -236,7 +236,7 @@ AVFilterBufferRef *avfilter_get_video_buffer(AVFilterLink *link, int perms, int |
| 236 | 236 |
if (ret) |
| 237 | 237 |
ret->type = AVMEDIA_TYPE_VIDEO; |
| 238 | 238 |
|
| 239 |
- FF_DPRINTF_START(NULL, get_video_buffer); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " returning "); ff_dprintf_picref(NULL, ret, 1); |
|
| 239 |
+ FF_DPRINTF_START(NULL, get_video_buffer); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " returning "); ff_dprintf_ref(NULL, ret, 1); |
|
| 240 | 240 |
|
| 241 | 241 |
return ret; |
| 242 | 242 |
} |
| ... | ... |
@@ -295,7 +295,7 @@ void avfilter_start_frame(AVFilterLink *link, AVFilterBufferRef *picref) |
| 295 | 295 |
void (*start_frame)(AVFilterLink *, AVFilterBufferRef *); |
| 296 | 296 |
AVFilterPad *dst = &link_dpad(link); |
| 297 | 297 |
|
| 298 |
- FF_DPRINTF_START(NULL, start_frame); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " "); ff_dprintf_picref(NULL, picref, 1); |
|
| 298 |
+ FF_DPRINTF_START(NULL, start_frame); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " "); ff_dprintf_ref(NULL, picref, 1); |
|
| 299 | 299 |
|
| 300 | 300 |
if (!(start_frame = dst->start_frame)) |
| 301 | 301 |
start_frame = avfilter_default_start_frame; |