June 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r4507 - rtmp/rtmpproto.c
by kostya 23 Jun '09

23 Jun '09

Author: kostya Date: Tue Jun 23 20:21:41 2009 New Revision: 4507 Log: Buffer filling chunk belongs to the branch above Modified: rtmp/rtmpproto.c Modified: rtmp/rtmpproto.c ============================================================================== --- rtmp/rtmpproto.c Tue Jun 23 20:18:17 2009 (r4506) +++ rtmp/rtmpproto.c Tue Jun 23 20:21:41 2009 (r4507) @@ -535,12 +535,12 @@ static int rtmp_open(URLContext *s, cons //av_log(s, AV_LOG_DEBUG, "Proto = %s, path = %s, app = %s, fname = %s\n", // proto, path, app, rt->playpath); gen_connect(s, rt, proto, hostname, port, app); - } rt->flv_data = av_malloc(13); rt->flv_size = 13; rt->flv_off = 0; memcpy(rt->flv_data, "FLV\1\5\0\0\0\011\0\0\0\0", 13); + } s->max_packet_size = url_get_max_packet_size(rt->rtmp_hd); s->is_streamed = 1;

1 0

[soc]: r4505 - in rtmp: rtmpdec.c rtmppkt.c rtmppkt.h
by kostya 23 Jun '09

23 Jun '09

Author: kostya Date: Tue Jun 23 20:01:44 2009 New Revision: 4505 Log: Format->protocol transition: do not use AVFormatContext in RTMP packet reading/writing. Modified: rtmp/rtmpdec.c rtmp/rtmppkt.c rtmp/rtmppkt.h Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Tue Jun 23 19:55:11 2009 (r4504) +++ rtmp/rtmpdec.c Tue Jun 23 20:01:44 2009 (r4505) @@ -123,7 +123,7 @@ static void gen_connect(AVFormatContext pkt.data_size = p - pkt.data; - rtmp_packet_write(s, rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); + rtmp_packet_write(rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); } static void gen_create_stream(AVFormatContext *s, RTMPContext *rt) @@ -141,7 +141,7 @@ static void gen_create_stream(AVFormatCo rtmp_amf_write_tag(&p, AMF_NUMBER, &num); rtmp_amf_write_tag(&p, AMF_NULL, NULL); - rtmp_packet_write(s, rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); + rtmp_packet_write(rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); rtmp_packet_destroy(&pkt); } @@ -165,7 +165,7 @@ static void gen_play(AVFormatContext *s, num = 0.0; rtmp_amf_write_tag(&p, AMF_NUMBER, &num); - rtmp_packet_write(s, rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); + rtmp_packet_write(rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); rtmp_packet_destroy(&pkt); // set client buffer time disguised in ping packet @@ -176,7 +176,7 @@ static void gen_play(AVFormatContext *s, bytestream_put_be32(&p, 1); bytestream_put_be32(&p, 256); //TODO: what is a good value here? - rtmp_packet_write(s, rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); + rtmp_packet_write(rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); rtmp_packet_destroy(&pkt); } @@ -189,7 +189,7 @@ static void gen_pong(AVFormatContext *s, p = pkt.data; bytestream_put_be16(&p, 7); bytestream_put_be32(&p, AV_RB32(ppkt->data+2) + 1); - rtmp_packet_write(s, rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); + rtmp_packet_write(rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); rtmp_packet_destroy(&pkt); } @@ -481,7 +481,7 @@ static int rtmp_read_packet(AVFormatCont while (url_ftell(&rt->pb) == rt->flv_size) { RTMPPacket rpkt; int has_data = 0; - if ((ret = rtmp_packet_read(s, rt->rtmp_hd, &rpkt, + if ((ret = rtmp_packet_read(rt->rtmp_hd, &rpkt, rt->chunk_size, rt->prev_pkt[0])) != 0) { if (ret > 0) { nanosleep(&ts, NULL); Modified: rtmp/rtmppkt.c ============================================================================== --- rtmp/rtmppkt.c Tue Jun 23 19:55:11 2009 (r4504) +++ rtmp/rtmppkt.c Tue Jun 23 20:01:44 2009 (r4505) @@ -68,7 +68,7 @@ void rtmp_amf_write_tag(uint8_t **dst, A } } -int rtmp_packet_read(AVFormatContext *ctx, URLContext *h, RTMPPacket *p, +int rtmp_packet_read(URLContext *h, RTMPPacket *p, int chunk_size, RTMPPacket *prev_pkt) { uint8_t hdr, t, buf[16]; @@ -76,35 +76,29 @@ int rtmp_packet_read(AVFormatContext *ct uint8_t type; if (url_read(h, &hdr, 1) != 1) { - av_log(ctx, AV_LOG_ERROR, "Cannot read packet header\n"); return -1; } stream_id = hdr & 0x3F; hdr >>= 6; if (hdr == RTMP_PS_ONEBYTE) { - av_log(ctx, AV_LOG_ERROR, "Onebyte header!\n\n\n"); //todo return -1; } else { if (url_read_complete(h, buf, 3) != 3) { - av_log(ctx, AV_LOG_ERROR, "reading timestamp failed\n"); return -1; } timestamp = AV_RB24(buf); if (hdr != RTMP_PS_FOURBYTES) { if (url_read_complete(h, buf, 3) != 3) { - av_log(ctx, AV_LOG_ERROR, "reading size failed\n"); return -1; } data_size = AV_RB24(buf); if (url_read_complete(h, &type, 1) != 1) { - av_log(ctx, AV_LOG_ERROR, "reading type failed\n"); return -1; } if (hdr == RTMP_PS_TWELVEBYTES) { if (url_read(h, buf, 4) != 4) { - av_log(ctx, AV_LOG_ERROR, "reading timestamp2 failed\n"); return -1; } extra = AV_RL32(buf); @@ -129,7 +123,6 @@ int rtmp_packet_read(AVFormatContext *ct int toread = FFMIN(data_size, chunk_size); int r; if ((r = url_read_complete(h, p->data + offset, toread)) != toread) { - av_log(ctx, AV_LOG_ERROR, "Need %d read %d\n", toread, r); rtmp_packet_destroy(p); return -1; } @@ -138,8 +131,6 @@ int rtmp_packet_read(AVFormatContext *ct if (data_size > 0) { url_read_complete(h, &t, 1); //marker if (t != (0xC0 + stream_id)) { - av_log(ctx, AV_LOG_ERROR, "Expected marker %02X, got %02X\n", - t, 0xC0 + stream_id); return -1; } } @@ -147,7 +138,7 @@ int rtmp_packet_read(AVFormatContext *ct return 0; } -int rtmp_packet_write(AVFormatContext *ctx, URLContext *h, RTMPPacket *pkt, +int rtmp_packet_write(URLContext *h, RTMPPacket *pkt, int chunk_size, RTMPPacket *prev_pkt) { uint8_t pkt_hdr[16], *p = pkt_hdr; @@ -264,7 +255,7 @@ static void parse_amf(const uint8_t *dat } } -void rtmp_packet_inspect(AVFormatContext *ctx, RTMPPacket *pkt) +void rtmp_packet_inspect(RTMPPacket *pkt) { av_log(NULL,0,"Packet on "); switch (pkt->stream_id) { Modified: rtmp/rtmppkt.h ============================================================================== --- rtmp/rtmppkt.h Tue Jun 23 19:55:11 2009 (r4504) +++ rtmp/rtmppkt.h Tue Jun 23 20:01:44 2009 (r4505) @@ -111,16 +111,16 @@ int rtmp_packet_create(RTMPPacket *pkt, void rtmp_packet_destroy(RTMPPacket *pkt); -int rtmp_packet_read(AVFormatContext *ctx, URLContext *h, RTMPPacket *p, +int rtmp_packet_read(URLContext *h, RTMPPacket *p, int chunk_size, RTMPPacket *prev_pkt); -int rtmp_packet_write(AVFormatContext *ctx, URLContext *h, RTMPPacket *p, +int rtmp_packet_write(URLContext *h, RTMPPacket *p, int chunk_size, RTMPPacket *prev_pkt); int rtmp_amf_tag_size(int type, const void *data); void rtmp_amf_write_tag(uint8_t **dst, AMFType type, const void *data); -void rtmp_packet_inspect(AVFormatContext *ctx, RTMPPacket *pkt); +void rtmp_packet_inspect(RTMPPacket *pkt); #endif /* AVFORMAT_RTMPPKT_H */

1 0

[soc]: r4504 - rtmp/rtmpdec.c
by kostya 23 Jun '09

23 Jun '09

Author: kostya Date: Tue Jun 23 19:55:11 2009 New Revision: 4504 Log: Rename RTMPState into RTMPContext Modified: rtmp/rtmpdec.c Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Tue Jun 23 19:53:15 2009 (r4503) +++ rtmp/rtmpdec.c Tue Jun 23 19:55:11 2009 (r4504) @@ -43,7 +43,7 @@ typedef enum { STATE_PLAYING, } ClientState; -typedef struct RTMPState { +typedef struct RTMPContext { URLContext* rtmp_hd; RTMPPacket prev_pkt[2][RTMP_CHANNELS]; int chunk_size; @@ -55,7 +55,7 @@ typedef struct RTMPState { ByteIOContext pb; int wrong_dts; uint32_t video_ts, audio_ts; -} RTMPState; +} RTMPContext; #define PLAYER_KEY_OPEN_PART_LEN 30 static const uint8_t rtmp_player_key[] = @@ -79,7 +79,7 @@ static const uint8_t rtmp_server_key[] = 0xE6, 0x36, 0xCF, 0xEB, 0x31, 0xAE }; -static void gen_connect(AVFormatContext *s, RTMPState *rt, const char *proto, +static void gen_connect(AVFormatContext *s, RTMPContext *rt, const char *proto, const char *host, int port, const char *app) { RTMPPacket pkt; @@ -126,7 +126,7 @@ static void gen_connect(AVFormatContext rtmp_packet_write(s, rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); } -static void gen_create_stream(AVFormatContext *s, RTMPState *rt) +static void gen_create_stream(AVFormatContext *s, RTMPContext *rt) { RTMPPacket pkt; uint8_t *p; @@ -145,7 +145,7 @@ static void gen_create_stream(AVFormatCo rtmp_packet_destroy(&pkt); } -static void gen_play(AVFormatContext *s, RTMPState *rt) +static void gen_play(AVFormatContext *s, RTMPContext *rt) { RTMPPacket pkt; uint8_t *p; @@ -180,7 +180,7 @@ static void gen_play(AVFormatContext *s, rtmp_packet_destroy(&pkt); } -static void gen_pong(AVFormatContext *s, RTMPState *rt, RTMPPacket *ppkt) +static void gen_pong(AVFormatContext *s, RTMPContext *rt, RTMPPacket *ppkt) { RTMPPacket pkt; uint8_t *p; @@ -267,7 +267,7 @@ static int rtmp_validate_digest(uint8_t return 0; } -static int rtmp_handshake(AVFormatContext *s, RTMPState *rt) +static int rtmp_handshake(AVFormatContext *s, RTMPContext *rt) { AVLFG rnd; uint8_t tosend [RTMP_HANDSHAKE_PACKET_SIZE+1]; @@ -351,7 +351,7 @@ static int rtmp_probe(AVProbeData *p) static int rtmp_read_header(AVFormatContext *s, AVFormatParameters *ap) { - RTMPState *rt = s->priv_data; + RTMPContext *rt = s->priv_data; char proto[8], hostname[256], path[512], app[128], *fname; int port; uint8_t buf[2048]; @@ -421,7 +421,7 @@ static int rtmp_read_header(AVFormatCont return 0; } -static int rtmp_parse_result(AVFormatContext *s, RTMPState *rt, RTMPPacket *pkt) +static int rtmp_parse_result(AVFormatContext *s, RTMPContext *rt, RTMPPacket *pkt) { int i, t; @@ -471,7 +471,7 @@ static int rtmp_parse_result(AVFormatCon static int rtmp_read_packet(AVFormatContext *s, AVPacket *pkt) { - RTMPState *rt = s->priv_data; + RTMPContext *rt = s->priv_data; struct timespec ts; int ret; @@ -543,7 +543,7 @@ static int rtmp_read_packet(AVFormatCont static int rtmp_read_close(AVFormatContext *s) { - RTMPState *rt = s->priv_data; + RTMPContext *rt = s->priv_data; av_freep(&rt->flv_data); url_close(rt->rtmp_hd); @@ -553,7 +553,7 @@ static int rtmp_read_close(AVFormatConte AVInputFormat rtmp_demuxer = { "rtmp", NULL_IF_CONFIG_SMALL("RTMP"), - sizeof(RTMPState), + sizeof(RTMPContext), rtmp_probe, rtmp_read_header, rtmp_read_packet,

1 0

[soc]: r4502 - seek_api/mpeg.c
by spyfeng 23 Jun '09

23 Jun '09

Author: spyfeng Date: Tue Jun 23 18:55:11 2009 New Revision: 4502 Log: because we built index entries correctly, we seek to the target frame by indexes. Modified: seek_api/mpeg.c Modified: seek_api/mpeg.c ============================================================================== --- seek_api/mpeg.c Mon Jun 22 11:21:00 2009 (r4501) +++ seek_api/mpeg.c Tue Jun 23 18:55:11 2009 (r4502) @@ -652,33 +652,31 @@ static int mpegps_read_seek(struct AVFor AVIndexEntry *e; index = av_index_search_timestamp(st, ts, flags); - if (index >= 0) { - e = &st->index_entries[index]; - pos = e->pos; - pts = e->timestamp; - av_log(s, AV_LOG_DEBUG, "the seek pos = %"PRId64", pts = %"PRId64", targe timestamp = %"PRId64"\n", pos, pts, ts); - - if (pts == ts || (ts < pts && index == 0)) { // find the target timestamp - url_fseek(s->pb, pos, SEEK_SET); - goto success; - } + if (index == -1) + return -1; - if (flags & AVSEEK_FLAG_ANY) { + e = &st->index_entries[index]; + pos = e->pos; + pts = e->timestamp; + av_log(s, AV_LOG_DEBUG, "the seek pos = %"PRId64", pts = %"PRId64", targe timestamp = %"PRId64"\n", pos, pts, ts); + if (flags & AVSEEK_FLAG_ANY) { - while(pts > ts) { // find the index timestamp smaller than target timestamp - index--; - pts = st->index_entries[index].timestamp; - pos = st->index_entries[index].pos; - } + while(pts > ts) { // find the index timestamp smaller than target timestamp + index--; + pts = st->index_entries[index].timestamp; + pos = st->index_entries[index].pos; + } - if (find_keyframe(s, stream_index, &pos, &pts, ts, flags) == 0) { - goto success; - } else { - return -1; - } + if (find_keyframe(s, stream_index, &pos, &pts, ts, flags) == 0) { + goto success; + } else { + return -1; } + } else { + url_fseek(s->pb, pos, SEEK_SET); + goto success; } - } + } // search the scr use binary search ts_max = ts_min = AV_NOPTS_VALUE; @@ -694,6 +692,7 @@ static int mpegps_read_seek(struct AVFor pos = ret_pos; pts = ret_ts; } + if (find_keyframe(s, stream_index, &pos, &pts, ts, flags) == 0) { goto success; } else {

1 0

[soc]: r4501 - rtmp/rtmppkt.c
by kostya 22 Jun '09

22 Jun '09

Author: kostya Date: Mon Jun 22 11:21:00 2009 New Revision: 4501 Log: Disable sending packets with short header, not all RTMP servers like them. Modified: rtmp/rtmppkt.c Modified: rtmp/rtmppkt.c ============================================================================== --- rtmp/rtmppkt.c Mon Jun 22 11:19:36 2009 (r4500) +++ rtmp/rtmppkt.c Mon Jun 22 11:21:00 2009 (r4501) @@ -154,8 +154,8 @@ int rtmp_packet_write(AVFormatContext *c int mode = RTMP_PS_TWELVEBYTES; int off = 0; - if (pkt->type != RTMP_PT_INVOKE) - mode = RTMP_PS_EIGHTBYTES; +// if (pkt->type != RTMP_PT_INVOKE) +// mode = RTMP_PS_EIGHTBYTES; bytestream_put_byte(&p, pkt->stream_id | (mode << 6)); if (mode != RTMP_PS_ONEBYTE) { bytestream_put_be24(&p, pkt->timestamp);

1 0

[soc]: r4500 - rtmp/rtmppkt.c
by kostya 22 Jun '09

22 Jun '09

Author: kostya Date: Mon Jun 22 11:19:36 2009 New Revision: 4500 Log: Use packet history to read RTMP packets with partial header Modified: rtmp/rtmppkt.c Modified: rtmp/rtmppkt.c ============================================================================== --- rtmp/rtmppkt.c Mon Jun 22 11:18:44 2009 (r4499) +++ rtmp/rtmppkt.c Mon Jun 22 11:19:36 2009 (r4500) @@ -72,7 +72,7 @@ int rtmp_packet_read(AVFormatContext *ct int chunk_size, RTMPPacket *prev_pkt) { uint8_t hdr, t, buf[16]; - int stream_id, timestamp, data_size, offset = 0; + int stream_id, timestamp, data_size, offset = 0, extra = 0; uint8_t type; if (url_read(h, &hdr, 1) != 1) { @@ -102,20 +102,29 @@ int rtmp_packet_read(AVFormatContext *ct av_log(ctx, AV_LOG_ERROR, "reading type failed\n"); return -1; } - if (hdr == RTMP_PS_TWELVEBYTES) + if (hdr == RTMP_PS_TWELVEBYTES) { if (url_read(h, buf, 4) != 4) { av_log(ctx, AV_LOG_ERROR, "reading timestamp2 failed\n"); return -1; } + extra = AV_RL32(buf); + } else { + extra = prev_pkt[stream_id].extra; + } } else { - av_log(ctx, AV_LOG_ERROR, "Fourbytes!\n\n\n"); - //todo - return -1; + data_size = prev_pkt[stream_id].data_size; + type = prev_pkt[stream_id].type; + extra = prev_pkt[stream_id].extra; } } - rtmp_packet_create(p, stream_id, type, type, data_size); - if (hdr == RTMP_PS_TWELVEBYTES) - p->extra = AV_RL32(buf); + rtmp_packet_create(p, stream_id, type, timestamp, data_size); + p->extra = extra; + // save history + prev_pkt[stream_id].stream_id = type; + prev_pkt[stream_id].type = stream_id; + prev_pkt[stream_id].data_size = data_size; + prev_pkt[stream_id].timestamp = timestamp; + prev_pkt[stream_id].extra = extra; while (data_size > 0) { int toread = FFMIN(data_size, chunk_size); int r;

1 0

[soc]: r4499 - rtmp/rtmpdec.c
by kostya 22 Jun '09

22 Jun '09

Author: kostya Date: Mon Jun 22 11:18:44 2009 New Revision: 4499 Log: RTMP packets contain timestamp changes, so track real timestamps Modified: rtmp/rtmpdec.c Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Mon Jun 22 11:17:46 2009 (r4498) +++ rtmp/rtmpdec.c Mon Jun 22 11:18:44 2009 (r4499) @@ -54,6 +54,7 @@ typedef struct RTMPState { int flv_size; ByteIOContext pb; int wrong_dts; + uint32_t video_ts, audio_ts; } RTMPState; #define PLAYER_KEY_OPEN_PART_LEN 30 @@ -500,14 +501,22 @@ static int rtmp_read_packet(AVFormatCont if (rpkt.type == RTMP_PT_VIDEO || rpkt.type == RTMP_PT_AUDIO || rpkt.type == RTMP_PT_NOTIFY) { uint8_t *p; + uint32_t ts = rpkt.timestamp; + if (rpkt.type == RTMP_PT_VIDEO) { + rt->video_ts += rpkt.timestamp; + ts = rt->video_ts; + } else if (rpkt.type == RTMP_PT_AUDIO) { + rt->audio_ts += rpkt.timestamp; + ts = rt->audio_ts; + } rt->flv_size = rpkt.data_size + 15; rt->flv_data = p = av_realloc(rt->flv_data, rt->flv_size); bytestream_put_be32(&p, 0); bytestream_put_byte(&p, rpkt.type); bytestream_put_be24(&p, rpkt.data_size); - bytestream_put_be24(&p, rpkt.extra); - bytestream_put_byte(&p, rpkt.extra >> 24); + bytestream_put_be24(&p, ts); + bytestream_put_byte(&p, ts >> 24); bytestream_put_be24(&p, 0); bytestream_put_buffer(&p, rpkt.data, rpkt.data_size); has_data = 1;

1 0

[soc]: r4498 - rtmp/rtmpdec.c
by kostya 22 Jun '09

22 Jun '09

Author: kostya Date: Mon Jun 22 11:17:46 2009 New Revision: 4498 Log: Inform about RTMP chunk size change event in debug mode Modified: rtmp/rtmpdec.c Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Sun Jun 21 20:11:50 2009 (r4497) +++ rtmp/rtmpdec.c Mon Jun 22 11:17:46 2009 (r4498) @@ -430,6 +430,7 @@ static int rtmp_parse_result(AVFormatCon return -1; } rt->chunk_size = AV_RB32(pkt->data); + av_log(s, AV_LOG_DEBUG, "New chunk size = %d\n", rt->chunk_size); break; case RTMP_PT_PING: t = AV_RB16(pkt->data);

1 0

[soc]: r4497 - seek_api/utils.c
by spyfeng 21 Jun '09

21 Jun '09

Author: spyfeng Date: Sun Jun 21 20:11:50 2009 New Revision: 4497 Log: set correct pos for index entires. Modified: seek_api/utils.c Modified: seek_api/utils.c ============================================================================== --- seek_api/utils.c Sun Jun 21 20:09:54 2009 (r4496) +++ seek_api/utils.c Sun Jun 21 20:11:50 2009 (r4497) @@ -945,7 +945,7 @@ static int av_read_frame_internal(AVForm if((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & PKT_FLAG_KEY){ ff_reduce_index(s, st->index); - av_add_index_entry(st, st->parser->frame_offset, pkt->dts, + av_add_index_entry(st, pkt->pos/*st->parser->frame_offset*/, pkt->dts, 0, 0, AVINDEX_KEYFRAME); }

1 0

[soc]: r4496 - seek_api/utils.c
by spyfeng 21 Jun '09

21 Jun '09

Author: spyfeng Date: Sun Jun 21 20:09:54 2009 New Revision: 4496 Log: set correct pos for st->parser->pos Modified: seek_api/utils.c Modified: seek_api/utils.c ============================================================================== --- seek_api/utils.c Sun Jun 21 20:00:34 2009 (r4495) +++ seek_api/utils.c Sun Jun 21 20:09:54 2009 (r4496) @@ -937,6 +937,8 @@ static int av_read_frame_internal(AVForm pkt->stream_index = st->index; pkt->pts = st->parser->pts; pkt->dts = st->parser->dts; + if (st->parser->pos == -1) + st->parser->pos = st->parser->last_pos + len; pkt->pos = st->parser->pos; pkt->destruct = NULL; compute_pkt_fields(s, st, st->parser, pkt);

1 0