History

Merge remote-tracking branch 'qatar/master'

* qatar/master: librtmp: return AVERROR_UNKNOWN instead of -1. librtmp: don't abuse a variable for two unrelated things. librtmp: add rtmp_app and rtmp_playpath private options. bmv: add stricter checks for invalid decoded length avpacket: fix duplicating side data. flv: support stream text data as onTextData Conflicts: libavcodec/bmv.c libavformat/flvdec.c libavformat/flvenc.c

Michael Niedermayer committed 14 years ago

Commit 7d820202 parents e10eac9 19dfbf15 files · +252 −74Browse files

Unified · Split

5 files
  1. libavcodec/avpacket.c +1 −1
  2. libavcodec/bmv.c +8 −4
  3. libavformat/flvdec.c +92 −26
  4. libavformat/flvenc.c +60 −17
  5. libavformat/librtmp.c +91 −26
libavcodec/avpacket.c+1−1
@@ -152,7 +152,7 @@ int av_dup_packet(AVPacket *pkt) · 151 unmodified lines
152152 pkt->side_data_elems * sizeof(*pkt->side_data));
153153 for (i = 0; i < pkt->side_data_elems; i++)
154154 DUP_DATA(pkt->side_data[i].data, tmp_pkt.side_data[i].data,
155− pkt->side_data[i].size, 1);
155+ tmp_pkt.side_data[i].size, 1);
156156 }
157157 }
158158 return 0;
libavcodec/bmv.c+8−4
@@ -143,16 +143,20 @@ static int decode_bmv_frame(const uint8_t *source, int src_len, uint8_t *frame, · 142 unmodified lines
143143 switch (mode) {
144144 case 1:
145145 if (forward) {
146− if (dst - frame + SCREEN_WIDE < -frame_off ||
147− frame_end - dst < frame_off + len)
146+ if (dst - frame + SCREEN_WIDE < frame_off ||
147+ dst - frame + SCREEN_WIDE + frame_off < 0 ||
148+ frame_end - dst < frame_off + len ||
149+ frame_end - dst < len)
148150 return -1;
149151 for (i = 0; i < len; i++)
150152 dst[i] = dst[frame_off + i];
151153 dst += len;
152154 } else {
153155 dst -= len;
154− if (dst - frame + SCREEN_WIDE < -frame_off ||
155− frame_end - dst < frame_off + len)
156+ if (dst - frame + SCREEN_WIDE < frame_off ||
157+ dst - frame + SCREEN_WIDE + frame_off < 0 ||
158+ frame_end - dst < frame_off + len ||
159+ frame_end - dst < len)
156160 return -1;
157161 for (i = len - 1; i >= 0; i--)
158162 dst[i] = dst[frame_off + i];
libavformat/flvdec.c+92−26
@@ -62,6 +62,21 @@ static int flv_probe(AVProbeData *p) · 61 unmodified lines
6262 return 0;
6363 }
6464
65+static AVStream *create_stream(AVFormatContext *s, int tag, int codec_type){
66+ AVStream *st = avformat_new_stream(s, NULL);
67+ if (!st)
68+ return NULL;
69+ st->id = tag;
70+ st->codec->codec_type = codec_type;
71+ if(s->nb_streams>=3 ||( s->nb_streams==2
72+ && s->streams[0]->codec->codec_type != AVMEDIA_TYPE_DATA
73+ && s->streams[1]->codec->codec_type != AVMEDIA_TYPE_DATA))
74+ s->ctx_flags &= ~AVFMTCTX_NOHEADER;
75+
76+ avpriv_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */
77+ return st;
78+}
79+
6580 static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, AVCodecContext *acodec, int flv_codecid) {
6681 switch(flv_codecid) {
6782 //no distinction between S16 and S8 PCM codec flags
@@ -298,6 +313,12 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst · 230 unmodified lines
298313 vcodec->bit_rate = num_val * 1024.0;
299314 else if (!strcmp(key, "audiodatarate") && acodec && 0 <= (int)(num_val * 1024.0))
300315 acodec->bit_rate = num_val * 1024.0;
316+ else if (!strcmp(key, "datastream")) {
317+ AVStream *st = create_stream(s, 2, AVMEDIA_TYPE_DATA);
318+ if (!st)
319+ return AVERROR(ENOMEM);
320+ st->codec->codec_id = CODEC_ID_TEXT;
321+ }
301322 }
302323
303324 if (amf_type == AMF_DATA_TYPE_OBJECT && s->nb_streams == 1 &&
@@ -344,7 +365,14 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) { · 40 unmodified lines
344365
345366 //first object needs to be "onMetaData" string
346367 type = avio_r8(ioc);
347− if(type != AMF_DATA_TYPE_STRING || amf_get_string(ioc, buffer, sizeof(buffer)) < 0 || strcmp(buffer, "onMetaData"))
368+ if (type != AMF_DATA_TYPE_STRING ||
369+ amf_get_string(ioc, buffer, sizeof(buffer)) < 0)
370+ return -1;
371+
372+ if (!strcmp(buffer, "onTextData"))
373+ return 1;
374+
375+ if (strcmp(buffer, "onMetaData"))
348376 return -1;
349377
350378 //find the streams now so that amf_parse_object doesn't need to do the lookup every time it is called.
@@ -362,28 +390,6 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) { · 11 unmodified lines
362390 return 0;
363391 }
364392
365−static AVStream *create_stream(AVFormatContext *s, int stream_type){
366− AVStream *st = avformat_new_stream(s, NULL);
367− if (!st)
368− return NULL;
369− st->id = stream_type;
370− switch(stream_type) {
371− case FLV_STREAM_TYPE_VIDEO: st->codec->codec_type = AVMEDIA_TYPE_VIDEO; break;
372− case FLV_STREAM_TYPE_AUDIO: st->codec->codec_type = AVMEDIA_TYPE_AUDIO; break;
373− case FLV_STREAM_TYPE_DATA:
374− st->codec->codec_type = AVMEDIA_TYPE_DATA;
375− st->codec->codec_id = CODEC_ID_NONE; // Going to rely on copy for now
376− av_log(s, AV_LOG_DEBUG, "Data stream created\n");
377− }
378− if(s->nb_streams>=3 ||( s->nb_streams==2
379− && s->streams[0]->codec->codec_type != AVMEDIA_TYPE_DATA
380− && s->streams[1]->codec->codec_type != AVMEDIA_TYPE_DATA))
381− s->ctx_flags &= ~AVFMTCTX_NOHEADER;
382−
383− avpriv_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */
384− return st;
385−}
386−
387393 static int flv_read_header(AVFormatContext *s)
388394 {
389395 int offset, flags;
@@ -399,11 +405,11 @@ static int flv_read_header(AVFormatContext *s) · 9 unmodified lines
399405 s->ctx_flags |= AVFMTCTX_NOHEADER;
400406
401407 if(flags & FLV_HEADER_FLAG_HASVIDEO){
402− if(!create_stream(s, FLV_STREAM_TYPE_VIDEO))
408+ if(!create_stream(s, 0, AVMEDIA_TYPE_VIDEO))
403409 return AVERROR(ENOMEM);
404410 }
405411 if(flags & FLV_HEADER_FLAG_HASAUDIO){
406− if(!create_stream(s, FLV_STREAM_TYPE_AUDIO))
412+ if(!create_stream(s, 1, AVMEDIA_TYPE_AUDIO))
407413 return AVERROR(ENOMEM);
408414 }
409415 // Flag doesn't indicate whether or not there is script-data present. Must
@@ -466,6 +472,65 @@ static void clear_index_entries(AVFormatContext *s, int64_t pos) · 56 unmodified lines
466472 }
467473 }
468474
475+
476+static int flv_data_packet(AVFormatContext *s, AVPacket *pkt,
477+ int64_t dts, int64_t next)
478+{
479+ int ret = AVERROR_INVALIDDATA, i;
480+ AVIOContext *pb = s->pb;
481+ AVStream *st = NULL;
482+ AMFDataType type;
483+ char buf[20];
484+ int length;
485+
486+ type = avio_r8(pb);
487+ if (type == AMF_DATA_TYPE_MIXEDARRAY)
488+ avio_seek(pb, 4, SEEK_CUR);
489+ else if (type != AMF_DATA_TYPE_OBJECT)
490+ goto out;
491+
492+ amf_get_string(pb, buf, sizeof(buf));
493+ if (strcmp(buf, "type") || avio_r8(pb) != AMF_DATA_TYPE_STRING)
494+ goto out;
495+
496+ amf_get_string(pb, buf, sizeof(buf));
497+ //FIXME parse it as codec_id
498+ amf_get_string(pb, buf, sizeof(buf));
499+ if (strcmp(buf, "text") || avio_r8(pb) != AMF_DATA_TYPE_STRING)
500+ goto out;
501+
502+ length = avio_rb16(pb);
503+ ret = av_get_packet(s->pb, pkt, length);
504+ if (ret < 0) {
505+ ret = AVERROR(EIO);
506+ goto out;
507+ }
508+
509+ for (i = 0; i < s->nb_streams; i++) {
510+ st = s->streams[i];
511+ if (st->id == 2)
512+ break;
513+ }
514+
515+ if (i == s->nb_streams) {
516+ st = create_stream(s, 2, AVMEDIA_TYPE_DATA);
517+ if (!st)
518+ goto out;
519+ st->codec->codec_id = CODEC_ID_TEXT;
520+ }
521+
522+ pkt->dts = dts;
523+ pkt->pts = dts;
524+ pkt->size = ret;
525+
526+ pkt->stream_index = st->index;
527+ pkt->flags |= AV_PKT_FLAG_KEY;
528+
529+ avio_seek(s->pb, next + 4, SEEK_SET);
530+out:
531+ return ret;
532+}
533+
469534 static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
470535 {
471536 FLVContext *flv = s->priv_data;
@@ -548,7 +613,8 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) · 76 unmodified lines
548613 }
549614 if(i == s->nb_streams){
550615 av_log(s, AV_LOG_WARNING, "Stream discovered after head already parsed\n");
551− st= create_stream(s, stream_type);
616+ st = create_stream(s, stream_type,
617+ (int[]){AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_DATA}[stream_type]);
552618 }
553619 av_dlog(s, "%d %X %d \n", stream_type, flags, st->discard);
554620 if( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || (stream_type == FLV_STREAM_TYPE_AUDIO)))
libavformat/flvenc.c+60−17
@@ -182,7 +182,7 @@ static int flv_write_header(AVFormatContext *s) · 181 unmodified lines
182182 {
183183 AVIOContext *pb = s->pb;
184184 FLVContext *flv = s->priv_data;
185− AVCodecContext *audio_enc = NULL, *video_enc = NULL;
185+ AVCodecContext *audio_enc = NULL, *video_enc = NULL, *data_enc = NULL;
186186 int i, metadata_count = 0;
187187 double framerate = 0.0;
188188 int64_t metadata_size_pos, data_size, metadata_count_pos;
@@ -191,7 +191,8 @@ static int flv_write_header(AVFormatContext *s) · 2 unmodified lines
191191 for(i=0; i<s->nb_streams; i++){
192192 AVCodecContext *enc = s->streams[i]->codec;
193193 FLVStreamContext *sc;
194− if (enc->codec_type == AVMEDIA_TYPE_VIDEO) {
194+ switch (enc->codec_type) {
195+ case AVMEDIA_TYPE_VIDEO:
195196 if (s->streams[i]->r_frame_rate.den && s->streams[i]->r_frame_rate.num) {
196197 framerate = av_q2d(s->streams[i]->r_frame_rate);
197198 } else {
@@ -202,10 +203,22 @@ static int flv_write_header(AVFormatContext *s) · 4 unmodified lines
202203 av_log(s, AV_LOG_ERROR, "video codec not compatible with flv\n");
203204 return -1;
204205 }
205− } else if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
206+ break;
207+ case AVMEDIA_TYPE_AUDIO:
206208 audio_enc = enc;
207209 if (get_audio_flags(s, enc) < 0)
208− return -1;
210+ return AVERROR_INVALIDDATA;
211+ break;
212+ case AVMEDIA_TYPE_DATA:
213+ if (enc->codec_id != CODEC_ID_TEXT) {
214+ av_log(s, AV_LOG_ERROR, "codec not compatible with flv\n");
215+ return AVERROR_INVALIDDATA;
216+ }
217+ data_enc = enc;
218+ break;
219+ default:
220+ av_log(s, AV_LOG_ERROR, "codec not compatible with flv\n");
221+ return -1;
209222 }
210223 avpriv_set_pts_info(s->streams[i], 32, 1, 1000); /* 32 bit pts in ms */
211224
@@ -251,7 +264,11 @@ static int flv_write_header(AVFormatContext *s) · 39 unmodified lines
251264 /* mixed array (hash) with size and string/type/data tuples */
252265 avio_w8(pb, AMF_DATA_TYPE_MIXEDARRAY);
253266 metadata_count_pos = avio_tell(pb);
254− metadata_count = 5*!!video_enc + 5*!!audio_enc + 2; // +2 for duration and file size
267+ metadata_count = 5 * !!video_enc +
268+ 5 * !!audio_enc +
269+ 1 * !!data_enc +
270+ 2; // +2 for duration and file size
271+
255272 avio_wb32(pb, metadata_count);
256273
257274 put_amf_string(pb, "duration");
@@ -292,6 +309,11 @@ static int flv_write_header(AVFormatContext *s) · 34 unmodified lines
292309 put_amf_double(pb, audio_enc->codec_tag);
293310 }
294311
312+ if (data_enc) {
313+ put_amf_string(pb, "datastream");
314+ put_amf_double(pb, 0.0);
315+ }
316+
295317 while ((tag = av_dict_get(s->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
296318 if( !strcmp(tag->key, "width")
297319 ||!strcmp(tag->key, "height")
@@ -416,7 +438,8 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) · 118 unmodified lines
416438 else
417439 flags_size= 1;
418440
419− if (enc->codec_type == AVMEDIA_TYPE_VIDEO) {
441+ switch (enc->codec_type) {
442+ case AVMEDIA_TYPE_VIDEO:
420443 avio_w8(pb, FLV_TAG_TYPE_VIDEO);
421444
422445 flags = enc->codec_tag;
@@ -426,20 +449,20 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) · 3 unmodified lines
426449 }
427450
428451 flags |= pkt->flags & AV_PKT_FLAG_KEY ? FLV_FRAME_KEY : FLV_FRAME_INTER;
429− } else if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
452+ break;
453+ case AVMEDIA_TYPE_AUDIO:
430454 flags = get_audio_flags(s, enc);
431455
432456 assert(size);
433457
434458 avio_w8(pb, FLV_TAG_TYPE_AUDIO);
435− } else {
436− // In-band flv metadata ("scriptdata")
437− assert(enc->codec_type == AVMEDIA_TYPE_DATA);
459+ break;
460+ case AVMEDIA_TYPE_DATA:
438461 avio_w8(pb, FLV_TAG_TYPE_META);
439− flags_size = 0;
440− flags = 0;
462+ break;
463+ default:
464+ return AVERROR(EINVAL);
441465 }
442−
443466 if (enc->codec_id == CODEC_ID_H264 || enc->codec_id == CODEC_ID_MPEG4) {
444467 /* check if extradata looks like mp4 formated */
445468 if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) {
@@ -476,9 +499,29 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) · 30 unmodified lines
476499 avio_w8(pb,(ts >> 24) & 0x7F); // timestamps are 32bits _signed_
477500 avio_wb24(pb,flv->reserved);
478501
479− if(flags_size)
480− avio_w8(pb,flags);
481−
502+ if (enc->codec_type == AVMEDIA_TYPE_DATA) {
503+ int data_size;
504+ int metadata_size_pos = avio_tell(pb);
505+ avio_w8(pb, AMF_DATA_TYPE_STRING);
506+ put_amf_string(pb, "onTextData");
507+ avio_w8(pb, AMF_DATA_TYPE_MIXEDARRAY);
508+ avio_wb32(pb, 2);
509+ put_amf_string(pb, "type");
510+ avio_w8(pb, AMF_DATA_TYPE_STRING);
511+ put_amf_string(pb, "Text");
512+ put_amf_string(pb, "text");
513+ avio_w8(pb, AMF_DATA_TYPE_STRING);
514+ put_amf_string(pb, pkt->data);
515+ put_amf_string(pb, "");
516+ avio_w8(pb, AMF_END_OF_OBJECT);
517+ /* write total size of tag */
518+ data_size = avio_tell(pb) - metadata_size_pos;
519+ avio_seek(pb, metadata_size_pos - 10, SEEK_SET);
520+ avio_wb24(pb, data_size);
521+ avio_seek(pb, data_size + 10 - 3, SEEK_CUR);
522+ avio_wb32(pb, data_size + 11);
523+ } else {
524+ avio_w8(pb,flags);
482525 if (enc->codec_id == CODEC_ID_VP6)
483526 avio_w8(pb,0);
484527 if (enc->codec_id == CODEC_ID_VP6F || enc->codec_id == CODEC_ID_VP6A)
@@ -494,7 +537,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) · 9 unmodified lines
494537
495538 avio_wb32(pb,size+flags_size+11); // previous tag size
496539 flv->duration = FFMAX(flv->duration, pkt->pts + flv->delay + pkt->duration);
497−
540+ }
498541 avio_flush(pb);
499542
500543 av_free(data);
libavformat/librtmp.c+91−26
@@ -24,13 +24,22 @@ · 23 unmodified lines
2424 * RTMP protocol based on http://rtmpdump.mplayerhq.hu/ librtmp
2525 */
2626
27+#include "libavutil/avstring.h"
2728 #include "libavutil/mathematics.h"
29+#include "libavutil/opt.h"
2830 #include "avformat.h"
2931 #include "url.h"
3032
3133 #include <librtmp/rtmp.h>
3234 #include <librtmp/log.h>
3335
36+typedef struct LibRTMPContext {
37+ const AVClass *class;
38+ RTMP rtmp;
39+ char *app;
40+ char *playpath;
41+} LibRTMPContext;
42+
3443 static void rtmp_log(int level, const char *fmt, va_list args)
3544 {
3645 switch (level) {
@@ -49,7 +58,8 @@ static void rtmp_log(int level, const char *fmt, va_list args) · 12 unmodified lines
4958
5059 static int rtmp_close(URLContext *s)
5160 {
52− RTMP *r = s->priv_data;
61+ LibRTMPContext *ctx = s->priv_data;
62+ RTMP *r = &ctx->rtmp;
5363
5464 RTMP_Close(r);
5565 return 0;
@@ -69,24 +79,45 @@ static int rtmp_close(URLContext *s) · 13 unmodified lines
6979 */
7080 static int rtmp_open(URLContext *s, const char *uri, int flags)
7181 {
72− RTMP *r = s->priv_data;
73− int rc;
82+ LibRTMPContext *ctx = s->priv_data;
83+ RTMP *r = &ctx->rtmp;
84+ int rc = 0, level;
85+ char *filename = s->filename;
7486
7587 switch (av_log_get_level()) {
7688 default:
77− case AV_LOG_FATAL: rc = RTMP_LOGCRIT; break;
78− case AV_LOG_ERROR: rc = RTMP_LOGERROR; break;
79− case AV_LOG_WARNING: rc = RTMP_LOGWARNING; break;
80− case AV_LOG_INFO: rc = RTMP_LOGINFO; break;
81− case AV_LOG_VERBOSE: rc = RTMP_LOGDEBUG; break;
82− case AV_LOG_DEBUG: rc = RTMP_LOGDEBUG2; break;
89+ case AV_LOG_FATAL: level = RTMP_LOGCRIT; break;
90+ case AV_LOG_ERROR: level = RTMP_LOGERROR; break;
91+ case AV_LOG_WARNING: level = RTMP_LOGWARNING; break;
92+ case AV_LOG_INFO: level = RTMP_LOGINFO; break;
93+ case AV_LOG_VERBOSE: level = RTMP_LOGDEBUG; break;
94+ case AV_LOG_DEBUG: level = RTMP_LOGDEBUG2; break;
8395 }
84− RTMP_LogSetLevel(rc);
96+ RTMP_LogSetLevel(level);
8597 RTMP_LogSetCallback(rtmp_log);
8698
99+ if (ctx->app || ctx->playpath) {
100+ int len = strlen(s->filename) + 1;
101+ if (ctx->app) len += strlen(ctx->app) + sizeof(" app=");
102+ if (ctx->playpath) len += strlen(ctx->playpath) + sizeof(" playpath=");
103+
104+ if (!(filename = av_malloc(len)))
105+ return AVERROR(ENOMEM);
106+
107+ av_strlcpy(filename, s->filename, len);
108+ if (ctx->app) {
109+ av_strlcat(filename, " app=", len);
110+ av_strlcat(filename, ctx->app, len);
111+ }
112+ if (ctx->playpath) {
113+ av_strlcat(filename, " playpath=", len);
114+ av_strlcat(filename, ctx->playpath, len);
115+ }
116+ }
117+
87118 RTMP_Init(r);
88− if (!RTMP_SetupURL(r, s->filename)) {
89− rc = -1;
119+ if (!RTMP_SetupURL(r, filename)) {
120+ rc = AVERROR_UNKNOWN;
90121 goto fail;
91122 }
92123
@@ -94,43 +125,49 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) · 1 unmodified line
94125 RTMP_EnableWrite(r);
95126
96127 if (!RTMP_Connect(r, NULL) || !RTMP_ConnectStream(r, 0)) {
97− rc = -1;
128+ rc = AVERROR_UNKNOWN;
98129 goto fail;
99130 }
100131
101132 s->is_streamed = 1;
102− return 0;
133+ rc = 0;
103134 fail:
135+ if (filename != s->filename)
136+ av_freep(&filename);
104137 return rc;
105138 }
106139
107140 static int rtmp_write(URLContext *s, const uint8_t *buf, int size)
108141 {
109− RTMP *r = s->priv_data;
142+ LibRTMPContext *ctx = s->priv_data;
143+ RTMP *r = &ctx->rtmp;
110144
111145 return RTMP_Write(r, buf, size);
112146 }
113147
114148 static int rtmp_read(URLContext *s, uint8_t *buf, int size)
115149 {
116− RTMP *r = s->priv_data;
150+ LibRTMPContext *ctx = s->priv_data;
151+ RTMP *r = &ctx->rtmp;
117152
118153 return RTMP_Read(r, buf, size);
119154 }
120155
121156 static int rtmp_read_pause(URLContext *s, int pause)
122157 {
123− RTMP *r = s->priv_data;
158+ LibRTMPContext *ctx = s->priv_data;
159+ RTMP *r = &ctx->rtmp;
124160
125161 if (!RTMP_Pause(r, pause))
126− return -1;
162+ return AVERROR_UNKNOWN;
127163 return 0;
128164 }
129165
130166 static int64_t rtmp_read_seek(URLContext *s, int stream_index,
131167 int64_t timestamp, int flags)
132168 {
133− RTMP *r = s->priv_data;
169+ LibRTMPContext *ctx = s->priv_data;
170+ RTMP *r = &ctx->rtmp;
134171
135172 if (flags & AVSEEK_FLAG_BYTE)
136173 return AVERROR(ENOSYS);
@@ -141,17 +178,36 @@ static int64_t rtmp_read_seek(URLContext *s, int stream_index, · 4 unmodified lines
141178 flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP);
142179
143180 if (!RTMP_SendSeek(r, timestamp))
144− return -1;
181+ return AVERROR_UNKNOWN;
145182 return timestamp;
146183 }
147184
148185 static int rtmp_get_file_handle(URLContext *s)
149186 {
150− RTMP *r = s->priv_data;
187+ LibRTMPContext *ctx = s->priv_data;
188+ RTMP *r = &ctx->rtmp;
151189
152190 return RTMP_Socket(r);
153191 }
154192
193+#define OFFSET(x) offsetof(LibRTMPContext, x)
194+#define DEC AV_OPT_FLAG_DECODING_PARAM
195+#define ENC AV_OPT_FLAG_ENCODING_PARAM
196+static const AVOption options[] = {
197+ {"rtmp_app", "Name of application to connect to on the RTMP server", OFFSET(app), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC},
198+ {"rtmp_playpath", "Stream identifier to play or to publish", OFFSET(playpath), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC},
199+ { NULL },
200+};
201+
202+#define RTMP_CLASS(flavor)\
203+static const AVClass lib ## flavor ## _class = {\
204+ .class_name = "lib" #flavor " protocol",\
205+ .item_name = av_default_item_name,\
206+ .option = options,\
207+ .version = LIBAVUTIL_VERSION_INT,\
208+};
209+
210+RTMP_CLASS(rtmp)
155211 URLProtocol ff_librtmp_protocol = {
156212 .name = "rtmp",
157213 .url_open = rtmp_open,
@@ -161,10 +217,12 @@ URLProtocol ff_librtmp_protocol = { · 3 unmodified lines
161217 .url_read_pause = rtmp_read_pause,
162218 .url_read_seek = rtmp_read_seek,
163219 .url_get_file_handle = rtmp_get_file_handle,
164− .priv_data_size = sizeof(RTMP),
220+ .priv_data_size = sizeof(LibRTMPContext),
221+ .priv_data_class = &librtmp_class,
165222 .flags = URL_PROTOCOL_FLAG_NETWORK,
166223 };
167224
225+RTMP_CLASS(rtmpt)
168226 URLProtocol ff_librtmpt_protocol = {
169227 .name = "rtmpt",
170228 .url_open = rtmp_open,
@@ -174,10 +232,12 @@ URLProtocol ff_librtmpt_protocol = { · 3 unmodified lines
174232 .url_read_pause = rtmp_read_pause,
175233 .url_read_seek = rtmp_read_seek,
176234 .url_get_file_handle = rtmp_get_file_handle,
177− .priv_data_size = sizeof(RTMP),
235+ .priv_data_size = sizeof(LibRTMPContext),
236+ .priv_data_class = &librtmpt_class,
178237 .flags = URL_PROTOCOL_FLAG_NETWORK,
179238 };
180239
240+RTMP_CLASS(rtmpe)
181241 URLProtocol ff_librtmpe_protocol = {
182242 .name = "rtmpe",
183243 .url_open = rtmp_open,
@@ -187,10 +247,12 @@ URLProtocol ff_librtmpe_protocol = { · 3 unmodified lines
187247 .url_read_pause = rtmp_read_pause,
188248 .url_read_seek = rtmp_read_seek,
189249 .url_get_file_handle = rtmp_get_file_handle,
190− .priv_data_size = sizeof(RTMP),
250+ .priv_data_size = sizeof(LibRTMPContext),
251+ .priv_data_class = &librtmpe_class,
191252 .flags = URL_PROTOCOL_FLAG_NETWORK,
192253 };
193254
255+RTMP_CLASS(rtmpte)
194256 URLProtocol ff_librtmpte_protocol = {
195257 .name = "rtmpte",
196258 .url_open = rtmp_open,
@@ -200,10 +262,12 @@ URLProtocol ff_librtmpte_protocol = { · 3 unmodified lines
200262 .url_read_pause = rtmp_read_pause,
201263 .url_read_seek = rtmp_read_seek,
202264 .url_get_file_handle = rtmp_get_file_handle,
203− .priv_data_size = sizeof(RTMP),
265+ .priv_data_size = sizeof(LibRTMPContext),
266+ .priv_data_class = &librtmpte_class,
204267 .flags = URL_PROTOCOL_FLAG_NETWORK,
205268 };
206269
270+RTMP_CLASS(rtmps)
207271 URLProtocol ff_librtmps_protocol = {
208272 .name = "rtmps",
209273 .url_open = rtmp_open,
@@ -213,6 +277,7 @@ URLProtocol ff_librtmps_protocol = { · 3 unmodified lines
213277 .url_read_pause = rtmp_read_pause,
214278 .url_read_seek = rtmp_read_seek,
215279 .url_get_file_handle = rtmp_get_file_handle,
216− .priv_data_size = sizeof(RTMP),
280+ .priv_data_size = sizeof(LibRTMPContext),
281+ .priv_data_class = &librtmps_class,
217282 .flags = URL_PROTOCOL_FLAG_NETWORK,
218283 };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

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

Repository code

Go to file
t