This will allow parsers to export the duration of the current frame being
output, if known, instead of using AVCodecContext.frame_size.
---
We need to round the duration from the parser down instead of to
nearest. This will avoid non-monotone timestamps on stream copy when
there are multiple frames per packet and the time base interval is too
large to represent individual frames without duplicate timestamps.
doc/APIchanges | 3 +++
libavcodec/avcodec.h | 7 +++++++
libavformat/utils.c | 14 ++++++++++++++
3 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index ca521d4..3d0772c 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2011-04-18
API changes, most recent first:
+2012-xx-xx - xxxxxxx - lavc 54.01.0
+ Add duration field to AVCodecParserContext
+
2012-02-xx - xxxxxxx - lavu 51.23.1 - mathematics.h
Add av_rescale_q_rnd()
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 6afa140..3082993 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3993,6 +3993,13 @@ typedef struct AVCodecParserContext {
* Previous frame byte position.
*/
int64_t last_pos;
+
+ /**
+ * Duration of the current frame.
+ * For audio, this is in units of 1 / AVCodecContext.sample_rate.
+ * For all other types, this is in units of AVCodecContext.time_base.
+ */
+ int duration;
} AVCodecParserContext;
typedef struct AVCodecParser {
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 33775b9..2417522 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1039,6 +1039,20 @@ static int read_frame_internal(AVFormatContext *s,
AVPacket *pkt)
if (pkt->size) {
got_packet:
pkt->duration = 0;
+ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+ if (st->codec->sample_rate > 0) {
+ pkt->duration =
av_rescale_q_rnd(st->parser->duration,
+ (AVRational){ 1,
st->codec->sample_rate },
+ st->time_base,
+ AV_ROUND_DOWN);
+ }
+ } else if (st->codec->time_base.num != 0 &&
+ st->codec->time_base.den != 0) {
+ pkt->duration = av_rescale_q_rnd(st->parser->duration,
+ st->codec->time_base,
+ st->time_base,
+ AV_ROUND_DOWN);
+ }
pkt->stream_index = st->index;
pkt->pts = st->parser->pts;
pkt->dts = st->parser->dts;
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
