virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavf: add field for how duration is estimated

Browse Source 
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
This commit is contained in:
Michael Bradshaw 2012-06-17 22:20:09 -07:00 committed by Nicolas George
parent 3b3150ec9b
commit 2243f0d078
4 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/avformat.h
View File

@ -1099,8 +1099,25 @@ typedef struct AVFormatContext {
int raw_packet_buffer_remaining_size;
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;
/**
* 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 {
AVPacket pkt;
struct AVPacketList *next;

5
libavformat/options.c
View File

@ -104,6 +104,11 @@ AVFormatContext *avformat_alloc_context(void)
return ic;
}
int av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx)
{
return ctx->duration_estimation_method;
}
const AVClass *avformat_get_class(void)
{
return &av_format_context_class;

3
libavformat/utils.c
View File

@ -2228,14 +2228,17 @@ static void estimate_timings(AVFormatContext *ic, int64_t old_offset)
file_size && ic->pb->seekable) {
/* get accurate estimate from the PTSes */
estimate_timings_from_pts(ic, old_offset);
ic->duration_estimation_method = AVFMT_DURATION_FROM_PTS;
} else if (has_duration(ic)) {
/* at least one component has timings - we use them for all
the components */
fill_all_stream_timings(ic);
ic->duration_estimation_method = AVFMT_DURATION_FROM_STREAM;
} else {
av_log(ic, AV_LOG_WARNING, "Estimating duration from bitrate, this may be inaccurate\n");
/* less precise: use bitrate info */
estimate_timings_from_bit_rate(ic);
ic->duration_estimation_method = AVFMT_DURATION_FROM_BITRATE;
}
update_stream_timings(ic);

4
libavformat/version.h
View File

@ -30,8 +30,8 @@
#include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 54
#define LIBAVFORMAT_VERSION_MINOR 6
#define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_MINOR 7
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \