From 21e2dc9fb76bc34fcdedf32e4ce820d6cdf923fb Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Wed, 9 May 2012 14:35:58 -0700 Subject: [PATCH 1/6] flv: support stream text data as onTextData Adobe specifies onTextData as the standard message to use to deliver text information. Signed-off-by: Luca Barbato --- libavformat/flvdec.c | 106 +++++++++++++++++++++++++++++++++++++------ libavformat/flvenc.c | 72 +++++++++++++++++++++++++---- 2 files changed, 153 insertions(+), 25 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index b9d65a645b..f04f4fec25 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -66,6 +66,17 @@ static int flv_probe(AVProbeData *p) return 0; } +static AVStream *create_stream(AVFormatContext *s, int tag, int codec_type) +{ + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return NULL; + st->id = tag; + st->codec->codec_type = codec_type; + avpriv_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ + return st; +} + static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, AVCodecContext *acodec, int flv_codecid) { switch(flv_codecid) { //no distinction between S16 and S8 PCM codec flags @@ -302,6 +313,12 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst vcodec->bit_rate = num_val * 1024.0; else if (!strcmp(key, "audiodatarate") && acodec && 0 <= (int)(num_val * 1024.0)) acodec->bit_rate = num_val * 1024.0; + else if (!strcmp(key, "datastream")) { + AVStream *st = create_stream(s, 2, AVMEDIA_TYPE_DATA); + if (!st) + return AVERROR(ENOMEM); + st->codec->codec_id = CODEC_ID_TEXT; + } } if (!strcmp(key, "duration") || @@ -344,7 +361,14 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) { //first object needs to be "onMetaData" string type = avio_r8(ioc); - if(type != AMF_DATA_TYPE_STRING || amf_get_string(ioc, buffer, sizeof(buffer)) < 0 || strcmp(buffer, "onMetaData")) + if (type != AMF_DATA_TYPE_STRING || + amf_get_string(ioc, buffer, sizeof(buffer)) < 0) + return -1; + + if (!strcmp(buffer, "onTextData")) + return 1; + + if (strcmp(buffer, "onMetaData")) return -1; //find the streams now so that amf_parse_object doesn't need to do the lookup every time it is called. @@ -361,16 +385,6 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) { return 0; } -static AVStream *create_stream(AVFormatContext *s, int is_audio){ - AVStream *st = avformat_new_stream(s, NULL); - if (!st) - return NULL; - st->id = is_audio; - st->codec->codec_type = is_audio ? AVMEDIA_TYPE_AUDIO : AVMEDIA_TYPE_VIDEO; - avpriv_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ - return st; -} - static int flv_read_header(AVFormatContext *s) { int offset, flags; @@ -389,11 +403,11 @@ static int flv_read_header(AVFormatContext *s) s->ctx_flags |= AVFMTCTX_NOHEADER; if(flags & FLV_HEADER_FLAG_HASVIDEO){ - if(!create_stream(s, 0)) + if(!create_stream(s, 0, AVMEDIA_TYPE_VIDEO)) return AVERROR(ENOMEM); } if(flags & FLV_HEADER_FLAG_HASAUDIO){ - if(!create_stream(s, 1)) + if(!create_stream(s, 1, AVMEDIA_TYPE_AUDIO)) return AVERROR(ENOMEM); } @@ -453,6 +467,65 @@ static void clear_index_entries(AVFormatContext *s, int64_t pos) } } + +static int flv_data_packet(AVFormatContext *s, AVPacket *pkt, + int64_t dts, int64_t next) +{ + int ret = AVERROR_INVALIDDATA, i; + AVIOContext *pb = s->pb; + AVStream *st = NULL; + AMFDataType type; + char buf[20]; + int length; + + type = avio_r8(pb); + if (type == AMF_DATA_TYPE_MIXEDARRAY) + avio_seek(pb, 4, SEEK_CUR); + else if (type != AMF_DATA_TYPE_OBJECT) + goto out; + + amf_get_string(pb, buf, sizeof(buf)); + if (strcmp(buf, "type") || avio_r8(pb) != AMF_DATA_TYPE_STRING) + goto out; + + amf_get_string(pb, buf, sizeof(buf)); + //FIXME parse it as codec_id + amf_get_string(pb, buf, sizeof(buf)); + if (strcmp(buf, "text") || avio_r8(pb) != AMF_DATA_TYPE_STRING) + goto out; + + length = avio_rb16(pb); + ret = av_get_packet(s->pb, pkt, length); + if (ret < 0) { + ret = AVERROR(EIO); + goto out; + } + + for (i = 0; i < s->nb_streams; i++) { + st = s->streams[i]; + if (st->id == 2) + break; + } + + if (i == s->nb_streams) { + st = create_stream(s, 2, AVMEDIA_TYPE_DATA); + if (!st) + goto out; + st->codec->codec_id = CODEC_ID_TEXT; + } + + pkt->dts = dts; + pkt->pts = dts; + pkt->size = ret; + + pkt->stream_index = st->index; + pkt->flags |= AV_PKT_FLAG_KEY; + + avio_seek(s->pb, next + 4, SEEK_SET); +out: + return ret; +} + static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) { FLVContext *flv = s->priv_data; @@ -507,7 +580,9 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) goto skip; } else { if (type == FLV_TAG_TYPE_META && size > 13+1+4) - flv_read_metabody(s, next); + if (flv_read_metabody(s, next) > 0) { + return flv_data_packet(s, pkt, dts, next); + } else /* skip packet */ av_log(s, AV_LOG_DEBUG, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags); skip: @@ -527,7 +602,8 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) } if(i == s->nb_streams){ av_log(s, AV_LOG_ERROR, "invalid stream\n"); - st= create_stream(s, is_audio); + st = create_stream(s, is_audio, + is_audio ? AVMEDIA_TYPE_AUDIO : AVMEDIA_TYPE_VIDEO); s->ctx_flags &= ~AVFMTCTX_NOHEADER; } av_dlog(s, "%d %X %d \n", is_audio, flags, st->discard); diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 3a51aaabb0..62756a100a 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -178,7 +178,7 @@ static int flv_write_header(AVFormatContext *s) { AVIOContext *pb = s->pb; FLVContext *flv = s->priv_data; - AVCodecContext *audio_enc = NULL, *video_enc = NULL; + AVCodecContext *audio_enc = NULL, *video_enc = NULL, *data_enc = NULL; int i, metadata_count = 0; double framerate = 0.0; int64_t metadata_size_pos, data_size, metadata_count_pos; @@ -187,7 +187,8 @@ static int flv_write_header(AVFormatContext *s) for(i=0; inb_streams; i++){ AVCodecContext *enc = s->streams[i]->codec; FLVStreamContext *sc; - if (enc->codec_type == AVMEDIA_TYPE_VIDEO) { + switch (enc->codec_type) { + case AVMEDIA_TYPE_VIDEO: if (s->streams[i]->r_frame_rate.den && s->streams[i]->r_frame_rate.num) { framerate = av_q2d(s->streams[i]->r_frame_rate); } else { @@ -198,10 +199,22 @@ static int flv_write_header(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "video codec not compatible with flv\n"); return -1; } - } else { + break; + case AVMEDIA_TYPE_AUDIO: audio_enc = enc; if (get_audio_flags(s, enc) < 0) - return -1; + return AVERROR_INVALIDDATA; + break; + case AVMEDIA_TYPE_DATA: + if (enc->codec_id != CODEC_ID_TEXT) { + av_log(s, AV_LOG_ERROR, "codec not compatible with flv\n"); + return AVERROR_INVALIDDATA; + } + data_enc = enc; + break; + default: + av_log(s, AV_LOG_ERROR, "codec not compatible with flv\n"); + return -1; } avpriv_set_pts_info(s->streams[i], 32, 1, 1000); /* 32 bit pts in ms */ @@ -247,7 +260,11 @@ static int flv_write_header(AVFormatContext *s) /* mixed array (hash) with size and string/type/data tuples */ avio_w8(pb, AMF_DATA_TYPE_MIXEDARRAY); metadata_count_pos = avio_tell(pb); - metadata_count = 5*!!video_enc + 5*!!audio_enc + 2; // +2 for duration and file size + metadata_count = 5 * !!video_enc + + 5 * !!audio_enc + + 1 * !!data_enc + + 2; // +2 for duration and file size + avio_wb32(pb, metadata_count); put_amf_string(pb, "duration"); @@ -288,6 +305,11 @@ static int flv_write_header(AVFormatContext *s) put_amf_double(pb, audio_enc->codec_tag); } + if (data_enc) { + put_amf_string(pb, "datastream"); + put_amf_double(pb, 0.0); + } + while ((tag = av_dict_get(s->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { put_amf_string(pb, tag->key); avio_w8(pb, AMF_DATA_TYPE_STRING); @@ -396,7 +418,8 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) else flags_size= 1; - if (enc->codec_type == AVMEDIA_TYPE_VIDEO) { + switch (enc->codec_type) { + case AVMEDIA_TYPE_VIDEO: avio_w8(pb, FLV_TAG_TYPE_VIDEO); flags = enc->codec_tag; @@ -406,15 +429,21 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) } flags |= pkt->flags & AV_PKT_FLAG_KEY ? FLV_FRAME_KEY : FLV_FRAME_INTER; - } else { - assert(enc->codec_type == AVMEDIA_TYPE_AUDIO); + break; + case AVMEDIA_TYPE_AUDIO: flags = get_audio_flags(s, enc); assert(size); avio_w8(pb, FLV_TAG_TYPE_AUDIO); - } + break; + case AVMEDIA_TYPE_DATA: + avio_w8(pb, FLV_TAG_TYPE_META); + break; + default: + return AVERROR(EINVAL); + } if (enc->codec_id == CODEC_ID_H264) { /* check if extradata looks like MP4 */ if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) { @@ -446,6 +475,29 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) avio_wb24(pb,ts); avio_w8(pb,(ts >> 24) & 0x7F); // timestamps are 32bits _signed_ avio_wb24(pb,flv->reserved); + + if (enc->codec_type == AVMEDIA_TYPE_DATA) { + int data_size; + int metadata_size_pos = avio_tell(pb); + avio_w8(pb, AMF_DATA_TYPE_STRING); + put_amf_string(pb, "onTextData"); + avio_w8(pb, AMF_DATA_TYPE_MIXEDARRAY); + avio_wb32(pb, 2); + put_amf_string(pb, "type"); + avio_w8(pb, AMF_DATA_TYPE_STRING); + put_amf_string(pb, "Text"); + put_amf_string(pb, "text"); + avio_w8(pb, AMF_DATA_TYPE_STRING); + put_amf_string(pb, pkt->data); + put_amf_string(pb, ""); + avio_w8(pb, AMF_END_OF_OBJECT); + /* write total size of tag */ + data_size = avio_tell(pb) - metadata_size_pos; + avio_seek(pb, metadata_size_pos - 10, SEEK_SET); + avio_wb24(pb, data_size); + avio_seek(pb, data_size + 10 - 3, SEEK_CUR); + avio_wb32(pb, data_size + 11); + } else { avio_w8(pb,flags); if (enc->codec_id == CODEC_ID_VP6) avio_w8(pb,0); @@ -462,7 +514,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) avio_wb32(pb,size+flags_size+11); // previous tag size flv->duration = FFMAX(flv->duration, pkt->pts + flv->delay + pkt->duration); - + } avio_flush(pb); av_free(data); From cf3a1948e946ed7e98d0427da75e5dadb84aa51d Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 2 Jun 2012 13:49:13 +0200 Subject: [PATCH 2/6] avpacket: fix duplicating side data. Use correct side data size instead of just zeroed field. --- libavcodec/avpacket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 5e2292de28..4b85081e7b 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -146,7 +146,7 @@ int av_dup_packet(AVPacket *pkt) pkt->side_data_elems * sizeof(*pkt->side_data)); for (i = 0; i < pkt->side_data_elems; i++) DUP_DATA(pkt->side_data[i].data, tmp_pkt.side_data[i].data, - pkt->side_data[i].size, 1); + tmp_pkt.side_data[i].size, 1); } } return 0; From 96fadfb1588b1bf4968af371693e6484ce3050f8 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Fri, 1 Jun 2012 20:51:57 +0200 Subject: [PATCH 3/6] bmv: add stricter checks for invalid decoded length This makes decoder handle random data passed as BMV frame data. --- libavcodec/bmv.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/bmv.c b/libavcodec/bmv.c index 49346a41a8..4d496430cc 100644 --- a/libavcodec/bmv.c +++ b/libavcodec/bmv.c @@ -52,7 +52,7 @@ typedef struct BMVDecContext { static int decode_bmv_frame(const uint8_t *source, int src_len, uint8_t *frame, int frame_off) { - int val, saved_val = 0; + unsigned val, saved_val = 0; int tmplen = src_len; const uint8_t *src, *source_end = source + src_len; uint8_t *frame_end = frame + SCREEN_WIDE * SCREEN_HIGH; @@ -140,7 +140,9 @@ static int decode_bmv_frame(const uint8_t *source, int src_len, uint8_t *frame, case 1: if (forward) { if (dst - frame + SCREEN_WIDE < frame_off || - frame_end - dst < frame_off + len) + dst - frame + SCREEN_WIDE + frame_off < 0 || + frame_end - dst < frame_off + len || + frame_end - dst < len) return -1; for (i = 0; i < len; i++) dst[i] = dst[frame_off + i]; @@ -148,7 +150,9 @@ static int decode_bmv_frame(const uint8_t *source, int src_len, uint8_t *frame, } else { dst -= len; if (dst - frame + SCREEN_WIDE < frame_off || - frame_end - dst < frame_off + len) + dst - frame + SCREEN_WIDE + frame_off < 0 || + frame_end - dst < frame_off + len || + frame_end - dst < len) return -1; for (i = len - 1; i >= 0; i--) dst[i] = dst[frame_off + i]; From 007aedeebf3f42ba44ba5201be77be71ae4d09f6 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 3 Jun 2012 10:07:54 +0200 Subject: [PATCH 4/6] librtmp: add rtmp_app and rtmp_playpath private options. This makes it easier to switch between native rtmp and librtmp. --- libavformat/librtmp.c | 95 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 80 insertions(+), 15 deletions(-) diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c index 8883bbc65f..4641c5d21e 100644 --- a/libavformat/librtmp.c +++ b/libavformat/librtmp.c @@ -24,13 +24,22 @@ * RTMP protocol based on http://rtmpdump.mplayerhq.hu/ librtmp */ +#include "libavutil/avstring.h" #include "libavutil/mathematics.h" +#include "libavutil/opt.h" #include "avformat.h" #include "url.h" #include #include +typedef struct LibRTMPContext { + const AVClass *class; + RTMP rtmp; + char *app; + char *playpath; +} LibRTMPContext; + static void rtmp_log(int level, const char *fmt, va_list args) { switch (level) { @@ -49,7 +58,8 @@ static void rtmp_log(int level, const char *fmt, va_list args) static int rtmp_close(URLContext *s) { - RTMP *r = s->priv_data; + LibRTMPContext *ctx = s->priv_data; + RTMP *r = &ctx->rtmp; RTMP_Close(r); return 0; @@ -69,8 +79,10 @@ static int rtmp_close(URLContext *s) */ static int rtmp_open(URLContext *s, const char *uri, int flags) { - RTMP *r = s->priv_data; - int rc; + LibRTMPContext *ctx = s->priv_data; + RTMP *r = &ctx->rtmp; + int rc = 0; + char *filename = s->filename; switch (av_log_get_level()) { default: @@ -84,8 +96,27 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) RTMP_LogSetLevel(rc); RTMP_LogSetCallback(rtmp_log); + if (ctx->app || ctx->playpath) { + int len = strlen(s->filename) + 1; + if (ctx->app) len += strlen(ctx->app) + sizeof(" app="); + if (ctx->playpath) len += strlen(ctx->playpath) + sizeof(" playpath="); + + if (!(filename = av_malloc(len))) + return AVERROR(ENOMEM); + + av_strlcpy(filename, s->filename, len); + if (ctx->app) { + av_strlcat(filename, " app=", len); + av_strlcat(filename, ctx->app, len); + } + if (ctx->playpath) { + av_strlcat(filename, " playpath=", len); + av_strlcat(filename, ctx->playpath, len); + } + } + RTMP_Init(r); - if (!RTMP_SetupURL(r, s->filename)) { + if (!RTMP_SetupURL(r, filename)) { rc = -1; goto fail; } @@ -99,28 +130,33 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) } s->is_streamed = 1; - return 0; + rc = 0; fail: + if (filename != s->filename) + av_freep(&filename); return rc; } static int rtmp_write(URLContext *s, const uint8_t *buf, int size) { - RTMP *r = s->priv_data; + LibRTMPContext *ctx = s->priv_data; + RTMP *r = &ctx->rtmp; return RTMP_Write(r, buf, size); } static int rtmp_read(URLContext *s, uint8_t *buf, int size) { - RTMP *r = s->priv_data; + LibRTMPContext *ctx = s->priv_data; + RTMP *r = &ctx->rtmp; return RTMP_Read(r, buf, size); } static int rtmp_read_pause(URLContext *s, int pause) { - RTMP *r = s->priv_data; + LibRTMPContext *ctx = s->priv_data; + RTMP *r = &ctx->rtmp; if (!RTMP_Pause(r, pause)) return -1; @@ -130,7 +166,8 @@ static int rtmp_read_pause(URLContext *s, int pause) static int64_t rtmp_read_seek(URLContext *s, int stream_index, int64_t timestamp, int flags) { - RTMP *r = s->priv_data; + LibRTMPContext *ctx = s->priv_data; + RTMP *r = &ctx->rtmp; if (flags & AVSEEK_FLAG_BYTE) return AVERROR(ENOSYS); @@ -147,11 +184,30 @@ static int64_t rtmp_read_seek(URLContext *s, int stream_index, static int rtmp_get_file_handle(URLContext *s) { - RTMP *r = s->priv_data; + LibRTMPContext *ctx = s->priv_data; + RTMP *r = &ctx->rtmp; return RTMP_Socket(r); } +#define OFFSET(x) offsetof(LibRTMPContext, x) +#define DEC AV_OPT_FLAG_DECODING_PARAM +#define ENC AV_OPT_FLAG_ENCODING_PARAM +static const AVOption options[] = { + {"rtmp_app", "Name of application to connect to on the RTMP server", OFFSET(app), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, + {"rtmp_playpath", "Stream identifier to play or to publish", OFFSET(playpath), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, + { NULL }, +}; + +#define RTMP_CLASS(flavor)\ +static const AVClass lib ## flavor ## _class = {\ + .class_name = "lib" #flavor " protocol",\ + .item_name = av_default_item_name,\ + .option = options,\ + .version = LIBAVUTIL_VERSION_INT,\ +}; + +RTMP_CLASS(rtmp) URLProtocol ff_librtmp_protocol = { .name = "rtmp", .url_open = rtmp_open, @@ -161,10 +217,12 @@ URLProtocol ff_librtmp_protocol = { .url_read_pause = rtmp_read_pause, .url_read_seek = rtmp_read_seek, .url_get_file_handle = rtmp_get_file_handle, - .priv_data_size = sizeof(RTMP), + .priv_data_size = sizeof(LibRTMPContext), + .priv_data_class = &librtmp_class, .flags = URL_PROTOCOL_FLAG_NETWORK, }; +RTMP_CLASS(rtmpt) URLProtocol ff_librtmpt_protocol = { .name = "rtmpt", .url_open = rtmp_open, @@ -174,10 +232,12 @@ URLProtocol ff_librtmpt_protocol = { .url_read_pause = rtmp_read_pause, .url_read_seek = rtmp_read_seek, .url_get_file_handle = rtmp_get_file_handle, - .priv_data_size = sizeof(RTMP), + .priv_data_size = sizeof(LibRTMPContext), + .priv_data_class = &librtmpt_class, .flags = URL_PROTOCOL_FLAG_NETWORK, }; +RTMP_CLASS(rtmpe) URLProtocol ff_librtmpe_protocol = { .name = "rtmpe", .url_open = rtmp_open, @@ -187,10 +247,12 @@ URLProtocol ff_librtmpe_protocol = { .url_read_pause = rtmp_read_pause, .url_read_seek = rtmp_read_seek, .url_get_file_handle = rtmp_get_file_handle, - .priv_data_size = sizeof(RTMP), + .priv_data_size = sizeof(LibRTMPContext), + .priv_data_class = &librtmpe_class, .flags = URL_PROTOCOL_FLAG_NETWORK, }; +RTMP_CLASS(rtmpte) URLProtocol ff_librtmpte_protocol = { .name = "rtmpte", .url_open = rtmp_open, @@ -200,10 +262,12 @@ URLProtocol ff_librtmpte_protocol = { .url_read_pause = rtmp_read_pause, .url_read_seek = rtmp_read_seek, .url_get_file_handle = rtmp_get_file_handle, - .priv_data_size = sizeof(RTMP), + .priv_data_size = sizeof(LibRTMPContext), + .priv_data_class = &librtmpte_class, .flags = URL_PROTOCOL_FLAG_NETWORK, }; +RTMP_CLASS(rtmps) URLProtocol ff_librtmps_protocol = { .name = "rtmps", .url_open = rtmp_open, @@ -213,6 +277,7 @@ URLProtocol ff_librtmps_protocol = { .url_read_pause = rtmp_read_pause, .url_read_seek = rtmp_read_seek, .url_get_file_handle = rtmp_get_file_handle, - .priv_data_size = sizeof(RTMP), + .priv_data_size = sizeof(LibRTMPContext), + .priv_data_class = &librtmps_class, .flags = URL_PROTOCOL_FLAG_NETWORK, }; From a91943bcef8c0220e43dcc52007249aa2b1a78a3 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 3 Jun 2012 10:09:03 +0200 Subject: [PATCH 5/6] librtmp: don't abuse a variable for two unrelated things. --- libavformat/librtmp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c index 4641c5d21e..883ecdfd80 100644 --- a/libavformat/librtmp.c +++ b/libavformat/librtmp.c @@ -81,19 +81,19 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) { LibRTMPContext *ctx = s->priv_data; RTMP *r = &ctx->rtmp; - int rc = 0; + int rc = 0, level; char *filename = s->filename; switch (av_log_get_level()) { default: - case AV_LOG_FATAL: rc = RTMP_LOGCRIT; break; - case AV_LOG_ERROR: rc = RTMP_LOGERROR; break; - case AV_LOG_WARNING: rc = RTMP_LOGWARNING; break; - case AV_LOG_INFO: rc = RTMP_LOGINFO; break; - case AV_LOG_VERBOSE: rc = RTMP_LOGDEBUG; break; - case AV_LOG_DEBUG: rc = RTMP_LOGDEBUG2; break; + case AV_LOG_FATAL: level = RTMP_LOGCRIT; break; + case AV_LOG_ERROR: level = RTMP_LOGERROR; break; + case AV_LOG_WARNING: level = RTMP_LOGWARNING; break; + case AV_LOG_INFO: level = RTMP_LOGINFO; break; + case AV_LOG_VERBOSE: level = RTMP_LOGDEBUG; break; + case AV_LOG_DEBUG: level = RTMP_LOGDEBUG2; break; } - RTMP_LogSetLevel(rc); + RTMP_LogSetLevel(level); RTMP_LogSetCallback(rtmp_log); if (ctx->app || ctx->playpath) { From 19dfbf1915a0739f1a8b2f5a56aa1d3ff0597d9c Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 3 Jun 2012 10:11:43 +0200 Subject: [PATCH 6/6] librtmp: return AVERROR_UNKNOWN instead of -1. --- libavformat/librtmp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c index 883ecdfd80..7133bd655b 100644 --- a/libavformat/librtmp.c +++ b/libavformat/librtmp.c @@ -117,7 +117,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) RTMP_Init(r); if (!RTMP_SetupURL(r, filename)) { - rc = -1; + rc = AVERROR_UNKNOWN; goto fail; } @@ -125,7 +125,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) RTMP_EnableWrite(r); if (!RTMP_Connect(r, NULL) || !RTMP_ConnectStream(r, 0)) { - rc = -1; + rc = AVERROR_UNKNOWN; goto fail; } @@ -159,7 +159,7 @@ static int rtmp_read_pause(URLContext *s, int pause) RTMP *r = &ctx->rtmp; if (!RTMP_Pause(r, pause)) - return -1; + return AVERROR_UNKNOWN; return 0; } @@ -178,7 +178,7 @@ static int64_t rtmp_read_seek(URLContext *s, int stream_index, flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP); if (!RTMP_SendSeek(r, timestamp)) - return -1; + return AVERROR_UNKNOWN; return timestamp; }