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

[soc]: r4485 - rtmp/rtmpdec.c
by kostya 18 Jun '09

18 Jun '09

Author: kostya Date: Thu Jun 18 07:00:23 2009 New Revision: 4485 Log: cosmetics: vertical align Modified: rtmp/rtmpdec.c Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Thu Jun 18 06:58:33 2009 (r4484) +++ rtmp/rtmpdec.c Thu Jun 18 07:00:23 2009 (r4485) @@ -44,16 +44,16 @@ typedef enum { } ClientState; typedef struct RTMPState { - URLContext *rtmp_hd; - RTMPPacket prev_pkt[2][RTMP_CHANNELS]; - int chunk_size; - char playpath[256]; - ClientState state; - int main_stream_id; - uint8_t *flv_data; - int flv_size; + URLContext* rtmp_hd; + RTMPPacket prev_pkt[2][RTMP_CHANNELS]; + int chunk_size; + char playpath[256]; + ClientState state; + int main_stream_id; + uint8_t* flv_data; + int flv_size; ByteIOContext pb; - int wrong_dts; + int wrong_dts; } RTMPState; #define PLAYER_KEY_OPEN_PART_LEN 30

1 0

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

18 Jun '09

Author: kostya Date: Thu Jun 18 06:58:33 2009 New Revision: 4484 Log: Use common chunk_size instead of one for each channel, and as a consequence, get rid of RTMPPacketHistory since simple array of RTMPPacket is enough. Modified: rtmp/rtmpdec.c rtmp/rtmppkt.c rtmp/rtmppkt.h Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Thu Jun 18 06:38:39 2009 (r4483) +++ rtmp/rtmpdec.c Thu Jun 18 06:58:33 2009 (r4484) @@ -45,7 +45,8 @@ typedef enum { typedef struct RTMPState { URLContext *rtmp_hd; - RTMPPacketHistory rhist, whist; + RTMPPacket prev_pkt[2][RTMP_CHANNELS]; + int chunk_size; char playpath[256]; ClientState state; int main_stream_id; @@ -121,7 +122,7 @@ static void gen_connect(AVFormatContext pkt.data_size = p - pkt.data; - rtmp_packet_write(s, rt->rtmp_hd, &pkt, &rt->whist); + rtmp_packet_write(s, rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); } static void gen_create_stream(AVFormatContext *s, RTMPState *rt) @@ -139,7 +140,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->whist); + rtmp_packet_write(s, rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); rtmp_packet_destroy(&pkt); } @@ -163,7 +164,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->whist); + rtmp_packet_write(s, rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); rtmp_packet_destroy(&pkt); // set client buffer time disguised in ping packet @@ -174,7 +175,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->whist); + rtmp_packet_write(s, rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); rtmp_packet_destroy(&pkt); } @@ -187,7 +188,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->whist); + rtmp_packet_write(s, rt->rtmp_hd, &pkt, rt->chunk_size, rt->prev_pkt[1]); rtmp_packet_destroy(&pkt); } @@ -339,15 +340,6 @@ static int rtmp_handshake(AVFormatContex return 0; } -static void rtmp_init_hist(RTMPPacketHistory *hist) -{ - int i; - - for (i = 0; i < RTMP_CHANNELS; i++) { - hist->chunk_size[i] = (i == RTMP_AUDIO_CHANNEL) ? 64 : 128; - } -} - static int rtmp_probe(AVProbeData *p) { if (av_strstart(p->filename, "rtmp:", NULL)) @@ -367,8 +359,6 @@ static int rtmp_read_header(AVFormatCont url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), s->filename); - rtmp_init_hist(&rt->rhist); - rtmp_init_hist(&rt->whist); if(port == -1) port = RTMP_DEFAULT_PORT; snprintf(buf, sizeof(buf), "tcp://%s:%d", hostname, port); @@ -377,6 +367,7 @@ static int rtmp_read_header(AVFormatCont if (rtmp_handshake(s, rt)) return -1; + rt->chunk_size = 128; rt->state = STATE_HANDSHAKED; //extract "app" part from path if (!strncmp(path, "/ondemand/", 10)) { @@ -438,11 +429,7 @@ static int rtmp_parse_result(AVFormatCon pkt->data_size); return -1; } - t = AV_RB32(pkt->data); - for (i = 0; i < RTMP_CHANNELS; i++) { - rt->rhist.chunk_size[i] = t; - rt->whist.chunk_size[i] = t; - } + rt->chunk_size = AV_RB32(pkt->data); break; case RTMP_PT_PING: t = AV_RB16(pkt->data); @@ -490,7 +477,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, &rt->rhist)) != 0) { + if ((ret = rtmp_packet_read(s, rt->rtmp_hd, &rpkt, rt->chunk_size, rt->prev_pkt[0])) != 0) { if (ret > 0) { nanosleep(&ts, NULL); continue; Modified: rtmp/rtmppkt.c ============================================================================== --- rtmp/rtmppkt.c Thu Jun 18 06:38:39 2009 (r4483) +++ rtmp/rtmppkt.c Thu Jun 18 06:58:33 2009 (r4484) @@ -69,7 +69,7 @@ void rtmp_amf_write_tag(uint8_t **dst, A } int rtmp_packet_read(AVFormatContext *ctx, URLContext *h, RTMPPacket *p, - RTMPPacketHistory *hist) + int chunk_size, RTMPPacket *prev_pkt) { uint8_t hdr, t, buf[16]; int stream_id, timestamp, data_size, offset = 0; @@ -117,15 +117,15 @@ int rtmp_packet_read(AVFormatContext *ct if (hdr == RTMP_PS_TWELVEBYTES) p->extra = AV_RL32(buf); while (data_size > 0) { - int toread = FFMIN(data_size, hist->chunk_size[stream_id]); + 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; } - data_size -= hist->chunk_size[stream_id]; - offset += hist->chunk_size[stream_id]; + data_size -= chunk_size; + offset += chunk_size; if (data_size > 0) { url_read_complete(h, &t, 1); //marker if (t != (0xC0 + stream_id)) { @@ -138,11 +138,10 @@ int rtmp_packet_read(AVFormatContext *ct } int rtmp_packet_write(AVFormatContext *ctx, URLContext *h, RTMPPacket *pkt, - RTMPPacketHistory *hist) + int chunk_size, RTMPPacket *prev_pkt) { uint8_t pkt_hdr[16], *p = pkt_hdr; int mode = RTMP_PS_TWELVEBYTES; - int chunk_size = hist->chunk_size[pkt->stream_id]; int off = 0; if (pkt->type != RTMP_PT_INVOKE) @@ -280,7 +279,9 @@ void rtmp_packet_inspect(AVFormatContext default: av_log(NULL,0,"%X",pkt->type); } av_log(NULL,0," ts %d/%d size %d\n", pkt->timestamp, pkt->extra, pkt->data_size); - if (pkt->type == RTMP_PT_INVOKE || pkt->type == RTMP_PT_NOTIFY - || pkt->type == RTMP_PT_METADATA) + if (pkt->type == RTMP_PT_INVOKE || pkt->type == RTMP_PT_NOTIFY) parse_amf(pkt->data, pkt->data_size); + if (pkt->type == RTMP_PT_VIDEO && pkt->data_size < 10){ + int i;av_log(NULL,0,"Data:");for(i=0;i<pkt->data_size;i++)av_log(NULL,0," %02X",pkt->data[i]);av_log(NULL,0,"\n"); + } } Modified: rtmp/rtmppkt.h ============================================================================== --- rtmp/rtmppkt.h Thu Jun 18 06:38:39 2009 (r4483) +++ rtmp/rtmppkt.h Thu Jun 18 06:58:33 2009 (r4484) @@ -106,26 +106,16 @@ typedef struct RTMPPacket { int data_size; ///< packet payload size } RTMPPacket; -/** - * saved parameters for reading RTMP packets - * - * Since RTMP server may choose to send partial packet for some channel we need - * to set missing parameters from the previous packet on the same channel. - */ -typedef struct RTMPPacketHistory { - RTMPPacket prev_pkt[RTMP_CHANNELS]; ///< previous read packet parameters - int chunk_size[RTMP_CHANNELS]; ///< chunk size for each channel -} RTMPPacketHistory; - - int rtmp_packet_create(RTMPPacket *pkt, int stream_id, RTMPPacketType type, int timestamp, int size); void rtmp_packet_destroy(RTMPPacket *pkt); -int rtmp_packet_read(AVFormatContext *ctx, URLContext *h, RTMPPacket *p, RTMPPacketHistory *hist); +int rtmp_packet_read(AVFormatContext *ctx, URLContext *h, RTMPPacket *p, + int chunk_size, RTMPPacket *prev_pkt); -int rtmp_packet_write(AVFormatContext *ctx, URLContext *h, RTMPPacket *p, RTMPPacketHistory *hist); +int rtmp_packet_write(AVFormatContext *ctx, URLContext *h, RTMPPacket *p, + int chunk_size, RTMPPacket *prev_pkt); int rtmp_amf_tag_size(int type, const void *data);

