April 2013 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/mux: set avoid_negative_ts based on flags if not overridden by user or muxer
by git＠videolan.org 17 Oct '13

17 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Apr 26 11:52:51 2013 +0200| [eba33396f007dc373678adea6c1a4b1a50373263] | committer: Michael Niedermayer avformat/mux: set avoid_negative_ts based on flags if not overridden by user or muxer This changes the default to avoid negative timestamps. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eba33396f007dc373… --- libavformat/avformat.h | 5 ++++- libavformat/mux.c | 7 ++++++ tests/ref/lavf/ts | 2 +- tests/ref/lavf/wtv | 2 +- tests/ref/seek/lavf-ts | 54 +++++++++++++++++++++++------------------------ tests/ref/seek/lavf-wtv | 44 +++++++++++++++++++------------------- 6 files changed, 62 insertions(+), 52 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index d26964a..c8f4912 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -370,7 +370,10 @@ typedef struct AVProbeData { timestamps. If not set the timestamp will be shifted in av_write_frame and av_interleaved_write_frame so they - start from 0. */ + start from 0. + The user or muxer can override this through + AVFormatContext.avoid_negative_ts + */ #define AVFMT_SEEK_TO_PTS 0x4000000 /**< Seeking is based on PTS */ diff --git a/libavformat/mux.c b/libavformat/mux.c index 4781a3e..eba4ec3 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -398,6 +398,13 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options) if ((ret = init_pts(s)) < 0) return ret; + if (s->avoid_negative_ts < 0) { + if (s->oformat->flags & (AVFMT_TS_NEGATIVE | AVFMT_NOTIMESTAMPS)) { + s->avoid_negative_ts = 0; + } else + s->avoid_negative_ts = 1; + } + return 0; } diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts index 0cab3dd..d795c27 100644 --- a/tests/ref/lavf/ts +++ b/tests/ref/lavf/ts @@ -1,3 +1,3 @@ -4531d0f4a80d5a2ee2b08a8d4ba3b442 *./tests/data/lavf/lavf.ts +04ba219e6f56f7b0fa4a47765323d204 *./tests/data/lavf/lavf.ts 407020 ./tests/data/lavf/lavf.ts ./tests/data/lavf/lavf.ts CRC=0xcc2dc628 diff --git a/tests/ref/lavf/wtv b/tests/ref/lavf/wtv index 8f2c2ac..f54f862 100644 --- a/tests/ref/lavf/wtv +++ b/tests/ref/lavf/wtv @@ -1,3 +1,3 @@ -345516d3a03fd239c62e5e7257c9f4a2 *./tests/data/lavf/lavf.wtv +237211f6aa3df9da2dfe0f7d5b8ba85c *./tests/data/lavf/lavf.wtv 413696 ./tests/data/lavf/lavf.wtv ./tests/data/lavf/lavf.wtv CRC=0xcc2dc628 diff --git a/tests/ref/seek/lavf-ts b/tests/ref/seek/lavf-ts index 407ba59..e57651e 100644 --- a/tests/ref/seek/lavf-ts +++ b/tests/ref/seek/lavf-ts @@ -1,53 +1,53 @@ -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:0 dts: 1.880000 pts: 1.920000 pos: 216388 size: 17440 +ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.920000 pos: 189692 size: 24786 ret: 0 st: 0 flags:0 ts: 0.788333 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 0 flags:1 ts:-0.317500 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 1 flags:0 ts: 2.576667 -ret: 0 st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404576 size: 209 +ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 404576 size: 209 ret: 0 st: 1 flags:1 ts: 1.470833 -ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159988 size: 208 +ret: 0 st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size: 208 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 0 flags:0 ts: 2.153333 -ret: 0 st: 0 flags:0 dts: 2.160000 pts: 2.200000 pos: 325992 size: 12692 +ret: 0 st: 1 flags:1 dts: 1.794811 pts: 1.794811 pos: 322608 size: 209 ret: 0 st: 0 flags:1 ts: 1.047500 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 1 flags:0 ts:-0.058333 -ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159988 size: 208 +ret: 0 st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size: 208 ret: 0 st: 1 flags:1 ts: 2.835833 -ret: 0 st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404576 size: 209 +ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 404576 size: 209 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:0 dts: 1.760000 pts: 1.800000 pos: 162996 size: 12135 +ret: 0 st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size: 208 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 0 flags:0 ts:-0.481667 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 0 flags:1 ts: 2.412500 -ret: 0 st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404576 size: 209 +ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 404576 size: 209 ret: 0 st: 1 flags:0 ts: 1.306667 -ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159988 size: 208 +ret: 0 st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size: 208 ret: 0 st: 1 flags:1 ts: 0.200844 -ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159988 size: 208 +ret: 0 st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:0 dts: 1.960000 pts: 2.000000 pos: 251356 size: 13449 +ret: 0 st: 0 flags:0 dts: 1.960000 pts: 2.000000 pos: 235000 size: 15019 ret: 0 st: 0 flags:0 ts: 0.883344 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 0 flags:1 ts:-0.222489 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 1 flags:0 ts: 2.671678 -ret: 0 st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404576 size: 209 +ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 404576 size: 209 ret: 0 st: 1 flags:1 ts: 1.565844 -ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159988 size: 208 +ret: 0 st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size: 208 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 diff --git a/tests/ref/seek/lavf-wtv b/tests/ref/seek/lavf-wtv index 67def8a..71703c5 100644 --- a/tests/ref/seek/lavf-wtv +++ b/tests/ref/seek/lavf-wtv @@ -1,48 +1,48 @@ -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26344 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26344 size: 208 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size: 209 ret: 0 st: 0 flags:0 ts: 0.788334 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size: 209 ret: 0 st: 0 flags:1 ts:-0.317499 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26344 size: 208 ret:-1 st: 1 flags:0 ts: 2.576668 ret: 0 st: 1 flags:1 ts: 1.470835 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26344 size: 208 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26344 size: 208 ret:-1 st: 0 flags:0 ts: 2.153336 ret: 0 st: 0 flags:1 ts: 1.047503 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26344 size: 208 ret: 0 st: 1 flags:0 ts:-0.058330 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26344 size: 208 ret: 0 st: 1 flags:1 ts: 2.835837 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size: 209 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26344 size: 208 ret: 0 st: 0 flags:0 ts:-0.481662 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26344 size: 208 ret: 0 st: 0 flags:1 ts: 2.412505 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size: 209 ret:-1 st: 1 flags:0 ts: 1.306672 ret: 0 st: 1 flags:1 ts: 0.200839 -ret: 0 st: 1 flags:1 dts: 0.224195 pts: 0.224195 pos: 112904 size: 209 +ret: 0 st: 1 flags:1 dts: 0.211950 pts: 0.211950 pos: 99352 size: 209 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26344 size: 208 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size: 209 ret: 0 st: 0 flags:0 ts: 0.883340 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size: 209 ret: 0 st: 0 flags:1 ts:-0.222493 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26344 size: 208 ret:-1 st: 1 flags:0 ts: 2.671674 ret: 0 st: 1 flags:1 ts: 1.565841 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26344 size: 208 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26344 size: 208

3 2

ff_gen_search: Fix finding the maximum timestamp in a really small file
by git＠videolan.org 30 May '13

30 May '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Feb 18 20:18:19 2013 +0100| [6cd650dbd2bea006e1c4b70456f6d9eb7f638922] | committer: Michael Niedermayer ff_gen_search: Fix finding the maximum timestamp in a really small file Fixes Assertion failure Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6cd650dbd2bea006e… --- libavformat/utils.c | 4 ++-- tests/ref/seek/lavf-ogg | 54 +++++++++++++++++++++++++++++++---------------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index d59a02d..a4218db 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1863,10 +1863,10 @@ int64_t ff_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts, filesize = avio_size(s->pb); pos_max = filesize - 1; do{ - pos_max -= step; + pos_max = FFMAX(0, pos_max - step); ts_max = ff_read_timestamp(s, stream_index, &pos_max, pos_max + step, read_timestamp); step += step; - }while(ts_max == AV_NOPTS_VALUE && pos_max >= step); + }while(ts_max == AV_NOPTS_VALUE && pos_max > 0); if (ts_max == AV_NOPTS_VALUE) return -1; diff --git a/tests/ref/seek/lavf-ogg b/tests/ref/seek/lavf-ogg index 2898d10..583526e 100644 --- a/tests/ref/seek/lavf-ogg +++ b/tests/ref/seek/lavf-ogg @@ -1,35 +1,53 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st:-1 flags:1 ts: 1.894167 -ret:-1 st: 0 flags:0 ts: 0.788345 +ret: 0 st:-1 flags:1 ts: 1.894167 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st: 0 flags:0 ts: 0.788345 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:1 ts:-0.317506 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st:-1 flags:0 ts: 2.576668 -ret:-1 st:-1 flags:1 ts: 1.470835 -ret:-1 st: 0 flags:0 ts: 0.365011 +ret: 0 st:-1 flags:0 ts: 2.576668 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:1 ts: 1.470835 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st: 0 flags:0 ts: 0.365011 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:1 ts:-0.740839 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st:-1 flags:0 ts: 2.153336 -ret:-1 st:-1 flags:1 ts: 1.047503 +ret: 0 st:-1 flags:0 ts: 2.153336 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:1 ts: 1.047503 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:0 ts:-0.058322 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st: 0 flags:1 ts: 2.835828 -ret:-1 st:-1 flags:0 ts: 1.730004 -ret:-1 st:-1 flags:1 ts: 0.624171 +ret: 0 st: 0 flags:1 ts: 2.835828 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:0 ts: 1.730004 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:1 ts: 0.624171 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:0 ts:-0.481655 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st: 0 flags:1 ts: 2.412494 -ret:-1 st:-1 flags:0 ts: 1.306672 -ret:-1 st:-1 flags:1 ts: 0.200839 +ret: 0 st: 0 flags:1 ts: 2.412494 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:0 ts: 1.306672 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:1 ts: 0.200839 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st: 0 flags:1 ts: 1.989184 -ret:-1 st:-1 flags:0 ts: 0.883340 +ret: 0 st: 0 flags:1 ts: 1.989184 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:0 ts: 0.883340 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st:-1 flags:1 ts:-0.222493 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st: 0 flags:0 ts: 2.671678 -ret:-1 st: 0 flags:1 ts: 1.565850 -ret:-1 st:-1 flags:0 ts: 0.460008 +ret: 0 st: 0 flags:0 ts: 2.671678 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st: 0 flags:1 ts: 1.565850 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:0 ts: 0.460008 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st:-1 flags:1 ts:-0.645825 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364

2 1

h264: Use the correct croping values.
by git＠videolan.org 30 Apr '13

30 Apr '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Apr 30 23:51:30 2013 +0200| [fbaf75b166cd067cf383a75ffcccb1e2b370bf6d] | committer: Michael Niedermayer h264: Use the correct croping values. This fixes returning pictures with corrupted data pointers. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbaf75b166cd067cf… --- libavcodec/h264.c | 19 +++++++++++++------ libavcodec/mpegvideo.h | 4 ++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 03b6bda..05623fc 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -275,6 +275,9 @@ static int ref_picture(H264Context *h, Picture *dst, Picture *src) dst->needs_realloc = src->needs_realloc; dst->reference = src->reference; dst->sync = src->sync; + dst->crop = src->crop; + dst->crop_left = src->crop_left; + dst->crop_top = src->crop_top; return 0; fail: @@ -349,6 +352,9 @@ static int alloc_picture(H264Context *h, Picture *pic) h->linesize = pic->f.linesize[0]; h->uvlinesize = pic->f.linesize[1]; + pic->crop = h->sps.crop; + pic->crop_top = h->sps.crop_top; + pic->crop_left= h->sps.crop_left; if (h->avctx->hwaccel) { const AVHWAccel *hwaccel = h->avctx->hwaccel; @@ -4843,21 +4849,22 @@ static int get_consumed_bytes(int pos, int buf_size) return pos; } -static int output_frame(H264Context *h, AVFrame *dst, AVFrame *src) +static int output_frame(H264Context *h, AVFrame *dst, Picture *srcp) { + AVFrame *src = &srcp->f; int i; int ret = av_frame_ref(dst, src); if (ret < 0) return ret; - if (!h->sps.crop) + if (!srcp->crop) return 0; for (i = 0; i < 3; i++) { int hshift = (i > 0) ? h->chroma_x_shift : 0; int vshift = (i > 0) ? h->chroma_y_shift : 0; - int off = ((h->sps.crop_left >> hshift) << h->pixel_shift) + - (h->sps.crop_top >> vshift) * dst->linesize[i]; + int off = ((srcp->crop_left >> hshift) << h->pixel_shift) + + (srcp->crop_top >> vshift) * dst->linesize[i]; dst->data[i] += off; } return 0; @@ -4902,7 +4909,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, if (out) { out->reference &= ~DELAYED_PIC_REF; - ret = output_frame(h, pict, &out->f); + ret = output_frame(h, pict, out); if (ret < 0) return ret; *got_frame = 1; @@ -4960,7 +4967,7 @@ not_extra: /* Wait for second field. */ *got_frame = 0; if (h->next_output_pic && (h->next_output_pic->sync || h->sync>1)) { - ret = output_frame(h, pict, &h->next_output_pic->f); + ret = output_frame(h, pict, h->next_output_pic); if (ret < 0) return ret; *got_frame = 1; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 30255f5..4fd01ae 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -177,6 +177,10 @@ typedef struct Picture{ int reference; int shared; + + int crop; + int crop_left; + int crop_top; } Picture; /**

1 0

h264: assert that croping values at slice level are consistent
by git＠videolan.org 30 Apr '13

30 Apr '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Apr 30 23:49:56 2013 +0200| [5299ee54a73ff1c4d4a4a3ee7b84dae2ffb2fb5f] | committer: Michael Niedermayer h264: assert that croping values at slice level are consistent These values where checked before already. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5299ee54a73ff1c4d… --- libavcodec/h264.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 502ee92..03b6bda 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3055,6 +3055,8 @@ static int init_dimensions(H264Context *h) { int width = h->width - (h->sps.crop_right + h->sps.crop_left); int height = h->height - (h->sps.crop_top + h->sps.crop_bottom); + av_assert0(h->sps.crop_right + h->sps.crop_left < (unsigned)h->width); + av_assert0(h->sps.crop_top + h->sps.crop_bottom < (unsigned)h->height); /* handle container cropping */ if (!h->sps.crop &&

1 0

h264_ps: check croping values
by git＠videolan.org 30 Apr '13

30 Apr '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Apr 30 23:48:53 2013 +0200| [c3bd306e78f9e3ca2f136f5b30cbe49fa0884f82] | committer: Michael Niedermayer h264_ps: check croping values Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3bd306e78f9e3ca2… --- libavcodec/h264_ps.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 68f504a..6172fdd 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -463,6 +463,8 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ int crop_right = get_ue_golomb(&h->gb); int crop_top = get_ue_golomb(&h->gb); int crop_bottom = get_ue_golomb(&h->gb); + int width = 16 * sps->mb_width; + int height = 16 * sps->mb_height * (2 - sps->frame_mbs_only_flag); if (h->avctx->flags2 & CODEC_FLAG2_IGNORE_CROP) { av_log(h->avctx, AV_LOG_DEBUG, "discarding sps cropping, original " @@ -487,6 +489,17 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ crop_left); } + if (crop_left > (unsigned)INT_MAX / 4 / step_x || + crop_right > (unsigned)INT_MAX / 4 / step_x || + crop_top > (unsigned)INT_MAX / 4 / step_y || + crop_bottom> (unsigned)INT_MAX / 4 / step_y || + (crop_left + crop_right ) * step_x >= width || + (crop_top + crop_bottom) * step_y >= height + ) { + av_log(h->avctx, AV_LOG_ERROR, "crop values invalid %d %d %d %d / %d %d\n", crop_left, crop_right, crop_top, crop_bottom, width, height); + goto fail; + } + sps->crop_left = crop_left * step_x; sps->crop_right = crop_right * step_x; sps->crop_top = crop_top * step_y;

1 0

avutil/log: Fix context pointer used for get_category()
by git＠videolan.org 30 Apr '13

30 Apr '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Apr 30 20:05:31 2013 +0200| [7edb984dd051b6919d7d8471c70499273f31b0fa] | committer: Michael Niedermayer avutil/log: Fix context pointer used for get_category() Fixes calling a random pointer Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7edb984dd051b6919… --- libavutil/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/log.c b/libavutil/log.c index f29345b..15ff5f8 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -180,7 +180,7 @@ static void format_line(void *ptr, int level, const char *fmt, va_list vl, if (parent && *parent) { snprintf(part[0], part_size, "[%s @ %p] ", (*parent)->item_name(parent), parent); - if(type) type[0] = get_category(((uint8_t *) ptr) + avc->parent_log_context_offset); + if(type) type[0] = get_category(parent); } } snprintf(part[1], part_size, "[%s @ %p] ",

1 0

[ffmpeg-web] branch master updated. 5df207c web/about: add useless libavfilter
by ffmpeg-cvslog＠ffmpeg.org 30 Apr '13

30 Apr '13

The branch, master has been updated via 5df207c51b0e6eac435090a580dfaaf7f2a3114f (commit) from 682521687217016512e143c89ffa7515e5ed8fa1 (commit) - Log ----------------------------------------------------------------- commit 5df207c51b0e6eac435090a580dfaaf7f2a3114f Author: Paul B Mahol <onemda(a)gmail.com> AuthorDate: Tue Apr 30 11:31:15 2013 +0000 Commit: Michael Niedermayer <michaelni(a)gmx.at> CommitDate: Tue Apr 30 15:37:52 2013 +0200 web/about: add useless libavfilter Signed-off-by: Paul B Mahol <onemda(a)gmail.com> diff --git a/src/about b/src/about index 8fe21eb..59a5d36 100644 --- a/src/about +++ b/src/about @@ -5,7 +5,7 @@ transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. -It contains libavcodec, libavutil, libavformat, libavdevice, +It contains libavcodec, libavutil, libavformat, libavfilter, libavdevice, libswscale and libswresample which can be used by applications. As well as ffmpeg, ffserver, ffplay and ffprobe which can be used by end users for transcoding, streaming and playing ----------------------------------------------------------------------- Summary of changes: src/about | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive --

1 0

gif: Fix little endian specific code
by git＠videolan.org 30 Apr '13

30 Apr '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Apr 30 13:13:40 2013 +0200| [53efb2fa09c0ae966e4afa88294130c841b2cf55] | committer: Michael Niedermayer gif: Fix little endian specific code Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53efb2fa09c0ae966… --- libavcodec/gif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/gif.c b/libavcodec/gif.c index 52c1d44..7a5e287 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -163,7 +163,7 @@ static int gif_image_write_image(AVCodecContext *avctx, if (!pal_exdata) return AVERROR(ENOMEM); memcpy(pal_exdata, s->palette, AVPALETTE_SIZE); - pal_exdata[trans*4 + 3] = 0x00; + pal_exdata[trans*4 + 3*!HAVE_BIGENDIAN] = 0x00; } }

1 0

framecrcenc: workaround design flaw in sidedata palette
by git＠videolan.org 30 Apr '13

30 Apr '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Apr 30 11:44:13 2013 +0200| [147a45fca4d8c918714b550048786a9d27e40e43] | committer: Michael Niedermayer framecrcenc: workaround design flaw in sidedata palette This should be reverted once palettes are dealt with in a endian independant way in packets Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=147a45fca4d8c9187… --- libavformat/framecrcenc.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c index f63113b..dbe49b5 100644 --- a/libavformat/framecrcenc.c +++ b/libavformat/framecrcenc.c @@ -34,13 +34,22 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) if (pkt->flags != AV_PKT_FLAG_KEY) av_strlcatf(buf, sizeof(buf), ", F=0x%0X", pkt->flags); if (pkt->side_data_elems) { - int i; + int i, j; av_strlcatf(buf, sizeof(buf), ", S=%d", pkt->side_data_elems); for (i=0; i<pkt->side_data_elems; i++) { - uint32_t side_data_crc = av_adler32_update(0, - pkt->side_data[i].data, - pkt->side_data[i].size); + uint32_t side_data_crc = 0; + if (HAVE_BIGENDIAN && AV_PKT_DATA_PALETTE == pkt->side_data[i].type) { + for (j=0; j<pkt->side_data[i].size; j++) { + side_data_crc = av_adler32_update(side_data_crc, + pkt->side_data[i].data + (j^3), + 1); + } + } else { + side_data_crc = av_adler32_update(0, + pkt->side_data[i].data, + pkt->side_data[i].size); + } av_strlcatf(buf, sizeof(buf), ", %8d, 0x%08x", pkt->side_data[i].size, side_data_crc); } }

1 0

fate: add test for separatefields filter
by git＠videolan.org 30 Apr '13

30 Apr '13

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Apr 30 10:22:16 2013 +0000| [a0adeb1f9f9bd28138edda4929753e8ea0aa7da0] | committer: Paul B Mahol fate: add test for separatefields filter Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0adeb1f9f9bd2813… --- tests/fate/filter-video.mak | 3 + tests/ref/fate/filter-separatefields | 101 ++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 2dd25f3..47f3684 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -61,6 +61,9 @@ fate-filter-overlay_yuv420: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv444 fate-filter-overlay_yuv444: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay_yuv444 +FATE_FILTER_VSYNTH-$(CONFIG_SEPARATEFIELDS_FILTER) += fate-filter-separatefields +fate-filter-separatefields: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf separatefields + FATE_FILTER_VSYNTH-$(call ALLYES, SETPTS_FILTER SETTB_FILTER) += fate-filter-setpts fate-filter-setpts: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(SRC_PATH)/tests/filtergraphs/setpts diff --git a/tests/ref/fate/filter-separatefields b/tests/ref/fate/filter-separatefields new file mode 100644 index 0000000..46cb470 --- /dev/null +++ b/tests/ref/fate/filter-separatefields @@ -0,0 +1,101 @@ +#tb 0: 1/50 +0, 0, 0, 1, 76032, 0x99276ab9 +0, 1, 1, 1, 76032, 0x0b071f36 +0, 2, 2, 1, 76032, 0x8b03b0e8 +0, 3, 3, 1, 76032, 0x3e10b45a +0, 4, 4, 1, 76032, 0x67a27817 +0, 5, 5, 1, 76032, 0xb3537e33 +0, 6, 6, 1, 76032, 0xc4e78689 +0, 7, 7, 1, 76032, 0x5f11fa18 +0, 8, 8, 1, 76032, 0x7867f720 +0, 9, 9, 1, 76032, 0xb584bf23 +0, 10, 10, 1, 76032, 0x7c4ae6cf +0, 11, 11, 1, 76032, 0x4b43c208 +0, 12, 12, 1, 76032, 0x974d3882 +0, 13, 13, 1, 76032, 0xfb0543a1 +0, 14, 14, 1, 76032, 0x91da8418 +0, 15, 15, 1, 76032, 0x45260794 +0, 16, 16, 1, 76032, 0xe65397d0 +0, 17, 17, 1, 76032, 0xfa09e847 +0, 18, 18, 1, 76032, 0x3adcfa2c +0, 19, 19, 1, 76032, 0xa0103eda +0, 20, 20, 1, 76032, 0xee821b94 +0, 21, 21, 1, 76032, 0xb8cf2bcc +0, 22, 22, 1, 76032, 0x6e50db83 +0, 23, 23, 1, 76032, 0x2cd12152 +0, 24, 24, 1, 76032, 0x482961d0 +0, 25, 25, 1, 76032, 0x9a304b91 +0, 26, 26, 1, 76032, 0x2591f07b +0, 27, 27, 1, 76032, 0x1410b199 +0, 28, 28, 1, 76032, 0x1fc9c234 +0, 29, 29, 1, 76032, 0x4a8dcb9a +0, 30, 30, 1, 76032, 0xda4b81c7 +0, 31, 31, 1, 76032, 0x45ef8d2f +0, 32, 32, 1, 76032, 0x07fda976 +0, 33, 33, 1, 76032, 0x19cfa493 +0, 34, 34, 1, 76032, 0xdb453b41 +0, 35, 35, 1, 76032, 0xeebefd78 +0, 36, 36, 1, 76032, 0xdb7830bf +0, 37, 37, 1, 76032, 0x1bc13a0d +0, 38, 38, 1, 76032, 0xf811e6af +0, 39, 39, 1, 76032, 0x5bb6f541 +0, 40, 40, 1, 76032, 0xadfc0b2a +0, 41, 41, 1, 76032, 0x473fea46 +0, 42, 42, 1, 76032, 0xc4541cec +0, 43, 43, 1, 76032, 0x5e500726 +0, 44, 44, 1, 76032, 0x54df18fa +0, 45, 45, 1, 76032, 0x6470045f +0, 46, 46, 1, 76032, 0x01139a0b +0, 47, 47, 1, 76032, 0x8690ced5 +0, 48, 48, 1, 76032, 0x9796b3f0 +0, 49, 49, 1, 76032, 0x1bee45e6 +0, 50, 50, 1, 76032, 0xacf4c872 +0, 51, 51, 1, 76032, 0x0183d0b5 +0, 52, 52, 1, 76032, 0xeea54bf9 +0, 53, 53, 1, 76032, 0xb42d4abc +0, 54, 54, 1, 76032, 0x8be07d8b +0, 55, 55, 1, 76032, 0x9ac75afc +0, 56, 56, 1, 76032, 0x96bd3717 +0, 57, 57, 1, 76032, 0xbcca6d3e +0, 58, 58, 1, 76032, 0x3e2edf44 +0, 59, 59, 1, 76032, 0x1b1385bb +0, 60, 60, 1, 76032, 0xd4c2d759 +0, 61, 61, 1, 76032, 0x67119362 +0, 62, 62, 1, 76032, 0x96327b89 +0, 63, 63, 1, 76032, 0x9b914995 +0, 64, 64, 1, 76032, 0xf1d024b9 +0, 65, 65, 1, 76032, 0xd0e1d7d4 +0, 66, 66, 1, 76032, 0x11e97010 +0, 67, 67, 1, 76032, 0x0ab90a20 +0, 68, 68, 1, 76032, 0xf7ce7e72 +0, 69, 69, 1, 76032, 0x6edec4f7 +0, 70, 70, 1, 76032, 0xbb96a608 +0, 71, 71, 1, 76032, 0x8502eee4 +0, 72, 72, 1, 76032, 0xc27994cb +0, 73, 73, 1, 76032, 0x6dbba2d1 +0, 74, 74, 1, 76032, 0xe85e04f8 +0, 75, 75, 1, 76032, 0x4bbbfcf1 +0, 76, 76, 1, 76032, 0x8b5a2465 +0, 77, 77, 1, 76032, 0x8a5434e7 +0, 78, 78, 1, 76032, 0xc34578d9 +0, 79, 79, 1, 76032, 0xc2f0d5f5 +0, 80, 80, 1, 76032, 0x90bd2102 +0, 81, 81, 1, 76032, 0xafda3823 +0, 82, 82, 1, 76032, 0x66972a74 +0, 83, 83, 1, 76032, 0xc9d17394 +0, 84, 84, 1, 76032, 0x961cdc22 +0, 85, 85, 1, 76032, 0x6816e378 +0, 86, 86, 1, 76032, 0x4c383925 +0, 87, 87, 1, 76032, 0xf522e7b8 +0, 88, 88, 1, 76032, 0xc1616f33 +0, 89, 89, 1, 76032, 0xad14952f +0, 90, 90, 1, 76032, 0xe4e11fcd +0, 91, 91, 1, 76032, 0xca655ea6 +0, 92, 92, 1, 76032, 0x7b18f45f +0, 93, 93, 1, 76032, 0xb2325f91 +0, 94, 94, 1, 76032, 0xb08d7400 +0, 95, 95, 1, 76032, 0x74ec51c2 +0, 96, 96, 1, 76032, 0xc15a0713 +0, 97, 97, 1, 76032, 0x3838ad70 +0, 98, 98, 1, 76032, 0x74b6bc3f +0, 99, 99, 1, 76032, 0x29f41cab

1 0