lavf: add field for how duration is estimated
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
This commit is contained in:
parent
3b3150ec9b
commit
2243f0d078
@ -1099,8 +1099,25 @@ typedef struct AVFormatContext {
|
|||||||
int raw_packet_buffer_remaining_size;
|
int raw_packet_buffer_remaining_size;
|
||||||
|
|
||||||
int avio_flags;
|
int avio_flags;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The duration field can be estimated through various ways, and this field can be used
|
||||||
|
* to know how the duration was estimated.
|
||||||
|
*/
|
||||||
|
enum {
|
||||||
|
AVFMT_DURATION_FROM_PTS, ///< duration accurately estimated from PTSes
|
||||||
|
AVFMT_DURATION_FROM_STREAM, ///< duration estimated from a stream with a known duration
|
||||||
|
AVFMT_DURATION_FROM_BITRATE ///< duration estimated from bitrate (less accurate)
|
||||||
|
} duration_estimation_method;
|
||||||
} AVFormatContext;
|
} AVFormatContext;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the method used to set ctx->duration.
|
||||||
|
*
|
||||||
|
* @return AVFMT_DURATION_FROM_PTS, AVFMT_DURATION_FROM_STREAM, or AVFMT_DURATION_FROM_BITRATE.
|
||||||
|
*/
|
||||||
|
int av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx);
|
||||||
|
|
||||||
typedef struct AVPacketList {
|
typedef struct AVPacketList {
|
||||||
AVPacket pkt;
|
AVPacket pkt;
|
||||||
struct AVPacketList *next;
|
struct AVPacketList *next;
|
||||||
|
@ -104,6 +104,11 @@ AVFormatContext *avformat_alloc_context(void)
|
|||||||
return ic;
|
return ic;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx)
|
||||||
|
{
|
||||||
|
return ctx->duration_estimation_method;
|
||||||
|
}
|
||||||
|
|
||||||
const AVClass *avformat_get_class(void)
|
const AVClass *avformat_get_class(void)
|
||||||
{
|
{
|
||||||
return &av_format_context_class;
|
return &av_format_context_class;
|
||||||
|
@ -2228,14 +2228,17 @@ static void estimate_timings(AVFormatContext *ic, int64_t old_offset)
|
|||||||
file_size && ic->pb->seekable) {
|
file_size && ic->pb->seekable) {
|
||||||
/* get accurate estimate from the PTSes */
|
/* get accurate estimate from the PTSes */
|
||||||
estimate_timings_from_pts(ic, old_offset);
|
estimate_timings_from_pts(ic, old_offset);
|
||||||
|
ic->duration_estimation_method = AVFMT_DURATION_FROM_PTS;
|
||||||
} else if (has_duration(ic)) {
|
} else if (has_duration(ic)) {
|
||||||
/* at least one component has timings - we use them for all
|
/* at least one component has timings - we use them for all
|
||||||
the components */
|
the components */
|
||||||
fill_all_stream_timings(ic);
|
fill_all_stream_timings(ic);
|
||||||
|
ic->duration_estimation_method = AVFMT_DURATION_FROM_STREAM;
|
||||||
} else {
|
} else {
|
||||||
av_log(ic, AV_LOG_WARNING, "Estimating duration from bitrate, this may be inaccurate\n");
|
av_log(ic, AV_LOG_WARNING, "Estimating duration from bitrate, this may be inaccurate\n");
|
||||||
/* less precise: use bitrate info */
|
/* less precise: use bitrate info */
|
||||||
estimate_timings_from_bit_rate(ic);
|
estimate_timings_from_bit_rate(ic);
|
||||||
|
ic->duration_estimation_method = AVFMT_DURATION_FROM_BITRATE;
|
||||||
}
|
}
|
||||||
update_stream_timings(ic);
|
update_stream_timings(ic);
|
||||||
|
|
||||||
|
@ -30,8 +30,8 @@
|
|||||||
#include "libavutil/avutil.h"
|
#include "libavutil/avutil.h"
|
||||||
|
|
||||||
#define LIBAVFORMAT_VERSION_MAJOR 54
|
#define LIBAVFORMAT_VERSION_MAJOR 54
|
||||||
#define LIBAVFORMAT_VERSION_MINOR 6
|
#define LIBAVFORMAT_VERSION_MINOR 7
|
||||||
#define LIBAVFORMAT_VERSION_MICRO 101
|
#define LIBAVFORMAT_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
||||||
LIBAVFORMAT_VERSION_MINOR, \
|
LIBAVFORMAT_VERSION_MINOR, \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user