1 0

[soc]: r4483 - rtmp/rtmpdec.c
by kostya 18 Jun '09

18 Jun '09

Author: kostya Date: Thu Jun 18 06:38:39 2009 New Revision: 4483 Log: Drop two borrowed functions that are not needed anymore Modified: rtmp/rtmpdec.c Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Thu Jun 18 06:37:40 2009 (r4482) +++ rtmp/rtmpdec.c Thu Jun 18 06:38:39 2009 (r4483) @@ -427,64 +427,6 @@ static int rtmp_read_header(AVFormatCont return 0; } -static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_codecid) { - AVCodecContext *acodec = astream->codec; - switch(flv_codecid) { - //no distinction between S16 and S8 PCM codec flags - case FLV_CODECID_PCM: - acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_S8 : -#ifdef WORDS_BIGENDIAN - CODEC_ID_PCM_S16BE; -#else - CODEC_ID_PCM_S16LE; -#endif - break; - case FLV_CODECID_PCM_LE: - acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16LE; break; - case FLV_CODECID_AAC : acodec->codec_id = CODEC_ID_AAC; break; - case FLV_CODECID_ADPCM: acodec->codec_id = CODEC_ID_ADPCM_SWF; break; - case FLV_CODECID_SPEEX: - acodec->codec_id = CODEC_ID_SPEEX; - acodec->sample_rate = 16000; - break; - case FLV_CODECID_MP3 : acodec->codec_id = CODEC_ID_MP3 ; astream->need_parsing = AVSTREAM_PARSE_FULL; break; - case FLV_CODECID_NELLYMOSER_8KHZ_MONO: - acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate - case FLV_CODECID_NELLYMOSER: - acodec->codec_id = CODEC_ID_NELLYMOSER; - break; - default: - av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flv_codecid >> FLV_AUDIO_CODECID_OFFSET); - acodec->codec_tag = flv_codecid >> FLV_AUDIO_CODECID_OFFSET; - } -} - -static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid) { - AVCodecContext *vcodec = vstream->codec; - switch(flv_codecid) { - case FLV_CODECID_H263 : vcodec->codec_id = CODEC_ID_FLV1 ; break; - case FLV_CODECID_SCREEN: vcodec->codec_id = CODEC_ID_FLASHSV; break; - case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ; - case FLV_CODECID_VP6A : - if(flv_codecid == FLV_CODECID_VP6A) - vcodec->codec_id = CODEC_ID_VP6A; - if(vcodec->extradata_size != 1) { - vcodec->extradata_size = 1; - vcodec->extradata = av_malloc(1); - } - vcodec->extradata[0] = get_byte(s->pb); - return 1; // 1 byte body size adjustment for flv_read_packet() - case FLV_CODECID_H264: - vcodec->codec_id = CODEC_ID_H264; - return 3; // not 4, reading packet type will consume one byte - default: - av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid); - vcodec->codec_tag = flv_codecid; - } - - return 0; -} - static int rtmp_parse_result(AVFormatContext *s, RTMPState *rt, RTMPPacket *pkt) { int i, t;

1 0

[soc]: r4482 - rtmp/rtmpdec.c
by kostya 18 Jun '09

18 Jun '09

Author: kostya Date: Thu Jun 18 06:37:40 2009 New Revision: 4482 Log: Call packet parsing from FLV instead of using copypasted code Modified: rtmp/rtmpdec.c Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Thu Jun 18 06:35:26 2009 (r4481) +++ rtmp/rtmpdec.c Thu Jun 18 06:37:40 2009 (r4482) @@ -49,6 +49,10 @@ typedef struct RTMPState { char playpath[256]; ClientState state; int main_stream_id; + uint8_t *flv_data; + int flv_size; + ByteIOContext pb; + int wrong_dts; } RTMPState; #define PLAYER_KEY_OPEN_PART_LEN 30 @@ -419,6 +423,7 @@ static int rtmp_read_header(AVFormatCont st->codec->codec_type = CODEC_TYPE_AUDIO; av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ + init_put_byte(&rt->pb, NULL, 0, 0, NULL, NULL, NULL, NULL); return 0; } @@ -534,15 +539,15 @@ static int rtmp_parse_result(AVFormatCon static int rtmp_read_packet(AVFormatContext *s, AVPacket *pkt) { RTMPState *rt = s->priv_data; - AVStream *st = NULL; struct timespec ts; - int i, ret; + int ret; ts.tv_sec = 0; ts.tv_nsec = 500000000; - for (;;) { + + while (url_ftell(&rt->pb) == rt->flv_size) { RTMPPacket rpkt; - int i; + int has_data = 0; if ((ret = rtmp_packet_read(s, rt->rtmp_hd, &rpkt, &rt->rhist)) != 0) { if (ret > 0) { nanosleep(&ts, NULL); @@ -557,73 +562,47 @@ static int rtmp_read_packet(AVFormatCont rtmp_packet_destroy(&rpkt); return -1; } + if (!rpkt.data_size) { + rtmp_packet_destroy(&rpkt); + continue; + } + if (rpkt.type == RTMP_PT_VIDEO || rpkt.type == RTMP_PT_AUDIO || rpkt.type == RTMP_PT_NOTIFY) { + uint8_t *p; - if (rpkt.type == RTMP_PT_CHUNK_SIZE) - for(i=0;i<RTMP_CHANNELS;i++)rt->rhist.chunk_size[i/*rpkt.stream_id*/] = AV_RB32(rpkt.data); - if (rpkt.type == RTMP_PT_VIDEO || rpkt.type == RTMP_PT_AUDIO) { - int is_audio = rpkt.type == RTMP_PT_AUDIO; - int flags; - int off = 1; - - flags = rpkt.data[0]; - for (i = 0; i < s->nb_streams; i++) { - st = s->streams[i]; - if (st->id == is_audio) - break; - } - if (is_audio && (!st->codec->channels || !st->codec->sample_rate || !st->codec->bits_per_coded_sample)) { - st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1; - st->codec->sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3); - st->codec->bits_per_coded_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8; - } - if (!st->codec->codec_id) { - if (is_audio) - flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK); - else - flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK); - } - if (st->codec->codec_id == CODEC_ID_AAC || - st->codec->codec_id == CODEC_ID_H264) { - int type = rpkt.data[off++]; - - if (st->codec->codec_id == CODEC_ID_H264) { - off += 3; - } - if (!type) { - av_free(st->codec->extradata); - st->codec->extradata = av_mallocz(rpkt.data_size - off + FF_INPUT_BUFFER_PADDING_SIZE); - if (!st->codec->extradata) { - av_log(s, AV_LOG_ERROR, "Cannot allocate extradata\n"); - return AVERROR(ENOMEM); - } - st->codec->extradata_size = rpkt.data_size - off; - memcpy(st->codec->extradata, rpkt.data + off, rpkt.data_size - off); - rtmp_packet_destroy(&rpkt); - continue; - } - } - if (off < rpkt.data_size) { - if (av_new_packet(pkt, rpkt.data_size - off) < 0) { - rtmp_packet_destroy(&rpkt); - return -1; - } - memcpy(pkt->data, rpkt.data + off, rpkt.data_size - off); - pkt->stream_index = st->index; - //pkt->pts = rpkt.timestamp; - rtmp_packet_destroy(&rpkt); - - return pkt->size; - } + 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, 0); + bytestream_put_buffer(&p, rpkt.data, rpkt.data_size); + has_data = 1; + } else if (rpkt.type == RTMP_PT_METADATA) { + rt->flv_size = rpkt.data_size + 4; + rt->flv_data = av_realloc(rt->flv_data, rt->flv_size); + memset(rt->flv_data, 0, 4); //previous packet size + memcpy(rt->flv_data + 4, rpkt.data, rpkt.data_size); + has_data = 1; } rtmp_packet_destroy(&rpkt); + if (has_data) { + init_put_byte(&rt->pb, rt->flv_data, rt->flv_size, 0, NULL, NULL, NULL, NULL); + break; + } } - return AVERROR(EIO); + ret = ff_flv_read_packet(s, &rt->pb, pkt, &rt->wrong_dts); + if (ret == AVERROR_EOF) + return AVERROR(EAGAIN); + return ret; } static int rtmp_read_close(AVFormatContext *s) { RTMPState *rt = s->priv_data; + av_freep(&rt->flv_data); url_close(rt->rtmp_hd); return 0; }

1 0

[soc]: r4481 - rtmp/rtmpdec.c
by kostya 18 Jun '09

18 Jun '09

Author: kostya Date: Thu Jun 18 06:35:26 2009 New Revision: 4481 Log: Server reply to 'connect' call contains channel ID which should be used in subsequent calls; so extract, save and use it where applicable. Modified: rtmp/rtmpdec.c Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Thu Jun 18 06:30:49 2009 (r4480) +++ rtmp/rtmpdec.c Thu Jun 18 06:35:26 2009 (r4481) @@ -48,6 +48,7 @@ typedef struct RTMPState { RTMPPacketHistory rhist, whist; char playpath[256]; ClientState state; + int main_stream_id; } RTMPState; #define PLAYER_KEY_OPEN_PART_LEN 30 @@ -147,6 +148,7 @@ static void gen_play(AVFormatContext *s, av_log(s, AV_LOG_DEBUG, "Sending play command for '%s'\n", rt->playpath); rtmp_packet_create(&pkt, RTMP_VIDEO_CHANNEL, RTMP_PT_INVOKE, 0, 29 + strlen(rt->playpath)); + pkt.extra = rt->main_stream_id; num = 0.0; p = pkt.data; @@ -511,6 +513,11 @@ static int rtmp_parse_result(AVFormatCon rt->state = STATE_CONNECTING; break; case STATE_CONNECTING: + //extract a number from result + if (pkt->data[10] || pkt->data[19] != 5 || pkt->data[20]) + av_log(s, AV_LOG_WARNING, "Unexpected reply on connect()\n"); + else + rt->main_stream_id = (int) av_int2dbl(AV_RB64(pkt->data + 21)); gen_play(s, rt); rt->state = STATE_PLAYING; break;

1 0

[soc]: r4480 - rtmp/rtmpdec.c
by kostya 18 Jun '09

18 Jun '09

Author: kostya Date: Thu Jun 18 06:30:49 2009 New Revision: 4480 Log: Handle ping from server Modified: rtmp/rtmpdec.c Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Thu Jun 18 06:28:28 2009 (r4479) +++ rtmp/rtmpdec.c Thu Jun 18 06:30:49 2009 (r4480) @@ -172,6 +172,19 @@ static void gen_play(AVFormatContext *s, rtmp_packet_destroy(&pkt); } +static void gen_pong(AVFormatContext *s, RTMPState *rt, RTMPPacket *ppkt) +{ + RTMPPacket pkt; + uint8_t *p; + + rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL, RTMP_PT_PING, ppkt->timestamp + 1, 6); + 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->whist); + rtmp_packet_destroy(&pkt); +} + //TODO: Move HMAC code somewhere. Eventually. #define HMAC_IPAD_VAL 0x36 #define HMAC_OPAD_VAL 0x5C @@ -482,6 +495,11 @@ static int rtmp_parse_result(AVFormatCon rt->whist.chunk_size[i] = t; } break; + case RTMP_PT_PING: + t = AV_RB16(pkt->data); + if (t == 6) + gen_pong(s, rt, pkt); + break; case RTMP_PT_INVOKE: if (!memcmp(pkt->data, "\002\000\006_error", 9)) {//TODO: search data for error description return -1;

