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

[soc]: r4469 - aacenc/aac.h
by alexc 16 Jun '09

16 Jun '09

Author: alexc Date: Wed Jun 17 01:42:47 2009 New Revision: 4469 Log: Remove unused array. Modified: aacenc/aac.h Modified: aacenc/aac.h ============================================================================== --- aacenc/aac.h Tue Jun 16 20:24:33 2009 (r4468) +++ aacenc/aac.h Wed Jun 17 01:42:47 2009 (r4469) @@ -206,7 +206,6 @@ typedef struct { DECLARE_ALIGNED_16(float, coeffs[1024]); ///< coefficients for IMDCT DECLARE_ALIGNED_16(float, saved[1024]); ///< overlap DECLARE_ALIGNED_16(float, ret[1024]); ///< PCM output - DECLARE_ALIGNED_16(int, icoefs[1024]); ///< integer coefficients for encoding PredictorState predictor_state[MAX_PREDICTORS]; } SingleChannelElement;

1 0

[soc]: r4468 - aacenc/aaccoder.c
by alexc 16 Jun '09

16 Jun '09

Author: alexc Date: Tue Jun 16 20:24:33 2009 New Revision: 4468 Log: Make the clipped escape value a constant. Modified: aacenc/aaccoder.c Modified: aacenc/aaccoder.c ============================================================================== --- aacenc/aaccoder.c Tue Jun 16 20:15:13 2009 (r4467) +++ aacenc/aaccoder.c Tue Jun 16 20:24:33 2009 (r4468) @@ -84,6 +84,7 @@ static float quantize_band_cost(const fl { const float IQ = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; const float Q = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; + const float CLIPPED_ESCAPE = 165140.0f*IQ; int i, j, k; float cost = 0; const int dim = cb < FIRST_PAIR_BT ? 4 : 2; @@ -147,8 +148,8 @@ static float quantize_band_cost(const fl break; } if(vec[k] == 64.0f){//FIXME: slow - if(t >= 165140.0f*IQ){ // clipped value - di = t - 165140.0f*IQ; + if (t >= CLIPPED_ESCAPE) { + di = t - CLIPPED_ESCAPE; curbits += 21; }else{ int c = av_clip(quant(t, Q), 0, 8191); @@ -191,6 +192,7 @@ static void quantize_and_encode_band(Put { const float IQ = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; const float Q = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; + const float CLIPPED_ESCAPE = 165140.0f*IQ; const int range = aac_cb_range[cb]; const int maxval = aac_cb_maxval[cb]; const int dim = (cb < FIRST_PAIR_BT) ? 4 : 2; @@ -250,8 +252,8 @@ static void quantize_and_encode_band(Put break; } if(vec[k] == 64.0f){//FIXME: slow - if(t >= 165140.0f*IQ){ // clipped value - di = t - 165140.0f*IQ; + if (t >= CLIPPED_ESCAPE) { + di = t - CLIPPED_ESCAPE; curbits += 21; }else{ int c = av_clip(quant(t, Q), 0, 8191); @@ -309,6 +311,7 @@ static float quantize_band_cost(const fl { const float Q = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; const float IQ = 1.0/Q; + const float CLIPPED_ESCAPE = 165140.0f*Q; int i, j, k; float cost = 0; const int dim = cb < FIRST_PAIR_BT ? 4 : 2; @@ -337,8 +340,8 @@ static float quantize_band_cost(const fl break; } if(vec[k] == 64.0f){//FIXME: slow - if(t >= 165140.0f*Q){ // clipped value - di = t - 165140.0f*Q; + if (t >= CLIPPED_ESCAPE) { + di = t - CLIPPED_ESCAPE; curbits += 21; }else{ int c = av_clip(quant(t, IQ), 0, 8191); @@ -386,6 +389,7 @@ static void quantize_and_encode_band(Put { const float Q = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; const float IQ = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; + const float CLIPPED_ESCAPE = 165140.0f*Q; int i, j, k; const int dim = cb < FIRST_PAIR_BT ? 4 : 2; //START_TIMER @@ -410,8 +414,8 @@ static void quantize_and_encode_band(Put break; } if(vec[k] == 64.0f){//FIXME: slow - if(t >= 165140.0f*Q){ // clipped value - di = t - 165140.0f*Q; + if (t >= CLIPPED_ESCAPE) { + di = t - CLIPPED_ESCAPE; curbits += 21; }else{ int c = av_clip(quant(t, IQ), 0, 8191);

1 0

[soc]: r4466 - aacenc/aaccoder.c
by alexc 16 Jun '09

16 Jun '09

Author: alexc Date: Tue Jun 16 20:11:47 2009 New Revision: 4466 Log: Fix clipped escape value distortion calculation. Modified: aacenc/aaccoder.c Modified: aacenc/aaccoder.c ============================================================================== --- aacenc/aaccoder.c Tue Jun 16 19:46:45 2009 (r4465) +++ aacenc/aaccoder.c Tue Jun 16 20:11:47 2009 (r4466) @@ -148,7 +148,7 @@ static float quantize_band_cost(const fl } if(vec[k] == 64.0f){//FIXME: slow if(t >= 165140.0f*IQ){ // clipped value - di = t - 165140.0f; + di = t - 165140.0f*IQ; curbits += 21; }else{ int c = av_clip(quant(t, Q), 0, 8191); @@ -251,7 +251,7 @@ static void quantize_and_encode_band(Put } if(vec[k] == 64.0f){//FIXME: slow if(t >= 165140.0f*IQ){ // clipped value - di = t - 165140.0f; + di = t - 165140.0f*IQ; curbits += 21; }else{ int c = av_clip(quant(t, Q), 0, 8191); @@ -338,7 +338,7 @@ static float quantize_band_cost(const fl } if(vec[k] == 64.0f){//FIXME: slow if(t >= 165140.0f*Q){ // clipped value - di = t - 165140.0f; + di = t - 165140.0f*Q; curbits += 21; }else{ int c = av_clip(quant(t, IQ), 0, 8191); @@ -411,7 +411,7 @@ static void quantize_and_encode_band(Put } if(vec[k] == 64.0f){//FIXME: slow if(t >= 165140.0f*Q){ // clipped value - di = t - 165140.0f; + di = t - 165140.0f*Q; curbits += 21; }else{ int c = av_clip(quant(t, IQ), 0, 8191);

1 0

[soc]: r4465 - aacenc/checkout.sh
by alexc 16 Jun '09

16 Jun '09

Author: alexc Date: Tue Jun 16 19:46:45 2009 New Revision: 4465 Log: Update the checkout script. AACenc should now "just work." Modified: aacenc/checkout.sh Modified: aacenc/checkout.sh ============================================================================== --- aacenc/checkout.sh Tue Jun 16 19:41:13 2009 (r4464) +++ aacenc/checkout.sh Tue Jun 16 19:46:45 2009 (r4465) @@ -11,14 +11,10 @@ cd libavcodec echo "Copying and downloading source code to libavcodec dir" cp ../../aac.h . cp ../../aacenc.c . +cp ../../aacenc.h . +cp ../../aaccoder.c . cp ../../aacpsy.c . -cp ../../aacpsy.h . -cp ../../lowpass.c . -cp ../../lowpass.h . - -cd ../.. -svn co svn://svn.ffmpeg.org/soc/aac -cp aac/aactab.h ffmpeg/libavcodec/. -cp aac/aactab.c ffmpeg/libavcodec/ +cp ../../psymodel.c . +cp ../../psymodel.h . echo "Done! Now enter the ffmpeg dir, configure and make FFmpeg and enjoy the AAC encoder! :)"

1 0

[soc]: r4464 - aacenc/aac_enc.patch
by alexc 16 Jun '09

16 Jun '09

Author: alexc Date: Tue Jun 16 19:41:13 2009 New Revision: 4464 Log: Update the patch against trunk. Modified: aacenc/aac_enc.patch Modified: aacenc/aac_enc.patch ============================================================================== --- aacenc/aac_enc.patch Tue Jun 16 19:00:34 2009 (r4463) +++ aacenc/aac_enc.patch Tue Jun 16 19:41:13 2009 (r4464) @@ -2,10 +2,10 @@ diff --git a/libavcodec/Makefile b/libav index d4f6d1c..0ed9057 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile -@@ -33,6 +33,7 @@ +@@ -36,6 +36,7 @@ OBJS-$(CONFIG_VDPAU) += vdpau.o - # decoders/encoders - OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o + # decoders/encoders/hardware accelerators + OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o mpeg4audio.o aac_parser.o aac_ac3_parser.o +OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o aacpsy.o aactab.o psymodel.o iirfilter.o mdct.o fft.o mpeg4audio.o OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o OBJS-$(CONFIG_AC3_DECODER) += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o @@ -14,7 +14,7 @@ diff --git a/libavcodec/allcodecs.c b/li index 33a4242..6871496 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c -@@ -181,7 +181,7 @@ +@@ -195,7 +195,7 @@ void avcodec_register_all(void) REGISTER_ENCDEC (ZMBV, zmbv); /* audio codecs */

1 0

[soc]: r4463 - rtmp/TODO
by kostya 16 Jun '09

16 Jun '09

Author: kostya Date: Tue Jun 16 19:00:34 2009 New Revision: 4463 Log: Connect call is almost fine now, remove from TODO list Modified: rtmp/TODO Modified: rtmp/TODO ============================================================================== --- rtmp/TODO Tue Jun 16 18:59:46 2009 (r4462) +++ rtmp/TODO Tue Jun 16 19:00:34 2009 (r4463) @@ -1,3 +1,2 @@ -Proper "connect" call (additional parameters and filename parsing) Factorize a lot of FLV demuxer code Set correct timestamps

2 1

[soc]: r4462 - in rtmp: TODO rtmpdec.c
by kostya 16 Jun '09

16 Jun '09

Author: kostya Date: Tue Jun 16 18:59:46 2009 New Revision: 4462 Log: Proper RTMP handshake with SHA-256 digesting Modified: rtmp/TODO rtmp/rtmpdec.c Modified: rtmp/TODO ============================================================================== --- rtmp/TODO Tue Jun 16 18:52:51 2009 (r4461) +++ rtmp/TODO Tue Jun 16 18:59:46 2009 (r4462) @@ -1,4 +1,3 @@ -Proper handshake Proper "connect" call (additional parameters and filename parsing) Factorize a lot of FLV demuxer code Set correct timestamps Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Tue Jun 16 18:52:51 2009 (r4461) +++ rtmp/rtmpdec.c Tue Jun 16 18:59:46 2009 (r4462) @@ -24,6 +24,8 @@ #include "libavcodec/bytestream.h" #include "libavutil/avstring.h" +#include "libavutil/lfg.h" +#include "libavutil/sha.h" #include "avformat.h" #include <unistd.h> @@ -42,6 +44,28 @@ typedef struct RTMPState { char playpath[256]; } RTMPState; +#define PLAYER_KEY_OPEN_PART_LEN 30 +static const uint8_t rtmp_player_key[] = +{ + 0x47, 0x65, 0x6E, 0x75, 0x69, 0x6E, 0x65, 0x20, 0x41, 0x64, 0x6F, 0x62, 0x65, + 0x20, 0x46, 0x6C, 0x61, 0x73, 0x68, 0x20, 0x50, 0x6C, 0x61, 0x79, 0x65, 0x72, + 0x20, 0x30, 0x30, 0x31, 0xF0, 0xEE, 0xC2, 0x4A, 0x80, 0x68, 0xBE, 0xE8, 0x2E, + 0x00, 0xD0, 0xD1, 0x02, 0x9E, 0x7E, 0x57, 0x6E, 0xEC, 0x5D, 0x2D, 0x29, 0x80, + 0x6F, 0xAB, 0x93, 0xB8, 0xE6, 0x36, 0xCF, 0xEB, 0x31, 0xAE +}; + +#define SERVER_KEY_OPEN_PART_LEN 36 +static const uint8_t rtmp_server_key[] = +{ + 0x47, 0x65, 0x6E, 0x75, 0x69, 0x6E, 0x65, 0x20, 0x41, 0x64, 0x6F, 0x62, 0x65, + 0x20, 0x46, 0x6C, 0x61, 0x73, 0x68, 0x20, 0x4D, 0x65, 0x64, 0x69, 0x61, 0x20, + 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x20, 0x30, 0x30, 0x31, // Genuine Adobe Flash Media Server 001 + + 0xF0, 0xEE, 0xC2, 0x4A, 0x80, 0x68, 0xBE, 0xE8, 0x2E, 0x00, 0xD0, 0xD1, 0x02, + 0x9E, 0x7E, 0x57, 0x6E, 0xEC, 0x5D, 0x2D, 0x29, 0x80, 0x6F, 0xAB, 0x93, 0xB8, + 0xE6, 0x36, 0xCF, 0xEB, 0x31, 0xAE +}; + static void gen_connect(AVFormatContext *s, RTMPState *rt, const char *proto, const char *host, int port, const char *app) { @@ -142,32 +166,151 @@ static void gen_play(AVFormatContext *s, rtmp_packet_destroy(&pkt); } +//TODO: Move HMAC code somewhere. Eventually. +#define HMAC_IPAD_VAL 0x36 +#define HMAC_OPAD_VAL 0x5C + +static void rtmp_calc_digest(const uint8_t *src, int len, int gap, + const uint8_t *key, int keylen, uint8_t *dst) +{ + struct AVSHA *sha; + uint8_t hmac_buf[64+32]; + int i; + + sha = av_mallocz(av_sha_size); + + memset(hmac_buf, 0, 64); + if (keylen < 64) + memcpy(hmac_buf, key, keylen); + else { + av_sha_init(sha, 256); + av_sha_update(sha,key, keylen); + av_sha_final(sha, hmac_buf); + } + for (i = 0; i < 64; i++) + hmac_buf[i] ^= HMAC_IPAD_VAL; + + av_sha_init(sha, 256); + av_sha_update(sha, hmac_buf, 64); + if (gap <= 0) + av_sha_update(sha, src, len); + else { //skip 32 bytes used for storing digest + av_sha_update(sha, src, gap); + av_sha_update(sha, src + gap + 32, len - gap - 32); + } + av_sha_final(sha, hmac_buf + 64); + + for (i = 0; i < 64; i++) + hmac_buf[i] ^= HMAC_IPAD_VAL ^ HMAC_OPAD_VAL; //reuse XORed key for opad + av_sha_init(sha, 256); + av_sha_update(sha, hmac_buf, 64+32); + av_sha_final(sha, dst); + + av_free(sha); +} + +static int rtmp_handshake_imprint_with_digest(uint8_t *buf) +{ + int i, digest_pos = 0; + + for (i = 8; i < 12; i++) + digest_pos += buf[i]; + digest_pos = (digest_pos % 728) + 12; + + rtmp_calc_digest(buf, RTMP_HANDSHAKE_PACKET_SIZE, digest_pos, + rtmp_player_key, PLAYER_KEY_OPEN_PART_LEN, + buf + digest_pos); + return digest_pos; +} + +static int rtmp_validate_digest(uint8_t *buf, int off) +{ + int i, digest_pos = 0; + uint8_t digest[32]; + + for (i = 0; i < 4; i++) + digest_pos += buf[i + off]; + digest_pos = (digest_pos % 728) + off + 4; + + rtmp_calc_digest(buf, RTMP_HANDSHAKE_PACKET_SIZE, digest_pos, + rtmp_server_key, SERVER_KEY_OPEN_PART_LEN, + digest); + if (!memcmp(digest, buf + digest_pos, 32)) + return digest_pos; + return 0; +} + static int rtmp_handshake(AVFormatContext *s, RTMPState *rt) { - uint8_t buf [1+RTMP_HANDSHAKE_PACKET_SIZE]; - uint8_t buf2[1+RTMP_HANDSHAKE_PACKET_SIZE*2]; + AVLFG rnd; + uint8_t tosend [RTMP_HANDSHAKE_PACKET_SIZE+1]; + uint8_t clientdata[RTMP_HANDSHAKE_PACKET_SIZE]; + uint8_t serverdata[RTMP_HANDSHAKE_PACKET_SIZE+1]; int i; + int server_pos, client_pos; + uint8_t digest[32]; av_log(s, AV_LOG_DEBUG, "Handshaking...\n"); + av_lfg_init(&rnd, 0xDEADC0DE); // generate handshake packet - 1536 bytes of pseudorandom data - buf[0] = 3; //unencrypted data - memset(buf+1, 0, RTMP_HANDSHAKE_PACKET_SIZE); + tosend[0] = 3; //unencrypted data + memset(tosend+1, 0, 4); //write client "version" - buf[5] = 9; - buf[5] = 0; - buf[7] = 124; - buf[8] = 2; + tosend[5] = RTMP_CLIENT_VER1; + tosend[6] = RTMP_CLIENT_VER2; + tosend[7] = RTMP_CLIENT_VER3; + tosend[8] = RTMP_CLIENT_VER4; + for (i = 9; i <= RTMP_HANDSHAKE_PACKET_SIZE; i++) + tosend[i] = av_lfg_get(&rnd) >> 24; + client_pos = rtmp_handshake_imprint_with_digest(tosend + 1); - url_write(rt->rtmp_hd, buf, RTMP_HANDSHAKE_PACKET_SIZE + 1); - i = url_read_complete(rt->rtmp_hd, buf2, RTMP_HANDSHAKE_PACKET_SIZE*2 + 1); - if (i != 1 + RTMP_HANDSHAKE_PACKET_SIZE*2 || memcmp(buf + 1, buf2 + 1 + RTMP_HANDSHAKE_PACKET_SIZE, RTMP_HANDSHAKE_PACKET_SIZE)) { - av_log(s, AV_LOG_ERROR, "RTMP handshake failed\n"); + url_write(rt->rtmp_hd, tosend, RTMP_HANDSHAKE_PACKET_SIZE + 1); + i = url_read_complete(rt->rtmp_hd, serverdata, RTMP_HANDSHAKE_PACKET_SIZE + 1); + if (i != RTMP_HANDSHAKE_PACKET_SIZE + 1) { + av_log(s, AV_LOG_ERROR, "Cannot read RTMP handshake response\n"); + return -1; + } + i = url_read_complete(rt->rtmp_hd, clientdata, RTMP_HANDSHAKE_PACKET_SIZE); + if (i != RTMP_HANDSHAKE_PACKET_SIZE) { + av_log(s, AV_LOG_ERROR, "Cannot read RTMP handshake response\n"); + return -1; + } + + av_log(s, AV_LOG_DEBUG, "Server version %d.%d.%d.%d\n", + serverdata[5], serverdata[6], serverdata[7], serverdata[8]); + + server_pos = rtmp_validate_digest(serverdata + 1, 772); + if (!server_pos) { + server_pos = rtmp_validate_digest(serverdata + 1, 8); + if (!server_pos) { + av_log(s, AV_LOG_ERROR, "Server response validating failed\n"); + return -1; + } + } + + rtmp_calc_digest(tosend + 1 + client_pos, 32, 0, + rtmp_server_key, sizeof(rtmp_server_key), + digest); + rtmp_calc_digest(clientdata, RTMP_HANDSHAKE_PACKET_SIZE-32, 0, + digest, 32, + digest); + if (memcmp(digest, clientdata + RTMP_HANDSHAKE_PACKET_SIZE - 32, 32)) { + av_log(s, AV_LOG_ERROR, "Signature mismatch\n"); return -1; } - // write reply back to server - url_write(rt->rtmp_hd, buf2 + 1, RTMP_HANDSHAKE_PACKET_SIZE); + for (i = 0; i < RTMP_HANDSHAKE_PACKET_SIZE; i++) + tosend[i] = av_lfg_get(&rnd) >> 24; + rtmp_calc_digest(serverdata + 1 + server_pos, 32, 0, + rtmp_player_key, sizeof(rtmp_player_key), + digest); + rtmp_calc_digest(tosend, RTMP_HANDSHAKE_PACKET_SIZE - 32, 0, + digest, 32, + tosend + RTMP_HANDSHAKE_PACKET_SIZE - 32); + + // write reply back to server + url_write(rt->rtmp_hd, tosend, RTMP_HANDSHAKE_PACKET_SIZE); return 0; }

1 0

[soc]: r4461 - rtmp/rtmpdec.c
by kostya 16 Jun '09

16 Jun '09

Author: kostya Date: Tue Jun 16 18:52:51 2009 New Revision: 4461 Log: Print debug messages during 'createStream' and 'play' calls to server Modified: rtmp/rtmpdec.c Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Tue Jun 16 18:48:34 2009 (r4460) +++ rtmp/rtmpdec.c Tue Jun 16 18:52:51 2009 (r4461) @@ -95,6 +95,7 @@ static void gen_create_stream(AVFormatCo uint8_t *p; double num; + av_log(s, AV_LOG_DEBUG, "Creating stream...\n"); rtmp_packet_create(&pkt, RTMP_VIDEO_CHANNEL, RTMP_PT_INVOKE, 0, 25); num = 3.0; @@ -113,6 +114,7 @@ static void gen_play(AVFormatContext *s, uint8_t *p; double num; + 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));

1 0

[soc]: r4460 - rtmp/rtmpdec.c
by kostya 16 Jun '09

16 Jun '09

Author: kostya Date: Tue Jun 16 18:48:34 2009 New Revision: 4460 Log: Split URL into parts needed for connection parameters and update generating of 'connect', 'createStream' and 'play' calls to RTMP server. Modified: rtmp/rtmpdec.c Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Tue Jun 16 18:34:19 2009 (r4459) +++ rtmp/rtmpdec.c Tue Jun 16 18:48:34 2009 (r4460) @@ -39,41 +39,57 @@ typedef struct RTMPState { URLContext *rtmp_hd; RTMPPacketHistory rhist, whist; + char playpath[256]; } RTMPState; -static void gen_connect(AVFormatContext *s, RTMPState *rt, const char *name) +static void gen_connect(AVFormatContext *s, RTMPState *rt, const char *proto, + const char *host, int port, const char *app) { - uint8_t buf[65536], *p = buf; + RTMPPacket pkt; + uint8_t ver[32], *p; + char tcurl[512]; double num = 1.0; - int size; + uint8_t bool; - bytestream_put_byte(&p, 0x3); - bytestream_put_be24(&p, 1); - bytestream_put_be24(&p, 0); - bytestream_put_byte(&p, RTMP_PT_INVOKE); - bytestream_put_le32(&p, 0); + rtmp_packet_create(&pkt, RTMP_VIDEO_CHANNEL, RTMP_PT_INVOKE, 0, 4096); + p = pkt.data; + snprintf(tcurl, sizeof(tcurl), "%s://%s:%d/%s", proto, host, port, app); rtmp_amf_write_tag(&p, AMF_STRING, "connect"); rtmp_amf_write_tag(&p, AMF_NUMBER, &num); rtmp_amf_write_tag(&p, AMF_OBJECT, NULL); - rtmp_amf_write_tag(&p, AMF_STRING_IN_OBJECT, "tcUrl"); - rtmp_amf_write_tag(&p, AMF_STRING, name); rtmp_amf_write_tag(&p, AMF_STRING_IN_OBJECT, "app"); - rtmp_amf_write_tag(&p, AMF_STRING, "app"); + rtmp_amf_write_tag(&p, AMF_STRING, app); + + snprintf(ver, sizeof(ver), "%s %d,%d,%d,%d", RTMP_CLIENT_PLATFORM, RTMP_CLIENT_VER1, + RTMP_CLIENT_VER2, RTMP_CLIENT_VER3, RTMP_CLIENT_VER4); rtmp_amf_write_tag(&p, AMF_STRING_IN_OBJECT, "flashVer"); - rtmp_amf_write_tag(&p, AMF_STRING, "LNX 6,0,82,0"); - rtmp_amf_write_tag(&p, AMF_STRING_IN_OBJECT, "playpath"); - rtmp_amf_write_tag(&p, AMF_STRING, "1.mp4"); + rtmp_amf_write_tag(&p, AMF_STRING, ver); + rtmp_amf_write_tag(&p, AMF_STRING_IN_OBJECT, "tcUrl"); + rtmp_amf_write_tag(&p, AMF_STRING, tcurl); + bool = 0; + rtmp_amf_write_tag(&p, AMF_STRING_IN_OBJECT, "fpad"); + rtmp_amf_write_tag(&p, AMF_NUMBER, &bool); + num = 15.0; + rtmp_amf_write_tag(&p, AMF_STRING_IN_OBJECT, "capabilities"); + rtmp_amf_write_tag(&p, AMF_NUMBER, &num); + num = 1639.0; + rtmp_amf_write_tag(&p, AMF_STRING_IN_OBJECT, "audioCodecs"); + rtmp_amf_write_tag(&p, AMF_NUMBER, &num); + num = 252.0; + rtmp_amf_write_tag(&p, AMF_STRING_IN_OBJECT, "videoCodecs"); + rtmp_amf_write_tag(&p, AMF_NUMBER, &num); + num = 1.0; + rtmp_amf_write_tag(&p, AMF_STRING_IN_OBJECT, "videoFunction"); + rtmp_amf_write_tag(&p, AMF_NUMBER, &num); rtmp_amf_write_tag(&p, AMF_OBJECT_END, NULL); - size = p - buf; - p = buf + 4; - bytestream_put_be24(&p, size - 12); + pkt.data_size = p - pkt.data; - url_write(rt->rtmp_hd, buf, size); + rtmp_packet_write(s, rt->rtmp_hd, &pkt, &rt->whist); } -static void gen_play(AVFormatContext *s, RTMPState *rt) +static void gen_create_stream(AVFormatContext *s, RTMPState *rt) { RTMPPacket pkt; uint8_t *p; @@ -89,14 +105,36 @@ static void gen_play(AVFormatContext *s, rtmp_packet_write(s, rt->rtmp_hd, &pkt, &rt->whist); rtmp_packet_destroy(&pkt); +} - rtmp_packet_create(&pkt, RTMP_VIDEO_CHANNEL, RTMP_PT_INVOKE, 0, 17); +static void gen_play(AVFormatContext *s, RTMPState *rt) +{ + RTMPPacket pkt; + uint8_t *p; + double num; + + rtmp_packet_create(&pkt, RTMP_VIDEO_CHANNEL, RTMP_PT_INVOKE, 0, + 29 + strlen(rt->playpath)); num = 0.0; p = pkt.data; rtmp_amf_write_tag(&p, AMF_STRING, "play"); rtmp_amf_write_tag(&p, AMF_NUMBER, &num); rtmp_amf_write_tag(&p, AMF_NULL, NULL); + rtmp_amf_write_tag(&p, AMF_STRING, rt->playpath); + num = 0.0; + rtmp_amf_write_tag(&p, AMF_NUMBER, &num); + + rtmp_packet_write(s, rt->rtmp_hd, &pkt, &rt->whist); + rtmp_packet_destroy(&pkt); + + // set client buffer time disguised in ping packet + rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL, RTMP_PT_PING, 1, 10); + + p = pkt.data; + bytestream_put_be16(&p, 3); + 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_destroy(&pkt); @@ -151,13 +189,13 @@ static int rtmp_read_header(AVFormatCont AVFormatParameters *ap) { RTMPState *rt = s->priv_data; - char hostname[256]; + char proto[8], hostname[256], path[512], app[128], *fname; int port; - uint8_t buf[65536]; + uint8_t buf[2048]; AVStream *st; - url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, - NULL, 0, s->filename); + 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); @@ -167,8 +205,39 @@ static int rtmp_read_header(AVFormatCont url_open(&rt->rtmp_hd, buf, URL_RDWR); if (rtmp_handshake(s, rt)) return -1; - gen_connect(s, rt, s->filename); - gen_play(s, rt); + + //extract "app" part from path + if (!strncmp(path, "/ondemand/", 10)) { + fname = path + 10; + memcpy(app, "ondemand", 9); + } else { + char *p = strchr(path + 1, '/'); + if (!p) { + fname = path + 1; + app[0] = '\0'; + } else { + fname = strchr(p + 1, '/'); + if (!fname) { + fname = p + 1; + strncpy(app, path + 1, p - path - 1); + } else { + fname++; + strncpy(app, path + 1, fname - path - 2); + } + } + } + if (!strcmp(fname + strlen(fname) - 4, ".f4v") || + !strcmp(fname + strlen(fname) - 4, ".mp4")) { + memcpy(rt->playpath, "mp4:", 5); + } else { + rt->playpath[0] = ':'; + rt->playpath[0] = 0; + } + strncat(rt->playpath, fname, sizeof(rt->playpath) - 5); + + 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); st = av_new_stream(s, 0); if (!st)

1 0

[soc]: r4459 - rtmp/rtmppkt.c
by kostya 16 Jun '09

16 Jun '09

Author: kostya Date: Tue Jun 16 18:34:19 2009 New Revision: 4459 Log: Parse a bit more of RTMP packet information Modified: rtmp/rtmppkt.c Modified: rtmp/rtmppkt.c ============================================================================== --- rtmp/rtmppkt.c Tue Jun 16 18:32:32 2009 (r4458) +++ rtmp/rtmppkt.c Tue Jun 16 18:34:19 2009 (r4459) @@ -267,16 +267,18 @@ void rtmp_packet_inspect(AVFormatContext switch (pkt->type) { case RTMP_PT_CHUNK_SIZE: av_log(NULL,0,"chunk size %d",AV_RB32(pkt->data));break; case RTMP_PT_BYTES_READ: av_log(NULL,0,"bytes read");break; - case RTMP_PT_PING: av_log(NULL,0,"ping");break; + case RTMP_PT_PING: av_log(NULL,0,"ping type = %d", AV_RB16(pkt->data));break; case RTMP_PT_SERVER_BW: av_log(NULL,0,"server BW=%d",AV_RB32(pkt->data));break; case RTMP_PT_CLIENT_BW: av_log(NULL,0,"client BW=%d",AV_RB32(pkt->data));break; case RTMP_PT_AUDIO: av_log(NULL,0,"audio");break; case RTMP_PT_VIDEO: av_log(NULL,0,"video");break; case RTMP_PT_NOTIFY: av_log(NULL,0,"notify");break; case RTMP_PT_INVOKE: av_log(NULL,0,"invoke");break; + case RTMP_PT_METADATA: av_log(NULL,0,"metadata");break; default: av_log(NULL,0,"%X",pkt->type); } - av_log(NULL,0," ts %d size %d\n",pkt->timestamp, pkt->data_size); - if (pkt->type == RTMP_PT_INVOKE || pkt->type == RTMP_PT_NOTIFY) + 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) parse_amf(pkt->data, pkt->data_size); }

1 0