History

avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.

James Zern committed 15 years ago

Commit e9cef891 parent 5d603f111 files · +26 −10Browse files

Unified · Split

11 files
  1. doc/APIchanges +4 −0
  2. libavformat/avformat.h +5 −1
  3. libavformat/flvenc.c +2 −1
  4. libavformat/framecrcenc.c +1 −1
  5. libavformat/matroskaenc.c +5 −3
  6. libavformat/md5enc.c +1 −1
  7. libavformat/smjpegenc.c +1 −1
  8. libavformat/swfenc.c +2 −0
  9. libavformat/utils.c +3 −1
  10. libavformat/version.h +1 −1
  11. libavformat/wav.c +1 −0
doc/APIchanges+4−0
@@ -13,6 +13,10 @@ libavutil: 2011-04-18 · 12 unmodified lines
13 13
14API changes, most recent first:14API changes, most recent first:
15 15
162012-05-xx - xxxxxxx - lavf 54.3.0
17 Add AVFMT_TS_NONSTRICT format flag to indicate that a muxer supports
18 non-increasing monotone timestamps.
19
162012-05-15 - lavfi 2.17.0202012-05-15 - lavfi 2.17.0
17 Add support for audio filters21 Add support for audio filters
18 ac71230/a2cd9be - add video/audio buffer sink in a new installed22 ac71230/a2cd9be - add video/audio buffer sink in a new installed
libavformat/avformat.h+5−1
@@ -351,6 +351,9 @@ typedef struct AVProbeData { · 350 unmodified lines
351#define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fallback to generic search */351#define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fallback to generic search */
352#define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes */352#define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes */
353#define AVFMT_ALLOW_FLUSH 0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */353#define AVFMT_ALLOW_FLUSH 0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
354#define AVFMT_TS_NONSTRICT 0x20000 /**< Format does not require strictly
355 increasing timestamps, but they must
356 still be monotonic */
354 357
355/**358/**
356 * @addtogroup lavf_encoding359 * @addtogroup lavf_encoding
@@ -373,7 +376,8 @@ typedef struct AVOutputFormat { · 16 unmodified lines
373 /**376 /**
374 * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE,377 * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE,
375 * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,378 * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
376 * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH379 * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH,
380 * AVFMT_TS_NONSTRICT
377 */381 */
378 int flags;382 int flags;
379 383
libavformat/flvenc.c+2−1
@@ -488,5 +488,6 @@ AVOutputFormat ff_flv_muxer = { · 487 unmodified lines
488 .codec_tag = (const AVCodecTag* const []){488 .codec_tag = (const AVCodecTag* const []){
489 flv_video_codec_ids, flv_audio_codec_ids, 0489 flv_video_codec_ids, flv_audio_codec_ids, 0
490 },490 },
491 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,491 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS |
492 AVFMT_TS_NONSTRICT,
492};493};
libavformat/framecrcenc.c+1−1
@@ -43,5 +43,5 @@ AVOutputFormat ff_framecrc_muxer = { · 42 unmodified lines
43 .video_codec = CODEC_ID_RAWVIDEO,43 .video_codec = CODEC_ID_RAWVIDEO,
44 .write_header = ff_framehash_write_header,44 .write_header = ff_framehash_write_header,
45 .write_packet = framecrc_write_packet,45 .write_packet = framecrc_write_packet,
46 .flags = AVFMT_VARIABLE_FPS,46 .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT,
47};47};
libavformat/matroskaenc.c+5−3
@@ -1305,7 +1305,8 @@ AVOutputFormat ff_matroska_muxer = { · 1304 unmodified lines
1305 .write_header = mkv_write_header,1305 .write_header = mkv_write_header,
1306 .write_packet = mkv_write_packet,1306 .write_packet = mkv_write_packet,
1307 .write_trailer = mkv_write_trailer,1307 .write_trailer = mkv_write_trailer,
1308 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,1308 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS |
1309 AVFMT_TS_NONSTRICT,
1309 .codec_tag = (const AVCodecTag* const []){1310 .codec_tag = (const AVCodecTag* const []){
1310 ff_codec_bmp_tags, ff_codec_wav_tags, 01311 ff_codec_bmp_tags, ff_codec_wav_tags, 0
1311 },1312 },
@@ -1326,7 +1327,8 @@ AVOutputFormat ff_webm_muxer = { · 14 unmodified lines
1326 .write_header = mkv_write_header,1327 .write_header = mkv_write_header,
1327 .write_packet = mkv_write_packet,1328 .write_packet = mkv_write_packet,
1328 .write_trailer = mkv_write_trailer,1329 .write_trailer = mkv_write_trailer,
1329 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,1330 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS |
1331 AVFMT_TS_NONSTRICT,
1330};1332};
1331#endif1333#endif
1332 1334
@@ -1346,7 +1348,7 @@ AVOutputFormat ff_matroska_audio_muxer = { · 13 unmodified lines
1346 .write_header = mkv_write_header,1348 .write_header = mkv_write_header,
1347 .write_packet = mkv_write_packet,1349 .write_packet = mkv_write_packet,
1348 .write_trailer = mkv_write_trailer,1350 .write_trailer = mkv_write_trailer,
1349 .flags = AVFMT_GLOBALHEADER,1351 .flags = AVFMT_GLOBALHEADER | AVFMT_TS_NONSTRICT,
1350 .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },1352 .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
1351};1353};
1352#endif1354#endif
libavformat/md5enc.c+1−1
@@ -106,6 +106,6 @@ AVOutputFormat ff_framemd5_muxer = { · 105 unmodified lines
106 .video_codec = CODEC_ID_RAWVIDEO,106 .video_codec = CODEC_ID_RAWVIDEO,
107 .write_header = ff_framehash_write_header,107 .write_header = ff_framehash_write_header,
108 .write_packet = framemd5_write_packet,108 .write_packet = framemd5_write_packet,
109 .flags = AVFMT_VARIABLE_FPS,109 .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT,
110};110};
111#endif111#endif
libavformat/smjpegenc.c+1−1
@@ -144,6 +144,6 @@ AVOutputFormat ff_smjpeg_muxer = { · 143 unmodified lines
144 .write_header = smjpeg_write_header,144 .write_header = smjpeg_write_header,
145 .write_packet = smjpeg_write_packet,145 .write_packet = smjpeg_write_packet,
146 .write_trailer = smjpeg_write_trailer,146 .write_trailer = smjpeg_write_trailer,
147 .flags = AVFMT_GLOBALHEADER,147 .flags = AVFMT_GLOBALHEADER | AVFMT_TS_NONSTRICT,
148 .codec_tag = (const AVCodecTag *const []){ ff_codec_smjpeg_video_tags, ff_codec_smjpeg_audio_tags, 0 },148 .codec_tag = (const AVCodecTag *const []){ ff_codec_smjpeg_video_tags, ff_codec_smjpeg_audio_tags, 0 },
149};149};
libavformat/swfenc.c+2−0
@@ -513,6 +513,7 @@ AVOutputFormat ff_swf_muxer = { · 512 unmodified lines
513 .write_header = swf_write_header,513 .write_header = swf_write_header,
514 .write_packet = swf_write_packet,514 .write_packet = swf_write_packet,
515 .write_trailer = swf_write_trailer,515 .write_trailer = swf_write_trailer,
516 .flags = AVFMT_TS_NONSTRICT,
516};517};
517#endif518#endif
518#if CONFIG_AVM2_MUXER519#if CONFIG_AVM2_MUXER
@@ -526,5 +527,6 @@ AVOutputFormat ff_avm2_muxer = { · 7 unmodified lines
526 .write_header = swf_write_header,527 .write_header = swf_write_header,
527 .write_packet = swf_write_packet,528 .write_packet = swf_write_packet,
528 .write_trailer = swf_write_trailer,529 .write_trailer = swf_write_trailer,
530 .flags = AVFMT_TS_NONSTRICT,
529};531};
530#endif532#endif
libavformat/utils.c+3−1
@@ -2962,7 +2962,9 @@ static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt){ · 2961 unmodified lines
2962 pkt->dts= st->pts_buffer[0];2962 pkt->dts= st->pts_buffer[0];
2963 }2963 }
2964 2964
2965 if(st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && st->cur_dts >= pkt->dts){2965 if (st->cur_dts && st->cur_dts != AV_NOPTS_VALUE &&
2966 ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) &&
2967 st->cur_dts >= pkt->dts) || st->cur_dts > pkt->dts)) {
2966 av_log(s, AV_LOG_ERROR,2968 av_log(s, AV_LOG_ERROR,
2967 "Application provided invalid, non monotonically increasing dts to muxer in stream %d: %"PRId64" >= %"PRId64"\n",2969 "Application provided invalid, non monotonically increasing dts to muxer in stream %d: %"PRId64" >= %"PRId64"\n",
2968 st->index, st->cur_dts, pkt->dts);2970 st->index, st->cur_dts, pkt->dts);
libavformat/version.h+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
30#include "libavutil/avutil.h"30#include "libavutil/avutil.h"
31 31
32#define LIBAVFORMAT_VERSION_MAJOR 5432#define LIBAVFORMAT_VERSION_MAJOR 54
33#define LIBAVFORMAT_VERSION_MINOR 233#define LIBAVFORMAT_VERSION_MINOR 3
34#define LIBAVFORMAT_VERSION_MICRO 034#define LIBAVFORMAT_VERSION_MICRO 0
35 35
36#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \36#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
libavformat/wav.c+1−0
@@ -216,6 +216,7 @@ AVOutputFormat ff_wav_muxer = { · 215 unmodified lines
216 .write_header = wav_write_header,216 .write_header = wav_write_header,
217 .write_packet = wav_write_packet,217 .write_packet = wav_write_packet,
218 .write_trailer = wav_write_trailer,218 .write_trailer = wav_write_trailer,
219 .flags = AVFMT_TS_NONSTRICT,
219 .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },220 .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
220 .priv_class = &wav_muxer_class,221 .priv_class = &wav_muxer_class,
221};222};

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t