1 0

[soc]: r4479 - rtmp/rtmpdec.c
by kostya 18 Jun '09

18 Jun '09

Author: kostya Date: Thu Jun 18 06:28:28 2009 New Revision: 4479 Log: Parse and perform some actions on incoming RTMP packets Modified: rtmp/rtmpdec.c Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Thu Jun 18 06:23:31 2009 (r4478) +++ rtmp/rtmpdec.c Thu Jun 18 06:28:28 2009 (r4479) @@ -465,6 +465,47 @@ static int flv_set_video_codec(AVFormatC return 0; } +static int rtmp_parse_result(AVFormatContext *s, RTMPState *rt, RTMPPacket *pkt) +{ + int i, t; + + switch (pkt->type) { + case RTMP_PT_CHUNK_SIZE: + if (pkt->data_size != 4) { + av_log(s, AV_LOG_ERROR, "Chunk size change packet is not 4 (%d)\n", + pkt->data_size); + return -1; + } + t = AV_RB32(pkt->data); + for (i = 0; i < RTMP_CHANNELS; i++) { + rt->rhist.chunk_size[i] = t; + rt->whist.chunk_size[i] = t; + } + break; + case RTMP_PT_INVOKE: + if (!memcmp(pkt->data, "\002\000\006_error", 9)) {//TODO: search data for error description + return -1; + } + if (!memcmp(pkt->data, "\002\000\007_result", 10)) { + switch (rt->state) { + case STATE_HANDSHAKED: + gen_create_stream(s, rt); + rt->state = STATE_CONNECTING; + break; + case STATE_CONNECTING: + gen_play(s, rt); + rt->state = STATE_PLAYING; + break; + } + } + if (!memcmp(pkt->data, "\002\000\008onStatus", 11)) { + //TODO: catch stream close event + } + break; + } + return 0; +} + static int rtmp_read_packet(AVFormatContext *s, AVPacket *pkt) { RTMPState *rt = s->priv_data; @@ -486,10 +527,11 @@ static int rtmp_read_packet(AVFormatCont } } -#ifdef DEBUG -if(rpkt.type != RTMP_PT_VIDEO && rpkt.type != RTMP_PT_AUDIO) rtmp_packet_inspect(s, &rpkt); -//if(rpkt.data_size)for(i = 0; i < rpkt.data_size;i++)av_log(NULL,0," %02X",rpkt.data[i]);av_log(NULL,0,"\n"); -#endif + ret = rtmp_parse_result(s, rt, &rpkt); + if (ret < 0) {//serious error in packet + rtmp_packet_destroy(&rpkt); + return -1; + } if (rpkt.type == RTMP_PT_CHUNK_SIZE) for(i=0;i<RTMP_CHANNELS;i++)rt->rhist.chunk_size[i/*rpkt.stream_id*/] = AV_RB32(rpkt.data);

1 0

[soc]: r4478 - rtmp/rtmp.patch
by kostya 18 Jun '09

18 Jun '09

Author: kostya Date: Thu Jun 18 06:23:31 2009 New Revision: 4478 Log: Change FLV demuxer a bit so its packet reading may be reused in RTMP demuxer. Modified: rtmp/rtmp.patch Modified: rtmp/rtmp.patch ============================================================================== --- rtmp/rtmp.patch Thu Jun 18 06:17:17 2009 (r4477) +++ rtmp/rtmp.patch Thu Jun 18 06:23:31 2009 (r4478) @@ -1,8 +1,153 @@ +Index: libavformat/flvdec.c +=================================================================== +--- libavformat/flvdec.c (revision 19214) ++++ libavformat/flvdec.c (working copy) +@@ -304,39 +304,38 @@ + return 0; + } + +-static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) ++int ff_flv_read_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt, int *wrong_dts) + { +- FLVContext *flv = s->priv_data; + int ret, i, type, size, flags, is_audio; + int64_t next, pos; + int64_t dts, pts = AV_NOPTS_VALUE; + AVStream *st = NULL; + + for(;;){ +- pos = url_ftell(s->pb); +- url_fskip(s->pb, 4); /* size of previous packet */ +- type = get_byte(s->pb); +- size = get_be24(s->pb); +- dts = get_be24(s->pb); +- dts |= get_byte(s->pb) << 24; ++ pos = url_ftell(pb); ++ url_fskip(pb, 4); /* size of previous packet */ ++ type = get_byte(pb); ++ size = get_be24(pb); ++ dts = get_be24(pb); ++ dts |= get_byte(pb) << 24; + // av_log(s, AV_LOG_DEBUG, "type:%d, size:%d, dts:%d\n", type, size, dts); +- if (url_feof(s->pb)) ++ if (url_feof(pb)) + return AVERROR_EOF; +- url_fskip(s->pb, 3); /* stream id, always 0 */ ++ url_fskip(pb, 3); /* stream id, always 0 */ + flags = 0; + + if(size == 0) + continue; + +- next= size + url_ftell(s->pb); ++ next= size + url_ftell(pb); + + if (type == FLV_TAG_TYPE_AUDIO) { + is_audio=1; +- flags = get_byte(s->pb); ++ flags = get_byte(pb); + size--; + } else if (type == FLV_TAG_TYPE_VIDEO) { + is_audio=0; +- flags = get_byte(s->pb); ++ flags = get_byte(pb); + size--; + if ((flags & 0xf0) == 0x50) /* video info / command frame */ + goto skip; +@@ -346,7 +345,7 @@ + else /* skip packet */ + av_log(s, AV_LOG_DEBUG, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags); + skip: +- url_fseek(s->pb, next, SEEK_SET); ++ url_fseek(pb, next, SEEK_SET); + continue; + } + +@@ -370,7 +369,7 @@ + ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio)) + || st->discard >= AVDISCARD_ALL + ){ +- url_fseek(s->pb, next, SEEK_SET); ++ url_fseek(pb, next, SEEK_SET); + continue; + } + if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY) +@@ -379,17 +378,17 @@ + } + + // if not streamed and no duration from metadata then seek to end to find the duration from the timestamps +- if(!url_is_streamed(s->pb) && s->duration==AV_NOPTS_VALUE){ ++ if(!url_is_streamed(pb) && s->duration==AV_NOPTS_VALUE){ + int size; +- const int64_t pos= url_ftell(s->pb); +- const int64_t fsize= url_fsize(s->pb); +- url_fseek(s->pb, fsize-4, SEEK_SET); +- size= get_be32(s->pb); +- url_fseek(s->pb, fsize-3-size, SEEK_SET); +- if(size == get_be24(s->pb) + 11){ +- s->duration= get_be24(s->pb) * (int64_t)AV_TIME_BASE / 1000; ++ const int64_t pos= url_ftell(pb); ++ const int64_t fsize= url_fsize(pb); ++ url_fseek(pb, fsize-4, SEEK_SET); ++ size= get_be32(pb); ++ url_fseek(pb, fsize-3-size, SEEK_SET); ++ if(size == get_be24(pb) + 11){ ++ s->duration= get_be24(pb) * (int64_t)AV_TIME_BASE / 1000; + } +- url_fseek(s->pb, pos, SEEK_SET); ++ url_fseek(pb, pos, SEEK_SET); + } + + if(is_audio){ +@@ -407,16 +406,16 @@ + + if (st->codec->codec_id == CODEC_ID_AAC || + st->codec->codec_id == CODEC_ID_H264) { +- int type = get_byte(s->pb); ++ int type = get_byte(pb); + size--; + if (st->codec->codec_id == CODEC_ID_H264) { +- int32_t cts = (get_be24(s->pb)+0xff800000)^0xff800000; // sign extension ++ int32_t cts = (get_be24(pb)+0xff800000)^0xff800000; // sign extension + pts = dts + cts; + if (cts < 0) { // dts are wrong +- flv->wrong_dts = 1; ++ *wrong_dts = 1; + av_log(s, AV_LOG_WARNING, "negative cts, previous timestamps might be wrong\n"); + } +- if (flv->wrong_dts) ++ if (*wrong_dts) + dts = AV_NOPTS_VALUE; + } + if (type == 0) { +@@ -442,7 +441,7 @@ + if (!size) + return AVERROR(EAGAIN); + +- ret= av_get_packet(s->pb, pkt, size); ++ ret= av_get_packet(pb, pkt, size); + if (ret < 0) { + return AVERROR(EIO); + } +@@ -459,6 +458,13 @@ + return ret; + } + ++static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) ++{ ++ FLVContext *flv = s->priv_data; ++ ++ return ff_flv_read_packet(s, &s->pb, pkt, &flv->wrong_dts); ++} ++ + AVInputFormat flv_demuxer = { + "flv", + NULL_IF_CONFIG_SMALL("FLV format"), Index: libavformat/Makefile =================================================================== ---- libavformat/Makefile (revision 18770) +--- libavformat/Makefile (revision 19214) +++ libavformat/Makefile (working copy) -@@ -187,6 +187,7 @@ +@@ -188,6 +188,7 @@ OBJS-$(CONFIG_ROQ_DEMUXER) += idroq.o OBJS-$(CONFIG_ROQ_MUXER) += raw.o OBJS-$(CONFIG_RPL_DEMUXER) += rpl.o @@ -10,7 +155,7 @@ Index: libavformat/Makefile OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ rtp_aac.o \ rtp_amr.o \ -@@ -243,6 +244,7 @@ +@@ -246,6 +247,7 @@ OBJS-$(CONFIG_GOPHER_PROTOCOL) += gopher.o OBJS-$(CONFIG_HTTP_PROTOCOL) += http.o OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o @@ -18,11 +163,22 @@ Index: libavformat/Makefile OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o +Index: libavformat/flv.h +=================================================================== +--- libavformat/flv.h (revision 19214) ++++ libavformat/flv.h (working copy) +@@ -110,4 +110,6 @@ + AMF_DATA_TYPE_UNSUPPORTED = 0x0d, + } AMFDataType; + ++extern int ff_flv_read_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt, int *wrong_dts); ++ + #endif /* AVFORMAT_FLV_H */ Index: libavformat/allformats.c =================================================================== ---- libavformat/allformats.c (revision 18770) +--- libavformat/allformats.c (revision 19214) +++ libavformat/allformats.c (working copy) -@@ -164,6 +164,7 @@ +@@ -165,6 +165,7 @@ REGISTER_MUXDEMUX (RM, rm); REGISTER_MUXDEMUX (ROQ, roq); REGISTER_DEMUXER (RPL, rpl); @@ -30,7 +186,7 @@ Index: libavformat/allformats.c REGISTER_MUXER (RTP, rtp); REGISTER_DEMUXER (RTSP, rtsp); REGISTER_DEMUXER (SDP, sdp); -@@ -207,6 +208,7 @@ +@@ -209,6 +210,7 @@ REGISTER_PROTOCOL (GOPHER, gopher); REGISTER_PROTOCOL (HTTP, http); REGISTER_PROTOCOL (PIPE, pipe);

1 0

[soc]: r4477 - aacenc/aaccoder.c
by alexc 18 Jun '09

18 Jun '09

Author: alexc Date: Thu Jun 18 06:17:17 2009 New Revision: 4477 Log: Hoist abs_pow34_v to avoid redundant computation. Modified: aacenc/aaccoder.c Modified: aacenc/aaccoder.c ============================================================================== --- aacenc/aaccoder.c Thu Jun 18 06:17:14 2009 (r4476) +++ aacenc/aaccoder.c Thu Jun 18 06:17:17 2009 (r4477) @@ -81,10 +81,12 @@ static void quantize_bands(int (*out)[2] static void abs_pow34_v(float *out, const float* in, const int size) { +#ifndef USE_REALLY_FULL_SEARCH int i; for (i = 0; i < size; i++) { out[i] = pow(fabsf(in[i]), 0.75); } +#endif /* USE_REALLY_FULL_SEARCH */ } static av_always_inline int quant2(float coef, const float Q) @@ -100,7 +102,7 @@ static const uint8_t aac_cb_maxval[12] = * * @return quantization distortion */ -static float quantize_band_cost(struct AACEncContext *s, const float *in, int size, int scale_idx, int cb, +static float quantize_band_cost(struct AACEncContext *s, const float *in, const float *scaled, int size, int scale_idx, int cb, const float lambda, const float uplim, int *bits) { const float IQ = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; @@ -115,7 +117,6 @@ static float quantize_band_cost(struct A const int range = aac_cb_range[cb]; const int maxval = aac_cb_maxval[cb]; int offs[4]; - float *scaled = s->scoefs; #endif /* USE_REALLY_FULL_SEARCH */ if(!cb){ @@ -127,7 +128,6 @@ static float quantize_band_cost(struct A offs[0] = 1; for(i = 1; i < dim; i++) offs[i] = offs[i-1]*range; - abs_pow34_v(scaled, in, size); quantize_bands(s->qcoefs, in, scaled, size, Q34, !IS_CODEBOOK_UNSIGNED(cb), maxval); #endif /* USE_REALLY_FULL_SEARCH */ for(i = 0; i < size; i += dim){ @@ -368,6 +368,7 @@ static void encode_window_bands_info(AAC float next_minrd = INFINITY; int next_mincb = 0; + abs_pow34_v(s->scoefs, sce->coeffs, 1024); start = win*128; for(cb = 0; cb < 12; cb++){ path[0][cb].cost = 0.0f; @@ -393,7 +394,8 @@ static void encode_window_bands_info(AAC float rd = 0.0f; for(w = 0; w < group_len; w++){ FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(win+w)*16+swb]; - rd += quantize_band_cost(s, sce->coeffs + start + w*128, size, + rd += quantize_band_cost(s, sce->coeffs + start + w*128, + s->scoefs + start + w*128, size, sce->sf_idx[(win+w)*16+swb], cb, lambda / band->threshold, INFINITY, NULL); } @@ -493,6 +495,7 @@ static void search_for_quantizers_anmr(A paths[i].max_val = 0; } idx = 256; + abs_pow34_v(s->scoefs, sce->coeffs, 1024); for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ start = w*128; for(g = 0; g < sce->ics.num_swb; g++){ @@ -531,7 +534,7 @@ static void search_for_quantizers_anmr(A FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; int cb; for(cb = 0; cb <= ESC_BT; cb++){ - dists[cb] += quantize_band_cost(s, coefs + w2*128, sce->ics.swb_sizes[g], + dists[cb] += quantize_band_cost(s, coefs + w2*128, s->scoefs + start + w2*128, sce->ics.swb_sizes[g], q, cb, lambda / band->threshold, INFINITY, NULL); } } @@ -657,6 +660,7 @@ static void search_for_quantizers_twoloo if(!allz) return; + abs_pow34_v(s->scoefs, sce->coeffs, 1024); //perform two-loop search //outer loop - improve quality do{ @@ -672,6 +676,7 @@ static void search_for_quantizers_twoloo start = w*128; for(g = 0; g < sce->ics.num_swb; g++){ const float *coefs = sce->coeffs + start; + const float *scaled = s->scoefs + start; int bits = 0; int cb; float mindist = INFINITY; @@ -686,6 +691,7 @@ static void search_for_quantizers_twoloo for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ int b; dist += quantize_band_cost(s, coefs + w2*128, + scaled + w2*128, sce->ics.swb_sizes[g], sce->sf_idx[w*16+g], ESC_BT, @@ -832,10 +838,12 @@ static void search_for_quantizers_faac(A } } memset(sce->sf_idx, 0, sizeof(sce->sf_idx)); + abs_pow34_v(s->scoefs, sce->coeffs, 1024); for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ start = w*128; for(g = 0; g < sce->ics.num_swb; g++){ const float *coefs = sce->coeffs + start; + const float *scaled = s->scoefs + start; const int size = sce->ics.swb_sizes[g]; int scf, prev_scf, step; int min_scf = 0, max_scf = 255; @@ -855,6 +863,7 @@ static void search_for_quantizers_faac(A for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ int b; dist += quantize_band_cost(s, coefs + w2*128, + scaled + w2*128, sce->ics.swb_sizes[g], scf, ESC_BT, @@ -944,6 +953,7 @@ static void search_for_ms(AACEncContext { int start = 0, i, w, w2, g; float M[128], S[128]; + float *L34 = s->scoefs, *R34 = s->scoefs + 128, *M34 = s->scoefs + 128*2, *S34 = s->scoefs + 128*3; SingleChannelElement *sce0 = &cpe->ch[0]; SingleChannelElement *sce1 = &cpe->ch[1]; if(!cpe->common_window) @@ -963,22 +973,30 @@ static void search_for_ms(AACEncContext S[i] = sce0->coeffs[start+w2*128+i] - sce1->coeffs[start+w2*128+i]; } + abs_pow34_v(L34, sce0->coeffs+start+w2*128, sce0->ics.swb_sizes[g]); + abs_pow34_v(R34, sce1->coeffs+start+w2*128, sce0->ics.swb_sizes[g]); + abs_pow34_v(M34, M, sce0->ics.swb_sizes[g]); + abs_pow34_v(S34, S, sce0->ics.swb_sizes[g]); dist1 += quantize_band_cost(s, sce0->coeffs + start + w2*128, + L34, sce0->ics.swb_sizes[g], sce0->sf_idx[(w+w2)*16+g], sce0->band_type[(w+w2)*16+g], lambda / band0->threshold, INFINITY, NULL); dist1 += quantize_band_cost(s, sce1->coeffs + start + w2*128, + R34, sce1->ics.swb_sizes[g], sce1->sf_idx[(w+w2)*16+g], sce1->band_type[(w+w2)*16+g], lambda / band1->threshold, INFINITY, NULL); dist2 += quantize_band_cost(s, M, + M34, sce0->ics.swb_sizes[g], sce0->sf_idx[(w+w2)*16+g], sce0->band_type[(w+w2)*16+g], lambda / maxthr, INFINITY, NULL); dist2 += quantize_band_cost(s, S, + S34, sce1->ics.swb_sizes[g], sce1->sf_idx[(w+w2)*16+g], sce1->band_type[(w+w2)*16+g],

1 0

[soc]: r4476 - rtmp/rtmpdec.c
by kostya 18 Jun '09

18 Jun '09

Author: kostya Date: Thu Jun 18 06:17:14 2009 New Revision: 4476 Log: Introduce state for future switch to event-driven behaviour Modified: rtmp/rtmpdec.c Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Thu Jun 18 06:15:40 2009 (r4475) +++ rtmp/rtmpdec.c Thu Jun 18 06:17:14 2009 (r4476) @@ -36,10 +36,18 @@ #include "rtmp.h" #include "rtmppkt.h" +typedef enum { + STATE_START, + STATE_HANDSHAKED, + STATE_CONNECTING, + STATE_PLAYING, +} ClientState; + typedef struct RTMPState { URLContext *rtmp_hd; RTMPPacketHistory rhist, whist; char playpath[256]; + ClientState state; } RTMPState; #define PLAYER_KEY_OPEN_PART_LEN 30 @@ -346,9 +354,11 @@ static int rtmp_read_header(AVFormatCont port = RTMP_DEFAULT_PORT; snprintf(buf, sizeof(buf), "tcp://%s:%d", hostname, port); url_open(&rt->rtmp_hd, buf, URL_RDWR); + rt->state = STATE_START; if (rtmp_handshake(s, rt)) return -1; + rt->state = STATE_HANDSHAKED; //extract "app" part from path if (!strncmp(path, "/ondemand/", 10)) { fname = path + 10;

1 0