Add AVFilterPicRef.pos field and make libavfilter propagate stream byte position information, as stored in the pkt.pos, through the filterchain.

Note that the pos field is added *non* at the end of the AVFilterPicRef struct, thus breaking ABI compatibility, which is allowed as the API is still considered non-stable. Originally committed as revision 22506 to svn://svn.ffmpeg.org/ffmpeg/trunk

Stefano Sabatini committed 16 years ago

Commit 5bb5c1d1 parent ec7ab613 files · +6 −2Browse files

Unified · Split

3 files

libavfilter/avfilter.c +4 −2
libavfilter/avfilter.h +1 −0
libavfilter/defaults.c +1 −0

libavfilter/avfilter.c+4−2

 static void dprintf_picref(void *ctx, AVFilterPicRef *picref, int end)
 {
     dprintf(ctx,
-            "picref[%p data[%p, %p, %p, %p] linesize[%d, %d, %d, %d] pts:%"PRId64" a:%d/%d s:%dx%d]%s",
+            "picref[%p data[%p, %p, %p, %p] linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64" a:%d/%d s:%dx%d]%s",
             picref,
             picref->data    [0], picref->data    [1], picref->data    [2], picref->data    [3],
             picref->linesize[0], picref->linesize[1], picref->linesize[2], picref->linesize[3],
-            picref->pts, picref->pixel_aspect.num, picref->pixel_aspect.den, picref->w, picref->h,
+            picref->pts, picref->pos,
+            picref->pixel_aspect.num, picref->pixel_aspect.den, picref->w, picref->h,
             end ? "\n" : "");
 }
         link->cur_pic = avfilter_default_get_video_buffer(link, dst->min_perms, link->w, link->h);
         link->srcpic = picref;
         link->cur_pic->pts = link->srcpic->pts;
+        link->cur_pic->pos = link->srcpic->pos;
         link->cur_pic->pixel_aspect = link->srcpic->pixel_aspect;
     }
     else

libavfilter/avfilter.h+1−0

@@ -105,6 +105,7 @@ typedef struct AVFilterPicRef · 104 unmodified lines
105	int h; ///< image height	105	int h; ///< image height
106		106
107	int64_t pts; ///< presentation timestamp in units of 1/AV_TIME_BASE	107	int64_t pts; ///< presentation timestamp in units of 1/AV_TIME_BASE
		108	int64_t pos; ///< byte position in stream, -1 if unknown
108		109
109	AVRational pixel_aspect; ///< pixel aspect ratio	110	AVRational pixel_aspect; ///< pixel aspect ratio
110		111

libavfilter/defaults.c+1−0

@@ -74,6 +74,7 @@ void avfilter_default_start_frame(AVFilterLink link, AVFilterPicRef picref) · 73 unmodified lines
74	if(out) {	74	if(out) {
75	out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h);	75	out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h);
76	out->outpic->pts = picref->pts;	76	out->outpic->pts = picref->pts;
		77	out->outpic->pos = picref->pos;
77	out->outpic->pixel_aspect = picref->pixel_aspect;	78	out->outpic->pixel_aspect = picref->pixel_aspect;
78	avfilter_start_frame(out, avfilter_ref_pic(out->outpic, ~0));	79	avfilter_start_frame(out, avfilter_ref_pic(out->outpic, ~0));
79	}	80	}

Add AVFilterPicRef.pos field and make libavfilter propagate stream byte position information, as stored in the pkt.pos, through the filterchain.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code