lavc: add pkt_duration field to AVFrame

Stefano Sabatini committed 14 years ago

Commit 62b39d41 parent 0da9bce4 files · +23 −1Browse files

Unified · Split

4 files

doc/APIchanges +3 −0
libavcodec/avcodec.h +11 −0
libavcodec/utils.c +8 −0
libavcodec/version.h +1 −1

@@ -15,6 +15,9 @@ libavutil: 2011-04-18 · 14 unmodified lines
15	15
16	16	API changes, most recent first:
17	17
	18	+2012-06-05 - xxxxxxx - lavc 54.24.100
	19	+ Add pkt_duration field to AVFrame.
	20	+
18	21	2012-06-04 - xxxxxxx - lafi 2.78.100
19	22	Add avfilter_default_filter_name() function in avfilter.h.
20	23

libavcodec/avcodec.h+11−0

@@ -1277,6 +1277,15 @@ typedef struct AVFrame { · 1276 unmodified lines
1277	1277	*/
1278	1278	int64_t pkt_pos;
1279	1279
	1280	+ /**
	1281	+ * duration of the corresponding packet, expressed in
	1282	+ * AVStream->time_base units, 0 if unknown.
	1283	+ * Code outside libavcodec should access this field using:
	1284	+ * av_frame_get_pkt_duration(frame)
	1285	+ * - encoding: unused
	1286	+ * - decoding: Read by user.
	1287	+ */
	1288	+ int64_t pkt_duration;
1280	1289	} AVFrame;
1281	1290
1282	1291	/**
@@ -1285,10 +1294,12 @@ typedef struct AVFrame { · 2 unmodified lines
1285	1294	* they should not be accessed directly outside libavcodec.
1286	1295	*/
1287	1296	int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame);
	1297	+int64_t av_frame_get_pkt_duration (const AVFrame *frame);
1288	1298	int64_t av_frame_get_pkt_pos (const AVFrame *frame);
1289	1299	int64_t av_frame_get_channel_layout (const AVFrame *frame);
1290	1300	int av_frame_get_sample_rate (const AVFrame *frame);
1291	1301	void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val);
	1302	+void av_frame_set_pkt_duration (AVFrame *frame, int64_t val);
1292	1303	void av_frame_set_pkt_pos (AVFrame *frame, int64_t val);
1293	1304	void av_frame_set_channel_layout (AVFrame *frame, int64_t val);
1294	1305	void av_frame_set_sample_rate (AVFrame *frame, int val);

libavcodec/utils.c+8−0

@@ -265,9 +265,11 @@ void ff_init_buffer_info(AVCodecContext s, AVFrame pic) · 264 unmodified lines
265	265	if (s->pkt) {
266	266	pic->pkt_pts = s->pkt->pts;
267	267	pic->pkt_pos = s->pkt->pos;
	268	+ pic->pkt_duration = s->pkt->duration;
268	269	} else {
269	270	pic->pkt_pts = AV_NOPTS_VALUE;
270	271	pic->pkt_pos = -1;
	272	+ pic->pkt_duration = 0;
271	273	}
272	274	pic->reordered_opaque= s->reordered_opaque;
273	275	pic->sample_aspect_ratio = s->sample_aspect_ratio;
@@ -384,9 +386,11 @@ static int audio_get_buffer(AVCodecContext avctx, AVFrame frame) · 110 unmodified lines
384	386	if (avctx->pkt) {
385	387	frame->pkt_pts = avctx->pkt->pts;
386	388	frame->pkt_pos = avctx->pkt->pos;
	389	+ frame->pkt_duration = avctx->pkt->duration;
387	390	} else {
388	391	frame->pkt_pts = AV_NOPTS_VALUE;
389	392	frame->pkt_pos = -1;
	393	+ frame->pkt_duration = 0;
390	394	}
391	395
392	396	frame->reordered_opaque = avctx->reordered_opaque;
@@ -521,9 +525,11 @@ static int video_get_buffer(AVCodecContext s, AVFrame pic) · 128 unmodified lines
521	525	if (s->pkt) {
522	526	pic->pkt_pts = s->pkt->pts;
523	527	pic->pkt_pos = s->pkt->pos;
	528	+ pic->pkt_duration = s->pkt->duration;
524	529	} else {
525	530	pic->pkt_pts = AV_NOPTS_VALUE;
526	531	pic->pkt_pos = -1;
	532	+ pic->pkt_duration = 0;
527	533	}
528	534	pic->reordered_opaque= s->reordered_opaque;
529	535	pic->sample_aspect_ratio = s->sample_aspect_ratio;
@@ -661,6 +667,7 @@ void avcodec_get_frame_defaults(AVFrame *pic){ · 131 unmodified lines
661	667	memset(pic, 0, sizeof(AVFrame));
662	668
663	669	pic->pts = pic->pkt_dts = pic->pkt_pts = pic->best_effort_timestamp = AV_NOPTS_VALUE;
	670	+ pic->pkt_duration = 0;
664	671	pic->pkt_pos = -1;
665	672	pic->key_frame= 1;
666	673	pic->sample_aspect_ratio = (AVRational){0, 1};
@@ -682,6 +689,7 @@ AVFrame *avcodec_alloc_frame(void){ · 15 unmodified lines
682	689	void av_##name##_set_##field(str *s, type v) { s->field = v; }
683	690
684	691	MAKE_ACCESSORS(AVFrame, frame, int64_t, best_effort_timestamp)
	692	+MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_duration)
685	693	MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_pos)
686	694	MAKE_ACCESSORS(AVFrame, frame, int64_t, channel_layout)
687	695	MAKE_ACCESSORS(AVFrame, frame, int, sample_rate)

libavcodec/version.h+1−1

@@ -27,7 +27,7 @@ · 26 unmodified lines
27	27	*/
28	28
29	29	#define LIBAVCODEC_VERSION_MAJOR 54
30		−#define LIBAVCODEC_VERSION_MINOR 23
	30	+#define LIBAVCODEC_VERSION_MINOR 24
31	31	#define LIBAVCODEC_VERSION_MICRO 100
32	32
33	33	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

lavc: add pkt_duration field to AVFrame

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code