May 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

tta: stop checking header checksum in extradata
by git＠videolan.org 31 May '13

31 May '13

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri May 31 21:07:08 2013 +0000| [710940bec16869ff7e07562f1e103e28a84ca316] | committer: Paul B Mahol tta: stop checking header checksum in extradata It's redundant now as check in done in demuxer instead. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=710940bec16869ff7… --- libavcodec/tta.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 0de3fe9..2e27093 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -207,14 +207,10 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) if (avctx->extradata_size < 22) return AVERROR_INVALIDDATA; + s->crc_table = av_crc_get_table(AV_CRC_32_IEEE_LE); init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size * 8); if (show_bits_long(&s->gb, 32) == AV_RL32("TTA1")) { - if (avctx->err_recognition & AV_EF_CRCCHECK) { - s->crc_table = av_crc_get_table(AV_CRC_32_IEEE_LE); - tta_check_crc(s, avctx->extradata, 18); - } - /* signature */ skip_bits_long(&s->gb, 32);

1 0

lavf/tta: check header and seek table checksum
by git＠videolan.org 31 May '13

31 May '13

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri May 31 17:27:53 2013 -0300| [6510686c16633339b7f23236abd2c32a62424ba2] | committer: Paul B Mahol lavf/tta: check header and seek table checksum Since we don't check for seek table integrity in the decoder anymore, check it in the demuxer instead (Only tta files are guaranteed to have one, and it should be valid there). Check also for header integrity, since the check done in the decoder is ignored because matroska doesn't store the header at all. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6510686c16633339b… --- libavformat/tta.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/libavformat/tta.c b/libavformat/tta.c index cb04ff4..f6b8a88 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -21,8 +21,10 @@ #include "libavcodec/get_bits.h" #include "avformat.h" +#include "avio_internal.h" #include "internal.h" #include "id3v1.h" +#include "libavutil/crc.h" #include "libavutil/dict.h" typedef struct { @@ -31,6 +33,12 @@ typedef struct { int last_frame_size; } TTAContext; +static unsigned long tta_check_crc(unsigned long checksum, const uint8_t *buf, + unsigned int len) +{ + return av_crc(av_crc_get_table(AV_CRC_32_IEEE_LE), checksum, buf, len); +} + static int tta_probe(AVProbeData *p) { if (AV_RL32(&p->buf[0]) == MKTAG('T', 'T', 'A', '1') && @@ -48,12 +56,13 @@ static int tta_read_header(AVFormatContext *s) AVStream *st; int i, channels, bps, samplerate; uint64_t framepos, start_offset; - uint32_t datalen; + uint32_t datalen, crc; if (!av_dict_get(s->metadata, "", NULL, AV_DICT_IGNORE_SUFFIX)) ff_id3v1_read(s); start_offset = avio_tell(s->pb); + ffio_init_checksum(s->pb, tta_check_crc, UINT32_MAX); if (avio_rl32(s->pb) != AV_RL32("TTA1")) return -1; // not tta file @@ -72,7 +81,11 @@ static int tta_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } - avio_skip(s->pb, 4); // header crc + crc = ffio_get_checksum(s->pb) ^ UINT32_MAX; + if (crc != avio_rl32(s->pb)) { + av_log(s, AV_LOG_ERROR, "Header CRC error\n"); + return AVERROR_INVALIDDATA; + } c->frame_size = samplerate * 256 / 245; c->last_frame_size = datalen % c->frame_size; @@ -106,13 +119,18 @@ static int tta_read_header(AVFormatContext *s) avio_seek(s->pb, start_offset, SEEK_SET); avio_read(s->pb, st->codec->extradata, st->codec->extradata_size); + ffio_init_checksum(s->pb, tta_check_crc, UINT32_MAX); for (i = 0; i < c->totalframes; i++) { uint32_t size = avio_rl32(s->pb); av_add_index_entry(st, framepos, i * c->frame_size, size, 0, AVINDEX_KEYFRAME); framepos += size; } - avio_skip(s->pb, 4); // seektable crc + crc = ffio_get_checksum(s->pb) ^ UINT32_MAX; + if (crc != avio_rl32(s->pb)) { + av_log(s, AV_LOG_ERROR, "Seek table CRC error\n"); + return AVERROR_INVALIDDATA; + } st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = AV_CODEC_ID_TTA;

1 0

ftp: enhanced error handling
by git＠videolan.org 31 May '13

31 May '13

ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki(a)gmail.com> | Fri May 31 14:38:49 2013 +0200| [ddbcc48b646737c8bff7f8e28e0a69dca65509cf] | committer: Lukasz Marek ftp: enhanced error handling Add error codes to expected codes to make responses faster. Success of a command is validated by comparing code to a success code. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddbcc48b646737c8b… --- libavformat/ftp.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavformat/ftp.c b/libavformat/ftp.c index d80fd69..cd3006b 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -234,8 +234,8 @@ static int ftp_auth(FTPContext *s) const char *user = NULL, *pass = NULL; char *end = NULL, buf[CONTROL_BUFFER_SIZE], credencials[CREDENTIALS_BUFFER_SIZE]; int err; - const int user_codes[] = {331, 230, 0}; - const int pass_codes[] = {230, 0}; + const int user_codes[] = {331, 230, 500, 530, 0}; /* 500, 530 are incorrect codes */ + const int pass_codes[] = {230, 503, 530, 0}; /* 503, 530 are incorrect codes */ /* Authentication may be repeated, original string has to be saved */ av_strlcpy(credencials, s->credencials, sizeof(credencials)); @@ -257,7 +257,7 @@ static int ftp_auth(FTPContext *s) } else return AVERROR(EACCES); } - if (!err) + if (err != 230) return AVERROR(EACCES); return 0; @@ -268,9 +268,9 @@ static int ftp_passive_mode(FTPContext *s) char *res = NULL, *start, *end; int i; const char *command = "PASV\r\n"; - const int pasv_codes[] = {227, 0}; + const int pasv_codes[] = {227, 501, 0}; /* 501 is incorrect code */ - if (!ftp_send_command(s, command, pasv_codes, &res)) + if (ftp_send_command(s, command, pasv_codes, &res) != 227 || !res) goto fail; start = NULL; @@ -317,7 +317,7 @@ static int ftp_current_dir(FTPContext *s) const char *command = "PWD\r\n"; const int pwd_codes[] = {257, 0}; - if (!ftp_send_command(s, command, pwd_codes, &res)) + if (ftp_send_command(s, command, pwd_codes, &res) != 257 || !res) goto fail; for (i = 0; res[i]; ++i) { @@ -352,10 +352,10 @@ static int ftp_file_size(FTPContext *s) { char command[CONTROL_BUFFER_SIZE]; char *res = NULL; - const int size_codes[] = {213, 0}; + const int size_codes[] = {213, 501, 550, 0}; /* 501, 550 are incorrect codes */ snprintf(command, sizeof(command), "SIZE %s\r\n", s->path); - if (ftp_send_command(s, command, size_codes, &res)) { + if (ftp_send_command(s, command, size_codes, &res) == 213 && res) { s->filesize = strtoll(&res[4], NULL, 10); } else { s->filesize = -1; @@ -370,10 +370,10 @@ static int ftp_file_size(FTPContext *s) static int ftp_retrieve(FTPContext *s) { char command[CONTROL_BUFFER_SIZE]; - const int retr_codes[] = {150, 0}; + const int retr_codes[] = {150, 550, 0}; /* 550 is incorrect code */ snprintf(command, sizeof(command), "RETR %s\r\n", s->path); - if (!ftp_send_command(s, command, retr_codes, NULL)) + if (ftp_send_command(s, command, retr_codes, NULL) != 150) return AVERROR(EIO); s->state = DOWNLOADING; @@ -398,9 +398,9 @@ static int ftp_store(FTPContext *s) static int ftp_type(FTPContext *s) { const char *command = "TYPE I\r\n"; - const int type_codes[] = {200, 0}; + const int type_codes[] = {200, 500, 504, 0}; /* 500, 504 are incorrect codes */ - if (!ftp_send_command(s, command, type_codes, NULL)) + if (ftp_send_command(s, command, type_codes, NULL) != 200) return AVERROR(EIO); return 0; @@ -409,10 +409,10 @@ static int ftp_type(FTPContext *s) static int ftp_restart(FTPContext *s, int64_t pos) { char command[CONTROL_BUFFER_SIZE]; - const int rest_codes[] = {350, 0}; + const int rest_codes[] = {350, 501, 0}; /* 501 is incorrect code */ snprintf(command, sizeof(command), "REST %"PRId64"\r\n", pos); - if (!ftp_send_command(s, command, rest_codes, NULL)) + if (ftp_send_command(s, command, rest_codes, NULL) != 350) return AVERROR(EIO); return 0; @@ -439,7 +439,7 @@ static int ftp_connect_control_connection(URLContext *h) &s->conn_control_interrupt_cb, &opts); av_dict_free(&opts); if (err < 0) { - av_dlog(h, "Cannot open control connection, error %d\n", err); + av_log(h, AV_LOG_ERROR, "Cannot open control connection\n"); return err; }

1 0

Merge remote-tracking branch 'lukaszmluki/master'
by git＠videolan.org 31 May '13

31 May '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri May 31 18:37:22 2013 +0200| [f70d0212ce13347395eb5643bab9fba4dd8e2ee3] | committer: Michael Niedermayer Merge remote-tracking branch 'lukaszmluki/master' * lukaszmluki/master: ftp: enhanced error handling ftp: reconnect on seek ftp: move common commands code to function ftp: enhanced status code handling ftp: reconnect on read ftp: move create control connection to function ftp: credentials moved into FTPContext ftp: rename function name ftp: formatting and typos fixes Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f70d0212ce1334739… ---

1 0

ftp: reconnect on seek
by git＠videolan.org 31 May '13

31 May '13

ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki(a)gmail.com> | Thu May 30 03:17:23 2013 +0200| [34c423894ceba8c28780de444e2b07047daf1c60] | committer: Lukasz Marek ftp: reconnect on seek ABOR command usually takes long (FTP server implementation dependent). It also produces different response codes from different servers. It is save for ffmpeg to reconnect both connection during seek for two reasons: 1. Alreay mentioned heavy manner of ABOR command. 2. Server may disconnected due to no transfer (seek after a long pause in ffmpeg client) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34c423894ceba8c28… --- libavformat/ftp.c | 104 +++++++++++++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 56 deletions(-) diff --git a/libavformat/ftp.c b/libavformat/ftp.c index 692c923..d80fd69 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -221,6 +221,14 @@ static int ftp_send_command(FTPContext *s, const char *command, return ftp_status(s, response, response_codes); } +static void ftp_close_both_connections(FTPContext *s) +{ + ffurl_closep(&s->conn_control); + ffurl_closep(&s->conn_data); + s->position = 0; + s->state = DISCONNECTED; +} + static int ftp_auth(FTPContext *s) { const char *user = NULL, *pass = NULL; @@ -398,29 +406,6 @@ static int ftp_type(FTPContext *s) return 0; } -static int ftp_abort(FTPContext *s) -{ - int err; - const char *command = "ABOR\r\n"; - const int abor_codes[] = {225, 226, 0}; - - if ((err = ftp_flush_control_input(s)) < 0) - return err; - - if (s->state == DOWNLOADING) { - s->conn_control_block_flag = 0; - if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0) - return err; - } - ffurl_closep(&s->conn_data); - s->state = DISCONNECTED; - - if (!ftp_status(s, NULL, abor_codes)) - return AVERROR(EIO); - - return 0; -} - static int ftp_restart(FTPContext *s, int64_t pos) { char command[CONTROL_BUFFER_SIZE]; @@ -502,9 +487,21 @@ static int ftp_connect_data_connection(URLContext *h) av_dict_free(&opts); if (err < 0) return err; + + if (s->position) + if ((err = ftp_restart(s, s->position)) < 0) + return err; } s->state = READY; - s->position = 0; + return 0; +} + +static int ftp_abort(URLContext *h) +{ + int err; + ftp_close_both_connections(h->priv_data); + if ((err = ftp_connect_control_connection(h)) < 0) + return err; return 0; } @@ -518,6 +515,7 @@ static int ftp_open(URLContext *h, const char *url, int flags) s->state = DISCONNECTED; s->filesize = -1; + s->position = 0; s->conn_control_interrupt_cb.opaque = s; s->conn_control_interrupt_cb.callback = ftp_conn_control_block_control; @@ -543,10 +541,8 @@ static int ftp_open(URLContext *h, const char *url, int flags) if (s->write_seekable != 1 && flags & AVIO_FLAG_WRITE) h->is_streamed = 1; - if ((err = ftp_connect_data_connection(h)) < 0) - goto fail; - return 0; + fail: av_log(h, AV_LOG_ERROR, "FTP open failed\n"); ffurl_closep(&s->conn_control); @@ -583,23 +579,15 @@ static int64_t ftp_seek(URLContext *h, int64_t pos, int whence) if (h->is_streamed) return AVERROR(EIO); - if (new_pos < 0 || (s->filesize >= 0 && new_pos > s->filesize)) - return AVERROR(EINVAL); + new_pos = FFMAX(0, new_pos); + if (s->filesize >= 0) + new_pos = FFMIN(s->filesize, new_pos); if (new_pos != s->position) { - /* close existing data connection */ - if (s->state != READY) { - if (s->conn_data) { - /* abort existing transfer */ - if ((err = ftp_abort(s)) < 0) - return err; - } - /* open new data connection */ - if ((err = ftp_connect_data_connection(h)) < 0) - return err; - } - - if ((err = ftp_restart(s, new_pos)) < 0) + /* XXX: Full abort is a save solution here. + Some optimalizations are possible, but may lead to crazy states of FTP server. + The worst scenario would be when FTP server closed both connection due to no transfer. */ + if ((err = ftp_abort(h)) < 0) return err; s->position = new_pos; @@ -614,15 +602,20 @@ static int ftp_read(URLContext *h, unsigned char *buf, int size) av_dlog(h, "ftp protocol read %d bytes\n", size); retry: + if (s->state == DISCONNECTED) { + if ((err = ftp_connect_data_connection(h)) < 0) + return err; + } if (s->state == READY) { - ftp_retrieve(s); + if ((err = ftp_retrieve(s)) < 0) + return err; } if (s->conn_data && s->state == DOWNLOADING) { read = ffurl_read(s->conn_data, buf, size); if (read >= 0) { s->position += read; if (s->position >= s->filesize) { - if (ftp_abort(s) < 0) + if (ftp_abort(h) < 0) return AVERROR(EIO); } } @@ -631,16 +624,12 @@ static int ftp_read(URLContext *h, unsigned char *buf, int size) /* TODO: Consider retry before reconnect */ int64_t pos = s->position; av_log(h, AV_LOG_INFO, "Reconnect to FTP server.\n"); - ffurl_closep(&s->conn_control); - ffurl_closep(&s->conn_data); - s->position = 0; - s->state = DISCONNECTED; - if ((err = ftp_connect_control_connection(h)) < 0) { - av_log(h, AV_LOG_ERROR, "Reconnect failed\n"); + if ((err = ftp_abort(h)) < 0) { + av_log(h, AV_LOG_ERROR, "Reconnect failed.\n"); return err; } if ((err = ftp_seek(h, pos, SEEK_SET)) < 0) { - av_dlog(h, "Seek failed after reconnect\n"); + av_log(h, AV_LOG_ERROR, "Position cannot be restored.\n"); return err; } if (!retry_done) { @@ -657,13 +646,19 @@ static int ftp_read(URLContext *h, unsigned char *buf, int size) static int ftp_write(URLContext *h, const unsigned char *buf, int size) { + int err; FTPContext *s = h->priv_data; int written; av_dlog(h, "ftp protocol write %d bytes\n", size); + if (s->state == DISCONNECTED) { + if ((err = ftp_connect_data_connection(h)) < 0) + return err; + } if (s->state == READY) { - ftp_store(s); + if ((err = ftp_store(s)) < 0) + return err; } if (s->conn_data && s->state == UPLOADING) { written = ffurl_write(s->conn_data, buf, size); @@ -680,12 +675,9 @@ static int ftp_write(URLContext *h, const unsigned char *buf, int size) static int ftp_close(URLContext *h) { - FTPContext *s = h->priv_data; - av_dlog(h, "ftp protocol close\n"); - ffurl_closep(&s->conn_control); - ffurl_closep(&s->conn_data); + ftp_close_both_connections(h->priv_data); return 0; }

1 0

ftp: move common commands code to function
by git＠videolan.org 31 May '13

31 May '13

ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki(a)gmail.com> | Wed May 29 17:32:50 2013 +0200| [d99beeb70e08420d8e10f7396d7eaf57860d0683] | committer: Lukasz Marek ftp: move common commands code to function Each send command routine requires the same steps. This commit moves repeated code into one function. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d99beeb70e08420d8… --- libavformat/ftp.c | 105 +++++++++++++++++++---------------------------------- 1 file changed, 38 insertions(+), 67 deletions(-) diff --git a/libavformat/ftp.c b/libavformat/ftp.c index ad77adb..692c923 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -203,6 +203,24 @@ static int ftp_status(FTPContext *s, char **line, const int response_codes[]) return result; } +static int ftp_send_command(FTPContext *s, const char *command, + const int response_codes[], char **response) +{ + int err; + + /* Flush control connection input to get rid of non relevant responses if any */ + if ((err = ftp_flush_control_input(s)) < 0) + return err; + + /* send command in blocking mode */ + s->conn_control_block_flag = 0; + if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0) + return err; + + /* return status */ + return ftp_status(s, response, response_codes); +} + static int ftp_auth(FTPContext *s) { const char *user = NULL, *pass = NULL; @@ -211,9 +229,6 @@ static int ftp_auth(FTPContext *s) const int user_codes[] = {331, 230, 0}; const int pass_codes[] = {230, 0}; - if ((err = ftp_flush_control_input(s)) < 0) - return err; - /* Authentication may be repeated, original string has to be saved */ av_strlcpy(credencials, s->credencials, sizeof(credencials)); @@ -226,15 +241,11 @@ static int ftp_auth(FTPContext *s) } snprintf(buf, sizeof(buf), "USER %s\r\n", user); - if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) - return err; - err = ftp_status(s, NULL, user_codes); + err = ftp_send_command(s, buf, user_codes, NULL); if (err == 331) { if (pass) { snprintf(buf, sizeof(buf), "PASS %s\r\n", pass); - if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) - return err; - err = ftp_status(s, NULL, pass_codes); + err = ftp_send_command(s, buf, pass_codes, NULL); } else return AVERROR(EACCES); } @@ -247,16 +258,11 @@ static int ftp_auth(FTPContext *s) static int ftp_passive_mode(FTPContext *s) { char *res = NULL, *start, *end; - int err, i; + int i; const char *command = "PASV\r\n"; const int pasv_codes[] = {227, 0}; - if ((err = ftp_flush_control_input(s)) < 0) - return err; - - if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0) - return err; - if (!ftp_status(s, &res, pasv_codes)) + if (!ftp_send_command(s, command, pasv_codes, &res)) goto fail; start = NULL; @@ -299,16 +305,11 @@ static int ftp_passive_mode(FTPContext *s) static int ftp_current_dir(FTPContext *s) { char *res = NULL, *start = NULL, *end = NULL; - int err, i; + int i; const char *command = "PWD\r\n"; const int pwd_codes[] = {257, 0}; - if ((err = ftp_flush_control_input(s)) < 0) - return err; - - if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0) - return err; - if (!ftp_status(s, &res, pwd_codes)) + if (!ftp_send_command(s, command, pwd_codes, &res)) goto fail; for (i = 0; res[i]; ++i) { @@ -341,18 +342,12 @@ static int ftp_current_dir(FTPContext *s) static int ftp_file_size(FTPContext *s) { - char buf[CONTROL_BUFFER_SIZE]; - int err; + char command[CONTROL_BUFFER_SIZE]; char *res = NULL; const int size_codes[] = {213, 0}; - if ((err = ftp_flush_control_input(s)) < 0) - return err; - - snprintf(buf, sizeof(buf), "SIZE %s\r\n", s->path); - if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) - return err; - if (ftp_status(s, &res, size_codes)) { + snprintf(command, sizeof(command), "SIZE %s\r\n", s->path); + if (ftp_send_command(s, command, size_codes, &res)) { s->filesize = strtoll(&res[4], NULL, 10); } else { s->filesize = -1; @@ -366,18 +361,11 @@ static int ftp_file_size(FTPContext *s) static int ftp_retrieve(FTPContext *s) { - char buf[CONTROL_BUFFER_SIZE]; - int err; + char command[CONTROL_BUFFER_SIZE]; const int retr_codes[] = {150, 0}; - - if ((err = ftp_flush_control_input(s)) < 0) - return err; - - snprintf(buf, sizeof(buf), "RETR %s\r\n", s->path); - if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) - return err; - if (!ftp_status(s, NULL, retr_codes)) + snprintf(command, sizeof(command), "RETR %s\r\n", s->path); + if (!ftp_send_command(s, command, retr_codes, NULL)) return AVERROR(EIO); s->state = DOWNLOADING; @@ -387,17 +375,11 @@ static int ftp_retrieve(FTPContext *s) static int ftp_store(FTPContext *s) { - char buf[CONTROL_BUFFER_SIZE]; - int err; + char command[CONTROL_BUFFER_SIZE]; const int stor_codes[] = {150, 0}; - if ((err = ftp_flush_control_input(s)) < 0) - return err; - - snprintf(buf, sizeof(buf), "STOR %s\r\n", s->path); - if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) - return err; - if (!ftp_status(s, NULL, stor_codes)) + snprintf(command, sizeof(command), "STOR %s\r\n", s->path); + if (!ftp_send_command(s, command, stor_codes, NULL)) return AVERROR(EIO); s->state = UPLOADING; @@ -407,16 +389,10 @@ static int ftp_store(FTPContext *s) static int ftp_type(FTPContext *s) { - int err; const char *command = "TYPE I\r\n"; const int type_codes[] = {200, 0}; - if ((err = ftp_flush_control_input(s)) < 0) - return err; - - if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0) - return err; - if (!ftp_status(s, NULL, type_codes)) + if (!ftp_send_command(s, command, type_codes, NULL)) return AVERROR(EIO); return 0; @@ -432,6 +408,7 @@ static int ftp_abort(FTPContext *s) return err; if (s->state == DOWNLOADING) { + s->conn_control_block_flag = 0; if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0) return err; } @@ -446,17 +423,11 @@ static int ftp_abort(FTPContext *s) static int ftp_restart(FTPContext *s, int64_t pos) { - int err; - char buf[CONTROL_BUFFER_SIZE]; + char command[CONTROL_BUFFER_SIZE]; const int rest_codes[] = {350, 0}; - if ((err = ftp_flush_control_input(s)) < 0) - return err; - - snprintf(buf, sizeof(buf), "REST %"PRId64"\r\n", pos); - if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) - return err; - if (!ftp_status(s, NULL, rest_codes)) + snprintf(command, sizeof(command), "REST %"PRId64"\r\n", pos); + if (!ftp_send_command(s, command, rest_codes, NULL)) return AVERROR(EIO); return 0;

1 0

ftp: reconnect on read
by git＠videolan.org 31 May '13

31 May '13

ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki(a)gmail.com> | Mon May 27 20:53:27 2013 +0200| [1931c2d2654fc6244232d4828ebfafeb414dbb26] | committer: Lukasz Marek ftp: reconnect on read FTP server may disconnect after some period of time when no transfer is done. FTP protocol should reconnect and seek to last position. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1931c2d2654fc6244… --- libavformat/ftp.c | 125 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 52 deletions(-) diff --git a/libavformat/ftp.c b/libavformat/ftp.c index da9408a..e497c1a 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -38,7 +38,6 @@ typedef enum { DISCONNECTED } FTPState; - typedef struct { const AVClass *class; URLContext *conn_control; /**< Control connection */ @@ -499,57 +498,6 @@ static int ftp_open(URLContext *h, const char *url, int flags) return err; } -static int ftp_read(URLContext *h, unsigned char *buf, int size) -{ - FTPContext *s = h->priv_data; - int read; - - av_dlog(h, "ftp protocol read %d bytes\n", size); - - if (s->state == READY) { - ftp_retrieve(s); - } - if (s->conn_data && s->state == DOWNLOADING) { - read = ffurl_read(s->conn_data, buf, size); - if (read >= 0) { - s->position += read; - if (s->position >= s->filesize) { - ffurl_closep(&s->conn_data); - s->state = DISCONNECTED; - if (ftp_status(s, NULL, NULL, NULL,NULL, 226) != 226) - return AVERROR(EIO); - } - } - return read; - } - - av_log(h, AV_LOG_DEBUG, "FTP read failed\n"); - return AVERROR(EIO); -} - -static int ftp_write(URLContext *h, const unsigned char *buf, int size) -{ - FTPContext *s = h->priv_data; - int written; - - av_dlog(h, "ftp protocol write %d bytes\n", size); - - if (s->state == READY) { - ftp_store(s); - } - if (s->conn_data && s->state == UPLOADING) { - written = ffurl_write(s->conn_data, buf, size); - if (written > 0) { - s->position += written; - s->filesize = FFMAX(s->filesize, s->position); - } - return written; - } - - av_log(h, AV_LOG_ERROR, "FTP write failed\n"); - return AVERROR(EIO); -} - static int64_t ftp_seek(URLContext *h, int64_t pos, int whence) { FTPContext *s = h->priv_data; @@ -618,6 +566,79 @@ static int64_t ftp_seek(URLContext *h, int64_t pos, int whence) return new_pos; } +static int ftp_read(URLContext *h, unsigned char *buf, int size) +{ + FTPContext *s = h->priv_data; + int read, err, retry_done = 0; + + av_dlog(h, "ftp protocol read %d bytes\n", size); + retry: + if (s->state == READY) { + ftp_retrieve(s); + } + if (s->conn_data && s->state == DOWNLOADING) { + read = ffurl_read(s->conn_data, buf, size); + if (read >= 0) { + s->position += read; + if (s->position >= s->filesize) { + ffurl_closep(&s->conn_data); + s->state = DISCONNECTED; + if (ftp_status(s, NULL, NULL, NULL,NULL, 226) != 226) + return AVERROR(EIO); + } + } + if (!read && s->position < s->filesize && !h->is_streamed) { + /* Server closed connection. Probably due to inactivity */ + /* TODO: Consider retry before reconnect */ + int64_t pos = s->position; + av_log(h, AV_LOG_INFO, "Reconnect to FTP server.\n"); + ffurl_closep(&s->conn_control); + ffurl_closep(&s->conn_data); + s->position = 0; + s->state = DISCONNECTED; + if ((err = ftp_connect_control_connection(h)) < 0) { + av_log(h, AV_LOG_ERROR, "Reconnect failed\n"); + return err; + } + if ((err = ftp_seek(h, pos, SEEK_SET)) < 0) { + av_dlog(h, "Seek failed after reconnect\n"); + return err; + } + if (!retry_done) { + retry_done = 1; + goto retry; + } + } + return read; + } + + av_log(h, AV_LOG_DEBUG, "FTP read failed\n"); + return AVERROR(EIO); +} + +static int ftp_write(URLContext *h, const unsigned char *buf, int size) +{ + FTPContext *s = h->priv_data; + int written; + + av_dlog(h, "ftp protocol write %d bytes\n", size); + + if (s->state == READY) { + ftp_store(s); + } + if (s->conn_data && s->state == UPLOADING) { + written = ffurl_write(s->conn_data, buf, size); + if (written > 0) { + s->position += written; + s->filesize = FFMAX(s->filesize, s->position); + } + return written; + } + + av_log(h, AV_LOG_ERROR, "FTP write failed\n"); + return AVERROR(EIO); +} + static int ftp_close(URLContext *h) { FTPContext *s = h->priv_data;

1 0

ftp: enhanced status code handling
by git＠videolan.org 31 May '13

31 May '13

ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki(a)gmail.com> | Wed May 29 16:00:14 2013 +0200| [3f005218099020f38b88ed4e4fdf684759a2a096] | committer: Lukasz Marek ftp: enhanced status code handling Reimplementation of ftp_status function. New version requires explicit list of expected codes. It flush data connection input before sending a command and blocks until expected result appears. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f005218099020f38… --- libavformat/ftp.c | 214 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 141 insertions(+), 73 deletions(-) diff --git a/libavformat/ftp.c b/libavformat/ftp.c index e497c1a..ad77adb 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -20,6 +20,7 @@ #include <stdlib.h> #include "libavutil/avstring.h" +#include "libavutil/time.h" #include "avformat.h" #include "internal.h" #include "network.h" @@ -129,61 +130,75 @@ static int ftp_get_line(FTPContext *s, char *line, int line_size) } } +static int ftp_flush_control_input(FTPContext *s) +{ + char buf[CONTROL_BUFFER_SIZE]; + int err, ori_block_flag = s->conn_control_block_flag; + + s->conn_control_block_flag = 1; + do { + err = ftp_get_line(s, buf, sizeof(buf)); + } while (err > 0); + + s->conn_control_block_flag = ori_block_flag; + + if (err < 0 && err != AVERROR_EXIT) + return err; + + return 0; +} + /* * This routine returns ftp server response code. * Server may send more than one response for a certain command, following priorities are used: - * - 5xx code is returned if occurred. (means error) - * - When pref_code is set then pref_code is return if occurred. (expected result) - * - The lowest code is returned. (means success) + * - When pref_codes are set then pref_code is return if occurred. (expected result) + * - 0 is returned when no pref_codes or not occurred */ -static int ftp_status(FTPContext *s, int *major, int *minor, int *extra, char **line, int pref_code) +static int ftp_status(FTPContext *s, char **line, const int response_codes[]) { - int err, result = -1, pref_code_found = 0; + int err, i, result = 0, pref_code_found = 0, wait_count = 100; char buf[CONTROL_BUFFER_SIZE]; - unsigned char d_major, d_minor, d_extra; /* Set blocking mode */ s->conn_control_block_flag = 0; for (;;) { - if ((err = ftp_get_line(s, buf, CONTROL_BUFFER_SIZE)) < 0) { - if (err == AVERROR_EXIT) - return result; - return err; + if ((err = ftp_get_line(s, buf, sizeof(buf))) < 0) { + if (err == AVERROR_EXIT) { + if (!pref_code_found && wait_count--) { + av_usleep(10000); + continue; + } + } + return result; } - if (strlen(buf) < 3) - continue; - d_major = buf[0]; - if (d_major < '1' || d_major > '6' || d_major == '4') - continue; - d_minor = buf[1]; - if (d_minor < '0' || d_minor > '9') - continue; - d_extra = buf[2]; - if (d_extra < '0' || d_extra > '9') - continue; + /* first code received. Now get all lines in non blocking mode */ + s->conn_control_block_flag = 1; av_log(s, AV_LOG_DEBUG, "%s\n", buf); - err = d_major * 100 + d_minor * 10 + d_extra - 111 * '0'; - - if ((result < 0 || err < result || pref_code == err) && !pref_code_found || d_major == '5') { - if (pref_code == err || d_major == '5') - pref_code_found = 1; - result = err; - if (major) - *major = d_major - '0'; - if (minor) - *minor = d_minor - '0'; - if (extra) - *extra = d_extra - '0'; - if (line) - *line = av_strdup(buf); - } + if (!pref_code_found) { + if (strlen(buf) < 3) + continue; - /* first code received. Now get all lines in non blocking mode */ - if (pref_code < 0 || pref_code_found) - s->conn_control_block_flag = 1; + err = 0; + for (i = 0; i < 3; ++i) { + if (buf[i] < '0' || buf[i] > '9') + continue; + err *= 10; + err += buf[i] - '0'; + } + + for (i = 0; response_codes[i]; ++i) { + if (err == response_codes[i]) { + pref_code_found = 1; + result = err; + if (line) + *line = av_strdup(buf); + break; + } + } + } } return result; } @@ -193,6 +208,11 @@ static int ftp_auth(FTPContext *s) const char *user = NULL, *pass = NULL; char *end = NULL, buf[CONTROL_BUFFER_SIZE], credencials[CREDENTIALS_BUFFER_SIZE]; int err; + const int user_codes[] = {331, 230, 0}; + const int pass_codes[] = {230, 0}; + + if ((err = ftp_flush_control_input(s)) < 0) + return err; /* Authentication may be repeated, original string has to be saved */ av_strlcpy(credencials, s->credencials, sizeof(credencials)); @@ -208,19 +228,18 @@ static int ftp_auth(FTPContext *s) snprintf(buf, sizeof(buf), "USER %s\r\n", user); if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) return err; - ftp_status(s, &err, NULL, NULL, NULL, -1); - if (err == 3) { + err = ftp_status(s, NULL, user_codes); + if (err == 331) { if (pass) { snprintf(buf, sizeof(buf), "PASS %s\r\n", pass); if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) return err; - ftp_status(s, &err, NULL, NULL, NULL, -1); + err = ftp_status(s, NULL, pass_codes); } else return AVERROR(EACCES); } - if (err != 2) { + if (!err) return AVERROR(EACCES); - } return 0; } @@ -230,10 +249,14 @@ static int ftp_passive_mode(FTPContext *s) char *res = NULL, *start, *end; int err, i; const char *command = "PASV\r\n"; + const int pasv_codes[] = {227, 0}; + + if ((err = ftp_flush_control_input(s)) < 0) + return err; if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0) return err; - if (ftp_status(s, NULL, NULL, NULL, &res, 227) != 227) + if (!ftp_status(s, &res, pasv_codes)) goto fail; start = NULL; @@ -278,10 +301,14 @@ static int ftp_current_dir(FTPContext *s) char *res = NULL, *start = NULL, *end = NULL; int err, i; const char *command = "PWD\r\n"; + const int pwd_codes[] = {257, 0}; + + if ((err = ftp_flush_control_input(s)) < 0) + return err; if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0) return err; - if (ftp_status(s, NULL, NULL, NULL, &res, 257) != 257) + if (!ftp_status(s, &res, pwd_codes)) goto fail; for (i = 0; res[i]; ++i) { @@ -317,11 +344,15 @@ static int ftp_file_size(FTPContext *s) char buf[CONTROL_BUFFER_SIZE]; int err; char *res = NULL; + const int size_codes[] = {213, 0}; + + if ((err = ftp_flush_control_input(s)) < 0) + return err; snprintf(buf, sizeof(buf), "SIZE %s\r\n", s->path); if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) return err; - if (ftp_status(s, NULL, NULL, NULL, &res, 213) == 213) { + if (ftp_status(s, &res, size_codes)) { s->filesize = strtoll(&res[4], NULL, 10); } else { s->filesize = -1; @@ -337,11 +368,16 @@ static int ftp_retrieve(FTPContext *s) { char buf[CONTROL_BUFFER_SIZE]; int err; + const int retr_codes[] = {150, 0}; + + + if ((err = ftp_flush_control_input(s)) < 0) + return err; snprintf(buf, sizeof(buf), "RETR %s\r\n", s->path); if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) return err; - if (ftp_status(s, NULL, NULL, NULL, NULL, 150) != 150) + if (!ftp_status(s, NULL, retr_codes)) return AVERROR(EIO); s->state = DOWNLOADING; @@ -353,11 +389,15 @@ static int ftp_store(FTPContext *s) { char buf[CONTROL_BUFFER_SIZE]; int err; + const int stor_codes[] = {150, 0}; + + if ((err = ftp_flush_control_input(s)) < 0) + return err; snprintf(buf, sizeof(buf), "STOR %s\r\n", s->path); if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) return err; - if (ftp_status(s, NULL, NULL, NULL, NULL, 150) != 150) + if (!ftp_status(s, NULL, stor_codes)) return AVERROR(EIO); s->state = UPLOADING; @@ -369,10 +409,54 @@ static int ftp_type(FTPContext *s) { int err; const char *command = "TYPE I\r\n"; + const int type_codes[] = {200, 0}; + + if ((err = ftp_flush_control_input(s)) < 0) + return err; if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0) return err; - if (ftp_status(s, NULL, NULL, NULL, NULL, 200) != 200) + if (!ftp_status(s, NULL, type_codes)) + return AVERROR(EIO); + + return 0; +} + +static int ftp_abort(FTPContext *s) +{ + int err; + const char *command = "ABOR\r\n"; + const int abor_codes[] = {225, 226, 0}; + + if ((err = ftp_flush_control_input(s)) < 0) + return err; + + if (s->state == DOWNLOADING) { + if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0) + return err; + } + ffurl_closep(&s->conn_data); + s->state = DISCONNECTED; + + if (!ftp_status(s, NULL, abor_codes)) + return AVERROR(EIO); + + return 0; +} + +static int ftp_restart(FTPContext *s, int64_t pos) +{ + int err; + char buf[CONTROL_BUFFER_SIZE]; + const int rest_codes[] = {350, 0}; + + if ((err = ftp_flush_control_input(s)) < 0) + return err; + + snprintf(buf, sizeof(buf), "REST %"PRId64"\r\n", pos); + if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) + return err; + if (!ftp_status(s, NULL, rest_codes)) return AVERROR(EIO); return 0; @@ -384,6 +468,7 @@ static int ftp_connect_control_connection(URLContext *h) int err; AVDictionary *opts = NULL; FTPContext *s = h->priv_data; + const int connect_codes[] = {220, 0}; s->conn_control_block_flag = 0; @@ -403,7 +488,7 @@ static int ftp_connect_control_connection(URLContext *h) } /* consume all messages from server */ - if (ftp_status(s, NULL, NULL, NULL, NULL, 220) != 220) { + if (!ftp_status(s, NULL, connect_codes)) { av_log(h, AV_LOG_ERROR, "FTP server not ready for new users\n"); err = AVERROR(EACCES); return err; @@ -501,7 +586,6 @@ static int ftp_open(URLContext *h, const char *url, int flags) static int64_t ftp_seek(URLContext *h, int64_t pos, int whence) { FTPContext *s = h->priv_data; - char buf[CONTROL_BUFFER_SIZE]; int err; int64_t new_pos; @@ -536,32 +620,18 @@ static int64_t ftp_seek(URLContext *h, int64_t pos, int whence) if (s->state != READY) { if (s->conn_data) { /* abort existing transfer */ - if (s->state == DOWNLOADING) { - snprintf(buf, sizeof(buf), "ABOR\r\n"); - if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) - return err; - } - ffurl_closep(&s->conn_data); - s->state = DISCONNECTED; - /* Servers return 225 or 226 */ - ftp_status(s, &err, NULL, NULL, NULL, -1); - if (err != 2) - return AVERROR(EIO); + if ((err = ftp_abort(s)) < 0) + return err; } - /* open new data connection */ if ((err = ftp_connect_data_connection(h)) < 0) return err; } - /* resume from pos position */ - snprintf(buf, sizeof(buf), "REST %"PRId64"\r\n", pos); - if ((err = ffurl_write(s->conn_control, buf, strlen(buf))) < 0) + if ((err = ftp_restart(s, new_pos)) < 0) return err; - if (ftp_status(s, NULL, NULL, NULL, NULL, 350) != 350) - return AVERROR(EIO); - s->position = pos; + s->position = new_pos; } return new_pos; } @@ -581,9 +651,7 @@ static int ftp_read(URLContext *h, unsigned char *buf, int size) if (read >= 0) { s->position += read; if (s->position >= s->filesize) { - ffurl_closep(&s->conn_data); - s->state = DISCONNECTED; - if (ftp_status(s, NULL, NULL, NULL,NULL, 226) != 226) + if (ftp_abort(s) < 0) return AVERROR(EIO); } }

1 0

ftp: move create control connection to function
by git＠videolan.org 31 May '13

31 May '13

ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki(a)gmail.com> | Thu May 30 15:22:13 2013 +0200| [c84d6aa2f63f014a1c08f4adf67c462b98f68028] | committer: Lukasz Marek ftp: move create control connection to function Move common code that opens control connection to function. This code can be reused when reconnecting to FTP server after inactivity. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c84d6aa2f63f014a1… --- libavformat/ftp.c | 116 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 48 deletions(-) diff --git a/libavformat/ftp.c b/libavformat/ftp.c index 50c0929..da9408a 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -48,6 +48,7 @@ typedef struct { uint8_t control_buffer[CONTROL_BUFFER_SIZE]; /**< Control connection buffer */ uint8_t *control_buf_ptr, *control_buf_end; int server_data_port; /**< Data connection port opened by server, -1 on error. */ + int server_control_port; /**< Control connection port, default is 21 */ char hostname[512]; /**< Server address. */ char credencials[CREDENTIALS_BUFFER_SIZE]; /**< Authentication data */ char path[MAX_URL_SIZE]; /**< Path to resource on server. */ @@ -378,7 +379,51 @@ static int ftp_type(FTPContext *s) return 0; } -static int ftp_reconnect_data_connection(URLContext *h) +static int ftp_connect_control_connection(URLContext *h) +{ + char buf[CONTROL_BUFFER_SIZE], opts_format[20]; + int err; + AVDictionary *opts = NULL; + FTPContext *s = h->priv_data; + + s->conn_control_block_flag = 0; + + if (!s->conn_control) { + ff_url_join(buf, sizeof(buf), "tcp", NULL, + s->hostname, s->server_control_port, NULL); + if (s->rw_timeout != -1) { + snprintf(opts_format, sizeof(opts_format), "%d", s->rw_timeout); + av_dict_set(&opts, "timeout", opts_format, 0); + } /* if option is not given, don't pass it and let tcp use its own default */ + err = ffurl_open(&s->conn_control, buf, AVIO_FLAG_READ_WRITE, + &s->conn_control_interrupt_cb, &opts); + av_dict_free(&opts); + if (err < 0) { + av_dlog(h, "Cannot open control connection, error %d\n", err); + return err; + } + + /* consume all messages from server */ + if (ftp_status(s, NULL, NULL, NULL, NULL, 220) != 220) { + av_log(h, AV_LOG_ERROR, "FTP server not ready for new users\n"); + err = AVERROR(EACCES); + return err; + } + + if ((err = ftp_auth(s)) < 0) { + av_log(h, AV_LOG_ERROR, "FTP authentication failed\n"); + return err; + } + + if ((err = ftp_type(s)) < 0) { + av_dlog(h, "Set content type failed\n"); + return err; + } + } + return 0; +} + +static int ftp_connect_data_connection(URLContext *h) { int err; char buf[CONTROL_BUFFER_SIZE], opts_format[20]; @@ -386,6 +431,12 @@ static int ftp_reconnect_data_connection(URLContext *h) FTPContext *s = h->priv_data; if (!s->conn_data) { + /* Enter passive mode */ + if ((err = ftp_passive_mode(s)) < 0) { + av_dlog(h, "Set passive mode failed\n"); + return err; + } + /* Open data connection */ ff_url_join(buf, sizeof(buf), "tcp", NULL, s->hostname, s->server_data_port, NULL); if (s->rw_timeout != -1) { snprintf(opts_format, sizeof(opts_format), "%d", s->rw_timeout); @@ -404,9 +455,8 @@ static int ftp_reconnect_data_connection(URLContext *h) static int ftp_open(URLContext *h, const char *url, int flags) { - char proto[10], path[MAX_URL_SIZE], buf[CONTROL_BUFFER_SIZE], opts_format[20]; - AVDictionary *opts = NULL; - int port, err; + char proto[10], path[MAX_URL_SIZE]; + int err; FTPContext *s = h->priv_data; av_dlog(h, "ftp protocol open\n"); @@ -419,52 +469,26 @@ static int ftp_open(URLContext *h, const char *url, int flags) av_url_split(proto, sizeof(proto), s->credencials, sizeof(s->credencials), s->hostname, sizeof(s->hostname), - &port, + &s->server_control_port, path, sizeof(path), url); - if (port < 0) - port = 21; - - if (!s->conn_control) { - ff_url_join(buf, sizeof(buf), "tcp", NULL, s->hostname, port, NULL); - if (s->rw_timeout != -1) { - snprintf(opts_format, sizeof(opts_format), "%d", s->rw_timeout); - av_dict_set(&opts, "timeout", opts_format, 0); - } /* if option is not given, don't pass it and let tcp use its own default */ - err = ffurl_open(&s->conn_control, buf, AVIO_FLAG_READ_WRITE, - &s->conn_control_interrupt_cb, &opts); - av_dict_free(&opts); - if (err < 0) - goto fail; - - /* consume all messages from server */ - if (ftp_status(s, NULL, NULL, NULL, NULL, 220) != 220) { - av_log(h, AV_LOG_ERROR, "Server not ready for new users\n"); - err = AVERROR(EACCES); - goto fail; - } + if (s->server_control_port < 0 || s->server_control_port > 65535) + s->server_control_port = 21; - if ((err = ftp_auth(s)) < 0) - goto fail; - - if ((err = ftp_type(s)) < 0) - goto fail; + if ((err = ftp_connect_control_connection(h)) < 0) + goto fail; - if ((err = ftp_current_dir(s)) < 0) - goto fail; - av_strlcat(s->path, path, sizeof(s->path)); + if ((err = ftp_current_dir(s)) < 0) + goto fail; + av_strlcat(s->path, path, sizeof(s->path)); - if ((err = ftp_passive_mode(s)) < 0) - goto fail; + if (ftp_file_size(s) < 0 && flags & AVIO_FLAG_READ) + h->is_streamed = 1; + if (s->write_seekable != 1 && flags & AVIO_FLAG_WRITE) + h->is_streamed = 1; - if (ftp_file_size(s) < 0 && flags & AVIO_FLAG_READ) - h->is_streamed = 1; - if (s->write_seekable != 1 && flags & AVIO_FLAG_WRITE) - h->is_streamed = 1; - } - - if ((err = ftp_reconnect_data_connection(h)) < 0) + if ((err = ftp_connect_data_connection(h)) < 0) goto fail; return 0; @@ -577,12 +601,8 @@ static int64_t ftp_seek(URLContext *h, int64_t pos, int whence) return AVERROR(EIO); } - /* set passive */ - if ((err = ftp_passive_mode(s)) < 0) - return err; - /* open new data connection */ - if ((err = ftp_reconnect_data_connection(h)) < 0) + if ((err = ftp_connect_data_connection(h)) < 0) return err; }

1 0