July 2010 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r5874 - in mms: mms.h mmst.c
by spyfeng 28 Jul '10

28 Jul '10

Author: spyfeng Date: Wed Jul 28 17:09:11 2010 New Revision: 5874 Log: leave the common fileds between MMSHContext and MMSContext. add MMSTContext in mmst.c which use MMSContext. Modified: mms/mms.h mms/mmst.c Modified: mms/mms.h ============================================================================== --- mms/mms.h Tue Jul 27 18:28:44 2010 (r5873) +++ mms/mms.h Wed Jul 28 17:09:11 2010 (r5874) @@ -28,10 +28,6 @@ typedef struct { }MMSStream; typedef struct { - int outgoing_packet_seq; ///< Outgoing packet sequence number. - char path[256]; ///< Path of the resource being asked for. - char host[128]; ///< Host of the resources. - URLContext *mms_hd; ///< TCP connection handle MMSStream streams[MAX_STREAMS]; @@ -48,12 +44,6 @@ typedef struct { int remaining_in_len; ///< Reading length from incoming buffer. /*@}*/ - int incoming_packet_seq; ///< Incoming packet sequence number. - int incoming_flags; ///< Incoming packet flags. - - int packet_id; ///< Identifier for packets in the current stream. - unsigned int header_packet_id; ///< default is 2. - /** Internal handling of the ASF header */ /*@{*/ uint8_t *asf_header; ///< Stored ASF header. @@ -64,7 +54,6 @@ typedef struct { /*@}*/ int stream_num; ///< stream numbers. - int is_playing; } MMSContext; typedef struct Modified: mms/mmst.c ============================================================================== --- mms/mmst.c Tue Jul 27 18:28:44 2010 (r5873) +++ mms/mmst.c Wed Jul 28 17:09:11 2010 (r5874) @@ -37,6 +37,20 @@ #define LOCAL_ADDRESS 0xc0a80081 // FIXME get and use correct local ip address. #define LOCAL_PORT 1037 // as above. + +typedef struct { + MMSContext *ff_ctx; + int outgoing_packet_seq; ///< Outgoing packet sequence number. + char path[256]; ///< Path of the resource being asked for. + char host[128]; ///< Host of the resources. + int incoming_packet_seq; ///< Incoming packet sequence number. + int incoming_flags; ///< Incoming packet flags. + int packet_id; ///< Identifier for packets in the current stream. + unsigned int header_packet_id; ///< default is 2. + int is_playing; +} MMSTContext; + + /** Client to server packet types. */ typedef enum { CS_PKT_INITIAL = 0x01, @@ -84,8 +98,9 @@ typedef enum { } MMSSCPacketType; /** Create MMST command packet header */ -static void start_command_packet(MMSContext *mms, MMSCSPacketType packet_type) +static void start_command_packet(MMSTContext *mmst_ctx, MMSCSPacketType packet_type) { + MMSContext *mms = mmst_ctx->ff_ctx; mms->write_out_ptr = mms->out_buffer; bytestream_put_le32(&mms->write_out_ptr, 1); // start sequence @@ -93,7 +108,7 @@ static void start_command_packet(MMSCont bytestream_put_le32(&mms->write_out_ptr, 0); // Length starts from after the protocol type bytes bytestream_put_le32(&mms->write_out_ptr, MKTAG('M','M','S',' ')); bytestream_put_le32(&mms->write_out_ptr, 0); - bytestream_put_le32(&mms->write_out_ptr, mms->outgoing_packet_seq++); + bytestream_put_le32(&mms->write_out_ptr, mmst_ctx->outgoing_packet_seq++); bytestream_put_le64(&mms->write_out_ptr, 0); // timestamp bytestream_put_le32(&mms->write_out_ptr, 0); bytestream_put_le16(&mms->write_out_ptr, packet_type); @@ -101,16 +116,18 @@ static void start_command_packet(MMSCont } /** Add prefixes to MMST command packet. */ -static void insert_command_prefixes(MMSContext *mms, +static void insert_command_prefixes(MMSTContext *mmst_ctx, uint32_t prefix1, uint32_t prefix2) { + MMSContext *mms = mmst_ctx->ff_ctx; bytestream_put_le32(&mms->write_out_ptr, prefix1); // first prefix bytestream_put_le32(&mms->write_out_ptr, prefix2); // second prefix } /** Send a prepared MMST command packet. */ -static int send_command_packet(MMSContext *mms) +static int send_command_packet(MMSTContext *mmst_ctx) { + MMSContext *mms = mmst_ctx->ff_ctx; int len= mms->write_out_ptr - mms->out_buffer; int exact_length = (len + 7) & ~7; int first_length= exact_length - 16; @@ -137,8 +154,9 @@ static int send_command_packet(MMSContex return 0; } -static void mms_put_utf16(MMSContext *mms, uint8_t *src) +static void mms_put_utf16(MMSTContext *mmst_ctx, uint8_t *src) { + MMSContext *mms = mmst_ctx->ff_ctx; ByteIOContext bic; int size = mms->write_out_ptr - mms->out_buffer; int len; @@ -149,19 +167,20 @@ static void mms_put_utf16(MMSContext *mm mms->write_out_ptr += len; } -static int send_time_test_data(MMSContext *mms) +static int send_time_test_data(MMSTContext *mmst_ctx) { - start_command_packet(mms, CS_PKT_TIMING_DATA_REQUEST); - insert_command_prefixes(mms, 0xf0f0f0f1, 0x0004000b); - return send_command_packet(mms); + start_command_packet(mmst_ctx, CS_PKT_TIMING_DATA_REQUEST); + insert_command_prefixes(mmst_ctx, 0xf0f0f0f1, 0x0004000b); + return send_command_packet(mmst_ctx); } -static int send_protocol_select(MMSContext *mms) +static int send_protocol_select(MMSTContext *mmst_ctx) { char data_string[256]; + MMSContext *mms = mmst_ctx->ff_ctx; - start_command_packet(mms, CS_PKT_PROTOCOL_SELECT); - insert_command_prefixes(mms, 0, 0xffffffff); + start_command_packet(mmst_ctx, CS_PKT_PROTOCOL_SELECT); + insert_command_prefixes(mmst_ctx, 0, 0xffffffff); bytestream_put_le32(&mms->write_out_ptr, 0); // maxFunnelBytes bytestream_put_le32(&mms->write_out_ptr, 0x00989680); // maxbitRate bytestream_put_le32(&mms->write_out_ptr, 2); // funnelMode @@ -173,42 +192,46 @@ static int send_protocol_select(MMSConte "TCP", // or UDP LOCAL_PORT); - mms_put_utf16(mms, data_string); - return send_command_packet(mms); + mms_put_utf16(mmst_ctx, data_string); + return send_command_packet(mmst_ctx); } -static int send_media_file_request(MMSContext *mms) +static int send_media_file_request(MMSTContext *mmst_ctx) { - start_command_packet(mms, CS_PKT_MEDIA_FILE_REQUEST); - insert_command_prefixes(mms, 1, 0xffffffff); + MMSContext *mms = mmst_ctx->ff_ctx; + + start_command_packet(mmst_ctx, CS_PKT_MEDIA_FILE_REQUEST); + insert_command_prefixes(mmst_ctx, 1, 0xffffffff); bytestream_put_le32(&mms->write_out_ptr, 0); bytestream_put_le32(&mms->write_out_ptr, 0); - mms_put_utf16(mms, mms->path + 1); // +1 for skip "/" + mms_put_utf16(mmst_ctx, mmst_ctx->path + 1); // +1 for skip "/" - return send_command_packet(mms); + return send_command_packet(mmst_ctx); } -static void handle_packet_stream_changing_type(MMSContext *mms) +static void handle_packet_stream_changing_type(MMSTContext *mmst_ctx) { + MMSContext *mms = mmst_ctx->ff_ctx; dprintf(NULL, "Stream changing!\n"); // 40 is the packet header size, 7 is the prefix size. - mms->header_packet_id= AV_RL32(mms->in_buffer + 40 + 7); - dprintf(NULL, "Changed header prefix to 0x%x", mms->header_packet_id); + mmst_ctx->header_packet_id= AV_RL32(mms->in_buffer + 40 + 7); + dprintf(NULL, "Changed header prefix to 0x%x", mmst_ctx->header_packet_id); } -static int send_keepalive_packet(MMSContext *mms) +static int send_keepalive_packet(MMSTContext *mmst_ctx) { // respond to a keepalive with a keepalive... - start_command_packet(mms, CS_PKT_KEEPALIVE); - insert_command_prefixes(mms, 1, 0x100FFFF); - return send_command_packet(mms); + start_command_packet(mmst_ctx, CS_PKT_KEEPALIVE); + insert_command_prefixes(mmst_ctx, 1, 0x100FFFF); + return send_command_packet(mmst_ctx); } /** Pad media packets smaller than max_packet_size and/or adjust read position * after a seek. */ -static void pad_media_packet(MMSContext *mms) +static void pad_media_packet(MMSTContext *mmst_ctx) { + MMSContext *mms = mmst_ctx->ff_ctx; if(mms->remaining_in_len<mms->asf_packet_len) { int padding_size = mms->asf_packet_len - mms->remaining_in_len; memset(mms->in_buffer + mms->remaining_in_len, 0, padding_size); @@ -217,11 +240,11 @@ static void pad_media_packet(MMSContext } /** Read incoming MMST media, header or command packet. */ -static MMSSCPacketType get_tcp_server_response(MMSContext *mms) +static MMSSCPacketType get_tcp_server_response(MMSTContext *mmst_ctx) { int read_result; MMSSCPacketType packet_type= -1; - + MMSContext *mms = mmst_ctx->ff_ctx; for(;;) { read_result = url_read_complete(mms->mms_hd, mms->in_buffer, 8); if (read_result != 8) { @@ -242,7 +265,7 @@ static MMSSCPacketType get_tcp_server_re if(AV_RL32(mms->in_buffer + 4)==0xb00bface) { int length_remaining, hr; - mms->incoming_flags= mms->in_buffer[3]; + mmst_ctx->incoming_flags= mms->in_buffer[3]; read_result= url_read_complete(mms->mms_hd, mms->in_buffer+8, 4); if(read_result != 4) { av_log(NULL, AV_LOG_ERROR, @@ -289,9 +312,9 @@ static MMSSCPacketType get_tcp_server_re // then fill up the buffer with the others tmp = AV_RL16(mms->in_buffer + 6); length_remaining = (tmp - 8) & 0xffff; - mms->incoming_packet_seq = AV_RL32(mms->in_buffer); + mmst_ctx->incoming_packet_seq = AV_RL32(mms->in_buffer); packet_id_type = mms->in_buffer[4]; - mms->incoming_flags = mms->in_buffer[5]; + mmst_ctx->incoming_flags = mms->in_buffer[5]; if (length_remaining < 0 || length_remaining > sizeof(mms->in_buffer) - 8) { @@ -313,7 +336,7 @@ static MMSSCPacketType get_tcp_server_re } // if we successfully read everything. - if(packet_id_type == mms->header_packet_id) { + if(packet_id_type == mmst_ctx->header_packet_id) { packet_type = SC_PKT_ASF_HEADER; // Store the asf header if(!mms->header_parsed) { @@ -329,9 +352,9 @@ static MMSSCPacketType get_tcp_server_re mms->asf_header_size += mms->remaining_in_len; } // 0x04 means asf header is sent in multiple packets. - if (mms->incoming_flags == 0x04) + if (mmst_ctx->incoming_flags == 0x04) continue; - } else if(packet_id_type == mms->packet_id) { + } else if(packet_id_type == mmst_ctx->packet_id) { packet_type = SC_PKT_ASF_MEDIA; } else { dprintf(NULL, "packet id type %d is old.", packet_id_type); @@ -341,31 +364,31 @@ static MMSSCPacketType get_tcp_server_re // preprocess some packet type if(packet_type == SC_PKT_KEEPALIVE) { - send_keepalive_packet(mms); + send_keepalive_packet(mmst_ctx); continue; } else if(packet_type == SC_PKT_STREAM_CHANGING) { - handle_packet_stream_changing_type(mms); + handle_packet_stream_changing_type(mmst_ctx); } else if(packet_type == SC_PKT_ASF_MEDIA) { - pad_media_packet(mms); + pad_media_packet(mmst_ctx); } return packet_type; } } -static int mms_safe_send_recv(MMSContext *mms, - int (*send_fun)(MMSContext *mms), +static int mms_safe_send_recv(MMSTContext *mmst_ctx, + int (*send_fun)(MMSTContext *mmst_ctx), const MMSSCPacketType expect_type) { MMSSCPacketType type; if(send_fun) { - int ret = send_fun(mms); + int ret = send_fun(mmst_ctx); if (ret < 0) { dprintf(NULL, "Send Packet error before expecting recv packet %d\n", expect_type); return ret; } } - if ((type = get_tcp_server_response(mms)) != expect_type) { + if ((type = get_tcp_server_response(mmst_ctx)) != expect_type) { av_log(NULL, AV_LOG_ERROR, "Corrupt stream (unexpected packet type 0x%x, expected 0x%x)\n", type, expect_type); @@ -375,10 +398,11 @@ static int mms_safe_send_recv(MMSContext } } -static int send_media_header_request(MMSContext *mms) +static int send_media_header_request(MMSTContext *mmst_ctx) { - start_command_packet(mms, CS_PKT_MEDIA_HEADER_REQUEST); - insert_command_prefixes(mms, 1, 0); + MMSContext *mms = mmst_ctx->ff_ctx; + start_command_packet(mmst_ctx, CS_PKT_MEDIA_HEADER_REQUEST); + insert_command_prefixes(mmst_ctx, 1, 0); bytestream_put_le32(&mms->write_out_ptr, 0); bytestream_put_le32(&mms->write_out_ptr, 0x00800000); bytestream_put_le32(&mms->write_out_ptr, 0xffffffff); @@ -392,11 +416,11 @@ static int send_media_header_request(MMS bytestream_put_le32(&mms->write_out_ptr, 2); bytestream_put_le32(&mms->write_out_ptr, 0); - return send_command_packet(mms); + return send_command_packet(mmst_ctx); } /** Send the initial handshake. */ -static int send_startup_packet(MMSContext *mms) +static int send_startup_packet(MMSTContext *mmst_ctx) { char data_string[256]; // SubscriberName is defined in MS specification linked below. @@ -405,17 +429,18 @@ static int send_startup_packet(MMSContex // download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-WMSP%5D.pdf snprintf(data_string, sizeof(data_string), "NSPlayer/7.0.0.1956; {%s}; Host: %s", - "7E667F5D-A661-495E-A512-F55686DDA178", mms->host); + "7E667F5D-A661-495E-A512-F55686DDA178", mmst_ctx->host); - start_command_packet(mms, CS_PKT_INITIAL); - insert_command_prefixes(mms, 0, 0x0004000b); - bytestream_put_le32(&mms->write_out_ptr, 0x0003001c); - mms_put_utf16(mms, data_string); - return send_command_packet(mms); + start_command_packet(mmst_ctx, CS_PKT_INITIAL); + insert_command_prefixes(mmst_ctx, 0, 0x0004000b); + bytestream_put_le32(&(mmst_ctx->ff_ctx->write_out_ptr), 0x0003001c); + mms_put_utf16(mmst_ctx, data_string); + return send_command_packet(mmst_ctx); } -static int asf_header_parser(MMSContext *mms) +static int asf_header_parser(MMSTContext *mmst_ctx) { + MMSContext *mms = mmst_ctx->ff_ctx; uint8_t *p = mms->asf_header; uint8_t *end; int flags, stream_id; @@ -476,24 +501,25 @@ static int asf_header_parser(MMSContext } /** Send MMST stream selection command based on the AVStream->discard values. */ -static int send_stream_selection_request(MMSContext *mms) +static int send_stream_selection_request(MMSTContext *mmst_ctx) { int i; - + MMSContext *mms = mmst_ctx->ff_ctx; // send the streams we want back... - start_command_packet(mms, CS_PKT_STREAM_ID_REQUEST); + start_command_packet(mmst_ctx, CS_PKT_STREAM_ID_REQUEST); bytestream_put_le32(&mms->write_out_ptr, mms->stream_num); // stream nums for(i= 0; i<mms->stream_num; i++) { bytestream_put_le16(&mms->write_out_ptr, 0xffff); // flags bytestream_put_le16(&mms->write_out_ptr, mms->streams[i].id); // stream id bytestream_put_le16(&mms->write_out_ptr, 0); // selection } - return send_command_packet(mms); + return send_command_packet(mmst_ctx); } -static int read_data(MMSContext *mms, uint8_t *buf, const int buf_size) +static int read_data(MMSTContext *mmst_ctx, uint8_t *buf, const int buf_size) { int read_size; + MMSContext *mms = mmst_ctx->ff_ctx; read_size = FFMIN(buf_size, mms->remaining_in_len); memcpy(buf, mms->read_in_ptr, read_size); mms->remaining_in_len -= read_size; @@ -502,13 +528,13 @@ static int read_data(MMSContext *mms, ui } /** Read at most one media packet (or a whole header). */ -static int read_mms_packet(MMSContext *mms, uint8_t *buf, int buf_size) +static int read_mms_packet(MMSTContext *mmst_ctx, uint8_t *buf, int buf_size) { int result = 0; int size_to_copy; - + MMSContext *mms = mmst_ctx->ff_ctx; do { - if(mms->asf_header_read_size < mms->asf_header_size && !mms->is_playing) { + if(mms->asf_header_read_size < mms->asf_header_size && !mmst_ctx->is_playing) { /* Read from ASF header buffer */ size_to_copy= FFMIN(buf_size, mms->asf_header_size - mms->asf_header_read_size); @@ -519,15 +545,15 @@ static int read_mms_packet(MMSContext *m size_to_copy, mms->asf_header_size - mms->asf_header_read_size); if (mms->asf_header_size == mms->asf_header_read_size) { av_freep(&mms->asf_header); - mms->is_playing = 1; + mmst_ctx->is_playing = 1; } } else if(mms->remaining_in_len) { /* Read remaining packet data to buffer. * the result can not be zero because remaining_in_len is positive.*/ - result = read_data(mms, buf, buf_size); + result = read_data(mmst_ctx, buf, buf_size); } else { /* Read from network */ - int err = mms_safe_send_recv(mms, NULL, SC_PKT_ASF_MEDIA); + int err = mms_safe_send_recv(mmst_ctx, NULL, SC_PKT_ASF_MEDIA); if (err == 0) { if(mms->remaining_in_len>mms->asf_packet_len) { av_log(NULL, AV_LOG_ERROR, @@ -536,7 +562,7 @@ static int read_mms_packet(MMSContext *m result= AVERROR_IO; } else { // copy the data to the packet buffer. - result = read_data(mms, buf, buf_size); + result = read_data(mmst_ctx, buf, buf_size); if (result == 0) { dprintf(NULL, "read asf media paket size is zero!\n"); break; @@ -551,26 +577,27 @@ static int read_mms_packet(MMSContext *m return result; } -static int send_close_packet(MMSContext *mms) +static int send_close_packet(MMSTContext *mmst_ctx) { - start_command_packet(mms, CS_PKT_STREAM_CLOSE); - insert_command_prefixes(mms, 1, 1); + start_command_packet(mmst_ctx, CS_PKT_STREAM_CLOSE); + insert_command_prefixes(mmst_ctx, 1, 1); - return send_command_packet(mms); + return send_command_packet(mmst_ctx); } /** Close the MMSH/MMST connection */ static int mms_close(URLContext *h) { - MMSContext *mms = (MMSContext *)h->priv_data; - + MMSTContext *mmst_ctx = (MMSTContext *)h->priv_data; + MMSContext *mms = mmst_ctx->ff_ctx; if(mms->mms_hd) { - send_close_packet(mms); + send_close_packet(mmst_ctx); url_close(mms->mms_hd); } /* free all separately allocated pointers in mms */ av_free(mms->asf_header); + av_free(mmst_ctx->ff_ctx); av_freep(&h->priv_data); return 0; @@ -578,52 +605,56 @@ static int mms_close(URLContext *h) static int mms_open(URLContext *h, const char *uri, int flags) { + MMSTContext *mmst_ctx; MMSContext *mms; int port, err; char tcpname[256]; h->is_streamed = 1; - mms = h->priv_data = av_mallocz(sizeof(MMSContext)); + mmst_ctx = h->priv_data = av_mallocz(sizeof(MMSTContext)); if (!h->priv_data) return AVERROR(ENOMEM); + mms = mmst_ctx->ff_ctx = av_mallocz(sizeof(MMSContext)); + if (!mmst_ctx->ff_ctx ) + return AVERROR(ENOMEM); // only for MMS over TCP, so set proto = NULL av_url_split(NULL, 0, NULL, 0, - mms->host, sizeof(mms->host), &port, mms->path, - sizeof(mms->path), uri); + mmst_ctx->host, sizeof(mmst_ctx->host), &port, mmst_ctx->path, + sizeof(mmst_ctx->path), uri); if(port<0) port = 1755; // defaut mms protocol port // establish tcp connection. - ff_url_join(tcpname, sizeof(tcpname), "tcp", NULL, mms->host, port, NULL); + ff_url_join(tcpname, sizeof(tcpname), "tcp", NULL, mmst_ctx->host, port, NULL); err = url_open(&mms->mms_hd, tcpname, URL_RDWR); if (err) goto fail; - mms->packet_id = 3; // default, initial value. - mms->header_packet_id = 2; // default, initial value. - err = mms_safe_send_recv(mms, send_startup_packet, SC_PKT_CLIENT_ACCEPTED); + mmst_ctx->packet_id = 3; // default, initial value. + mmst_ctx->header_packet_id = 2; // default, initial value. + err = mms_safe_send_recv(mmst_ctx, send_startup_packet, SC_PKT_CLIENT_ACCEPTED); if (err) goto fail; - err = mms_safe_send_recv(mms, send_time_test_data, SC_PKT_TIMING_TEST_REPLY); + err = mms_safe_send_recv(mmst_ctx, send_time_test_data, SC_PKT_TIMING_TEST_REPLY); if (err) goto fail; - err = mms_safe_send_recv(mms, send_protocol_select, SC_PKT_PROTOCOL_ACCEPTED); + err = mms_safe_send_recv(mmst_ctx, send_protocol_select, SC_PKT_PROTOCOL_ACCEPTED); if (err) goto fail; - err = mms_safe_send_recv(mms, send_media_file_request, SC_PKT_MEDIA_FILE_DETAILS); + err = mms_safe_send_recv(mmst_ctx, send_media_file_request, SC_PKT_MEDIA_FILE_DETAILS); if (err) goto fail; - err = mms_safe_send_recv(mms, send_media_header_request, SC_PKT_HEADER_REQUEST_ACCEPTED); + err = mms_safe_send_recv(mmst_ctx, send_media_header_request, SC_PKT_HEADER_REQUEST_ACCEPTED); if (err) goto fail; - err = mms_safe_send_recv(mms, NULL, SC_PKT_ASF_HEADER); + err = mms_safe_send_recv(mmst_ctx, NULL, SC_PKT_ASF_HEADER); if (err) goto fail; - if((mms->incoming_flags != 0X08) && (mms->incoming_flags != 0X0C)) + if((mmst_ctx->incoming_flags != 0X08) && (mmst_ctx->incoming_flags != 0X0C)) goto fail; - err = asf_header_parser(mms); + err = asf_header_parser(mmst_ctx); if (err) { dprintf(NULL, "asf header parsed failed!\n"); goto fail; @@ -641,10 +672,11 @@ fail: return err; } -static int send_media_packet_request(MMSContext *mms) +static int send_media_packet_request(MMSTContext *mmst_ctx) { - start_command_packet(mms, CS_PKT_START_FROM_PKT_ID); - insert_command_prefixes(mms, 1, 0x0001FFFF); + MMSContext *mms = mmst_ctx->ff_ctx; + start_command_packet(mmst_ctx, CS_PKT_START_FROM_PKT_ID); + insert_command_prefixes(mmst_ctx, 1, 0x0001FFFF); bytestream_put_le64(&mms->write_out_ptr, 0); // seek timestamp bytestream_put_le32(&mms->write_out_ptr, 0xffffffff); // unknown bytestream_put_le32(&mms->write_out_ptr, 0xffffffff); // packet offset @@ -653,14 +685,15 @@ static int send_media_packet_request(MMS bytestream_put_byte(&mms->write_out_ptr, 0xff); // max stream time limit bytestream_put_byte(&mms->write_out_ptr, 0x00); // stream time limit flag - mms->packet_id++; // new packet_id - bytestream_put_le32(&mms->write_out_ptr, mms->packet_id); - return send_command_packet(mms); + mmst_ctx->packet_id++; // new packet_id + bytestream_put_le32(&mms->write_out_ptr, mmst_ctx->packet_id); + return send_command_packet(mmst_ctx); } -static void clear_stream_buffers(MMSContext *mms) +static void clear_stream_buffers(MMSTContext *mmst_ctx) { + MMSContext *mms = mmst_ctx->ff_ctx; mms->remaining_in_len = 0; mms->read_in_ptr = mms->in_buffer; } @@ -669,25 +702,25 @@ static void clear_stream_buffers(MMSCont static int mms_read(URLContext *h, uint8_t *buf, int size) { /* TODO: see tcp.c:tcp_read() about a possible timeout scheme */ - MMSContext *mms = h->priv_data; + MMSTContext *mmst_ctx = h->priv_data; int result = 0; /* Since we read the header at open(), this shouldn't be possible */ - assert(mms->header_parsed); + assert(mmst_ctx->ff_ctx->header_parsed); - if (!mms->is_playing) { + if (!mmst_ctx->is_playing) { dprintf(NULL, "mms_read() before play().\n"); - clear_stream_buffers(mms); - result = mms_safe_send_recv(mms, send_stream_selection_request, SC_PKT_STREAM_ID_ACCEPTED); + clear_stream_buffers(mmst_ctx); + result = mms_safe_send_recv(mmst_ctx, send_stream_selection_request, SC_PKT_STREAM_ID_ACCEPTED); if (result) return result; // send media packet request - result = mms_safe_send_recv(mms, send_media_packet_request, SC_PKT_MEDIA_PKT_FOLLOWS); + result = mms_safe_send_recv(mmst_ctx, send_media_packet_request, SC_PKT_MEDIA_PKT_FOLLOWS); if (result) { return result; } } - return read_mms_packet(mms, buf, size); + return read_mms_packet(mmst_ctx, buf, size); } URLProtocol mmst_protocol = {

1 0

Re: [FFmpeg-soc] [PATCH] Add asrc_buffer filter
by S.N. Hemanth Meenakshisundaram 28 Jul '10

28 Jul '10

Added an asrc buffer. Uses AVFifoBuffer like in Baptiste's vsrc patch. My ffmpeg.c changes aren't yet complete, will test with ffmpeg.c this once that is done. --- libavfilter/Makefile | 2 + libavfilter/allfilters.c | 2 + libavfilter/asrc_buffer.c | 128 +++++++++++++++++++++++++++++++++++++++++++++ libavfilter/asrc_buffer.h | 24 ++++++++ 4 files changed, 156 insertions(+), 0 deletions(-) create mode 100644 libavfilter/asrc_buffer.c create mode 100644 libavfilter/asrc_buffer.h

2 1

[PATCH] add sampling handling to theora depacketizer
by Josh Allmann 28 Jul '10

28 Jul '10

This patch increases compatibility with the Theora spec by allowing the SDP to specify the sampling/pix_fmt. The sampling parameter is technically required by the spec, but the depacketizer still works fine if the SDP omits it. Josh

3 6

[soc]AMR-WB decoder branch, master, updated.
by Marcelo Póvoa 27 Jul '10

27 Jul '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "AMR-WB decoder". The branch, master has been updated via 5116d7f3e4f7d3dfb7436506d9d9771e3c0cf2a4 (commit) from 9af5752cd7ed98e7bfbc0f6bd2d17b345f22278a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5116d7f3e4f7d3dfb7436506d9d9771e3c0cf2a4 Author: Marcelo Povoa <marspeoplester(a)gmail.com> Date: Wed Jul 28 00:34:59 2010 -0300 Fix LP coefficients offset and upscale output, bringing the decoder output audio to a recognizable level for some bitrates (contains only the lower frequency band yet) diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index 3f3faf4..35f74af 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -51,7 +51,7 @@ typedef struct { double isp[4][LP_ORDER]; ///< ISP vectors from current frame double isp_sub4_past[LP_ORDER]; ///< ISP vector for the 4th subframe of the previous frame - float lp_coef[4][LP_ORDER]; ///< Linear Prediction Coefficients from ISP vector + float lp_coef[4][LP_ORDER + 1]; ///< Linear Prediction Coefficients from ISP vector uint8_t base_pitch_lag; ///< integer part of pitch lag for next relative subframe uint8_t pitch_lag_int; ///< integer part of pitch lag of the previous subframe @@ -905,7 +905,7 @@ static void synthesis(AMRWBContext *ctx, float *lpc, float *excitation, energy, AMRWB_SUBFRAME_SIZE); } - ff_celp_lp_synthesis_filterf(samples, lpc, excitation, + ff_celp_lp_synthesis_filterf(samples, lpc + 1, excitation, AMRWB_SUBFRAME_SIZE, LP_ORDER); } @@ -985,7 +985,7 @@ static void upsample_5_4(float *out, const float *in, int o_size) out[i] = ff_dot_productf(in0 + int_part, upsample_fir[4 - frac_part], UPS_MEM_SIZE); - out[i] *= 2.0; // upscale output + out[i] *= 2.0 / 32768.0; // upscale output } } ----------------------------------------------------------------------- Summary of changes: libavcodec/amrwbdec.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- AMR-WB decoder

1 0

[soc]AMR-WB decoder branch, master, updated.
by Marcelo Póvoa 27 Jul '10

27 Jul '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "AMR-WB decoder". The branch, master has been updated via 9af5752cd7ed98e7bfbc0f6bd2d17b345f22278a (commit) via f38e5de8f3cf8bb0f83c9440cbb7bd1f74184cdb (commit) from 4e9169a62e5fdb901d0f1a0a4a85613b575e7b2f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9af5752cd7ed98e7bfbc0f6bd2d17b345f22278a Author: Marcelo Povoa <marspeoplester(a)gmail.com> Date: Wed Jul 28 00:28:42 2010 -0300 Correct past synthesized samples memory, separating between filtered and not filtered (directly from synthesis) diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h index 46a97ff..8db1617 100644 --- a/libavcodec/amrwbdata.h +++ b/libavcodec/amrwbdata.h @@ -27,7 +27,8 @@ #define LP_ORDER 16 ///< linear predictive coding filter order #define LP_ORDER_16k 20 ///< lpc filter order at 16kHz #define UPS_FIR_SIZE 12 ///< upsampling filter size -#define SAMPLE_MEM 24 ///< number of stored past samples given by +#define UPS_MEM_SIZE 2 * UPS_FIR_SIZE +//#define SAMPLE_MEM 24 ///< number of stored past samples given by ///< max(LP_ORDER, UPS_FIR_SIZE * 2) #define MIN_ISF_SPACING (128 / 32768.0) ///< minimum isf gap #define PRED_FACTOR (1.0 / 3.0) diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index c7787af..3f3faf4 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -72,10 +72,11 @@ typedef struct { uint8_t prev_ir_filter_nr; ///< previous impulse response filter "impNr": 0 - strong, 1 - medium, 2 - none float prev_tr_gain; ///< previous initial gain used by noise enhancer for thresold - float samples_in[SAMPLE_MEM + AMRWB_SUBFRAME_SIZE]; ///< lower band floating point samples at 12.8kHz + float samples_az[LP_ORDER + AMRWB_SUBFRAME_SIZE]; ///< lower band samples from synthesis at 12.8kHz + float samples_up[UPS_MEM_SIZE + AMRWB_SUBFRAME_SIZE]; ///< lower band samples processed for upsampling at 12.8kHz - float demph_mem[1]; ///< previous value in the de-emphasis filter float hpf_31_mem[4], hpf_400_mem[4]; ///< previous values in the high-pass filters + float demph_mem[1]; ///< previous value in the de-emphasis filter AVLFG prng; ///< random number generator for white noise excitation uint8_t first_frame; ///< flag active during decoding of the first frame @@ -912,20 +913,21 @@ static void synthesis(AMRWBContext *ctx, float *lpc, float *excitation, * Apply to synthesis a de-emphasis filter of the form: * H(z) = 1 / (1 - m * z^-1) * - * @param synth [in/out] synthesized speech array + * @param out [out] output buffer + * @param in [in] input samples array with in[-1] * @param m [in] filter coefficient - * @param mem [in] state from last filtering + * @param mem [in/out] state from last filtering */ -static void de_emphasis(float *synth, float m, float mem[1]) +static void de_emphasis(float *out, float *in, float m, float mem[1]) { int i; - synth[0] += m * mem[0]; + out[0] = in[0] + m * mem[0]; - for (i = 0; i < AMRWB_SUBFRAME_SIZE; i++) - synth[i] += synth[i - 1] * m; + for (i = 1; i < AMRWB_SUBFRAME_SIZE; i++) + out[i] = in[i] + out[i - 1] * m; - mem[0] = synth[AMRWB_SUBFRAME_SIZE - 1]; + mem[0] = out[AMRWB_SUBFRAME_SIZE - 1]; } /** @@ -981,7 +983,7 @@ static void upsample_5_4(float *out, const float *in, int o_size) out[i] = in[i]; } else out[i] = ff_dot_productf(in0 + int_part, upsample_fir[4 - frac_part], - UPS_FIR_SIZE << 1); + UPS_MEM_SIZE); out[i] *= 2.0; // upscale output } @@ -1094,8 +1096,10 @@ static void update_sub_state(AMRWBContext *ctx) memmove(&ctx->pitch_gain[0], &ctx->pitch_gain[1], 4 * sizeof(float)); memmove(&ctx->fixed_gain[0], &ctx->fixed_gain[1], 4 * sizeof(float)); - memmove(&ctx->samples_in[0], &ctx->samples_in[AMRWB_SUBFRAME_SIZE], - SAMPLE_MEM * sizeof(float)); + memmove(&ctx->samples_az[0], &ctx->samples_az[AMRWB_SUBFRAME_SIZE], + LP_ORDER * sizeof(float)); + memmove(&ctx->samples_up[0], &ctx->samples_up[AMRWB_SUBFRAME_SIZE], + UPS_MEM_SIZE * sizeof(float)); } static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, @@ -1200,22 +1204,23 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, pitch_enhancer(synth_fixed_vector, voice_fac); synthesis(ctx, ctx->lp_coef[sub], synth_exc, synth_fixed_gain, - synth_fixed_vector, &ctx->samples_in[SAMPLE_MEM]); + synth_fixed_vector, &ctx->samples_az[LP_ORDER]); /* Synthesis speech post-processing */ - de_emphasis(&ctx->samples_in[SAMPLE_MEM], PREEMPH_FAC, ctx->demph_mem); + de_emphasis(&ctx->samples_up[UPS_MEM_SIZE], + &ctx->samples_az[LP_ORDER], PREEMPH_FAC, ctx->demph_mem); - high_pass_filter(&ctx->samples_in[SAMPLE_MEM], hpf_31_coef, - ctx->hpf_31_mem, &ctx->samples_in[SAMPLE_MEM]); + high_pass_filter(&ctx->samples_up[UPS_MEM_SIZE], hpf_31_coef, + ctx->hpf_31_mem, &ctx->samples_up[UPS_MEM_SIZE]); upsample_5_4(buf_out + sub * AMRWB_SFR_SIZE_OUT, - &ctx->samples_in[UPS_FIR_SIZE], AMRWB_SFR_SIZE_OUT); + &ctx->samples_up[UPS_FIR_SIZE], AMRWB_SFR_SIZE_OUT); /* High frequency band generation */ - high_pass_filter(&ctx->samples_in[SAMPLE_MEM], hpf_400_coef, - ctx->hpf_400_mem, &ctx->samples_in[SAMPLE_MEM]); + high_pass_filter(&ctx->samples_up[UPS_MEM_SIZE], hpf_400_coef, + ctx->hpf_400_mem, &ctx->samples_up[UPS_MEM_SIZE]); - hb_gain = find_hb_gain(ctx, &ctx->samples_in[SAMPLE_MEM], + hb_gain = find_hb_gain(ctx, &ctx->samples_up[UPS_MEM_SIZE], cur_subframe->hb_gain, cf->vad); scaled_hb_excitation(ctx, hb_exc, synth_exc, hb_gain); commit f38e5de8f3cf8bb0f83c9440cbb7bd1f74184cdb Author: Marcelo Povoa <marspeoplester(a)gmail.com> Date: Wed Jul 28 00:26:04 2010 -0300 Fix a bug in the sign of the decoded pulse index when its position was 0 diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index d7deb39..c7787af 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -584,7 +584,7 @@ static void decode_6p_track(int *out, int code, int m, int off) static void decode_fixed_sparse(AMRFixed *fixed_sparse, const uint16_t *pulse_hi, const uint16_t *pulse_lo, const enum Mode mode) { - /* sig_pos stores for each track the decoded pulse position + /* sig_pos stores for each track the decoded pulse position (1-based) * indexes multiplied by its corresponding amplitude (+1 or -1) */ int sig_pos[4][6]; int pulses_nb = 0; @@ -594,51 +594,51 @@ static void decode_fixed_sparse(AMRFixed *fixed_sparse, const uint16_t *pulse_hi switch (mode) { case MODE_6k60: for (i = 0; i < 2; i++) - decode_1p_track(sig_pos[i], pulse_lo[i], 5, 0); + decode_1p_track(sig_pos[i], pulse_lo[i], 5, 1); break; case MODE_8k85: for (i = 0; i < 4; i++) - decode_1p_track(sig_pos[i], pulse_lo[i], 4, 0); + decode_1p_track(sig_pos[i], pulse_lo[i], 4, 1); break; case MODE_12k65: for (i = 0; i < 4; i++) - decode_2p_track(sig_pos[i], pulse_lo[i], 4, 0); + decode_2p_track(sig_pos[i], pulse_lo[i], 4, 1); break; case MODE_14k25: for (i = 0; i < 2; i++) - decode_3p_track(sig_pos[i], pulse_lo[i], 4, 0); + decode_3p_track(sig_pos[i], pulse_lo[i], 4, 1); for (i = 2; i < 4; i++) - decode_2p_track(sig_pos[i], pulse_lo[i], 4, 0); + decode_2p_track(sig_pos[i], pulse_lo[i], 4, 1); break; case MODE_15k85: for (i = 0; i < 4; i++) - decode_3p_track(sig_pos[i], pulse_lo[i], 4, 0); + decode_3p_track(sig_pos[i], pulse_lo[i], 4, 1); break; case MODE_18k25: for (i = 0; i < 4; i++) decode_4p_track(sig_pos[i], (int) pulse_lo[i] + - ((int) pulse_hi[i] << 14), 4, 0); + ((int) pulse_hi[i] << 14), 4, 1); break; case MODE_19k85: for (i = 0; i < 2; i++) decode_5p_track(sig_pos[i], (int) pulse_lo[i] + - ((int) pulse_hi[i] << 10), 4, 0); + ((int) pulse_hi[i] << 10), 4, 1); for (i = 2; i < 4; i++) decode_4p_track(sig_pos[i], (int) pulse_lo[i] + - ((int) pulse_hi[i] << 14), 4, 0); + ((int) pulse_hi[i] << 14), 4, 1); break; case MODE_23k05: case MODE_23k85: for (i = 0; i < 4; i++) decode_6p_track(sig_pos[i], (int) pulse_lo[i] + - ((int) pulse_hi[i] << 11), 4, 0); + ((int) pulse_hi[i] << 11), 4, 1); break; } for (i = 0; i < 4; i++) for (j = 0; j < pulses_nb_per_mode_tr[mode][i]; j++) { int pos = sig_pos[i][j]; - fixed_sparse->x[pulses_nb] = FFABS(pos) * spacing + i; + fixed_sparse->x[pulses_nb] = (FFABS(pos) - 1) * spacing + i; fixed_sparse->y[pulses_nb] = pos < 0 ? -1.0 : 1.0; pulses_nb++; } ----------------------------------------------------------------------- Summary of changes: libavcodec/amrwbdata.h | 3 +- libavcodec/amrwbdec.c | 69 +++++++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 33 deletions(-) hooks/post-receive -- AMR-WB decoder

1 0

[soc]: r5873 - libavfilter/checkout.sh
by stefano 27 Jul '10

27 Jul '10

Author: stefano Date: Tue Jul 27 18:28:44 2010 New Revision: 5873 Log: Make checkout.sh copy to ffmpeg/libavfilter the list of files explicitely stated in the script, rather than all the files indiscriminately. More robust. Modified: libavfilter/checkout.sh Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Tue Jul 27 18:17:15 2010 (r5872) +++ libavfilter/checkout.sh Tue Jul 27 18:28:44 2010 (r5873) @@ -12,4 +12,21 @@ echo "patching ffmpeg" for diff in $(ls $(pwd)/diffs/*.diff); do patch -d ffmpeg -p0 -i $diff; done echo "copying files to libavfilter" -find $(pwd) -maxdepth 1 -type f -not -name $(basename $0) -exec cp {} ffmpeg/libavfilter \; +cp \ + vf_clone.c \ + vf_concatenate.c \ + vf_drawbox.c \ + vf_drawtext.c \ + vf_fade.c \ + vf_fifo.c \ + vf_fps.c \ + vf_hflip.c \ + vf_negate.c \ + vf_overlay.c \ + vf_rotate.c \ + vf_setpts.c \ + vf_split.c \ + vf_transpose.c \ + vsrc_movie.c \ + ffmpeg/libavfilter +

1 0

[soc]: r5872 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff
by stefano 27 Jul '10

27 Jul '10

Author: stefano Date: Tue Jul 27 18:17:15 2010 New Revision: 5872 Log: Update to FFmpeg r24545 / libswscale r31782. Modified: libavfilter/checkout.sh libavfilter/diffs/00_configure.diff libavfilter/diffs/01_build.diff libavfilter/diffs/03_doc_filters.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Tue Jul 27 18:11:35 2010 (r5871) +++ libavfilter/checkout.sh Tue Jul 27 18:17:15 2010 (r5872) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24294 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24545 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r31746 +svn up -r31782 cd ../.. echo "patching ffmpeg" Modified: libavfilter/diffs/00_configure.diff ============================================================================== --- libavfilter/diffs/00_configure.diff Tue Jul 27 18:11:35 2010 (r5871) +++ libavfilter/diffs/00_configure.diff Tue Jul 27 18:17:15 2010 (r5872) @@ -1,8 +1,8 @@ Index: configure =================================================================== ---- configure (revision 24294) +--- configure (revision 24545) +++ configure (working copy) -@@ -167,6 +167,7 @@ +@@ -168,6 +168,7 @@ and libraw1394 [no] --enable-libdirac enable Dirac support via libdirac [no] --enable-libfaac enable FAAC support via libfaac [no] @@ -10,7 +10,7 @@ Index: configure --enable-libgsm enable GSM support via libgsm [no] --enable-libmp3lame enable MP3 encoding via libmp3lame [no] --enable-libnut enable NUT (de)muxing via libnut, -@@ -869,6 +870,7 @@ +@@ -872,6 +873,7 @@ libdc1394 libdirac libfaac @@ -18,7 +18,7 @@ Index: configure libgsm libmp3lame libnut -@@ -1010,6 +1012,7 @@ +@@ -1014,6 +1016,7 @@ llrintf local_aligned_16 local_aligned_8 @@ -26,7 +26,7 @@ Index: configure log2 log2f loongson -@@ -1376,6 +1379,7 @@ +@@ -1381,6 +1384,7 @@ udp_protocol_deps="network" # filters @@ -34,7 +34,7 @@ Index: configure movie_filter_deps="avfilter_lavf" avfilter_lavf_deps="avformat" -@@ -2559,6 +2563,7 @@ +@@ -2579,6 +2583,7 @@ check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss check_func inet_aton $network_extralibs check_func isatty @@ -42,7 +42,7 @@ Index: configure check_func ${malloc_prefix}memalign && enable memalign check_func mkstemp check_func ${malloc_prefix}posix_memalign && enable posix_memalign -@@ -2641,6 +2646,7 @@ +@@ -2661,6 +2666,7 @@ require libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init $(pkg-config --libs dirac) && require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac) enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac Modified: libavfilter/diffs/01_build.diff ============================================================================== --- libavfilter/diffs/01_build.diff Tue Jul 27 18:11:35 2010 (r5871) +++ libavfilter/diffs/01_build.diff Tue Jul 27 18:17:15 2010 (r5872) @@ -1,13 +1,13 @@ Index: libavfilter/Makefile =================================================================== ---- libavfilter/Makefile (revision 24294) +--- libavfilter/Makefile (revision 24545) +++ libavfilter/Makefile (working copy) @@ -1,10 +1,11 @@ include $(SUBDIR)../config.mak NAME = avfilter --FFLIBS = avcodec avutil swscale -+FFLIBS = avcodec avutil +-FFLIBS = avcodec avcore avutil swscale ++FFLIBS = avcodec avcore avutil +FFLIBS-$(CONFIG_SCALE_FILTER) += swscale FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat @@ -51,7 +51,7 @@ Index: libavfilter/Makefile OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o Index: libavfilter/allfilters.c =================================================================== ---- libavfilter/allfilters.c (revision 24294) +--- libavfilter/allfilters.c (revision 24545) +++ libavfilter/allfilters.c (working copy) @@ -36,19 +36,32 @@ Modified: libavfilter/diffs/03_doc_filters.diff ============================================================================== --- libavfilter/diffs/03_doc_filters.diff Tue Jul 27 18:11:35 2010 (r5871) +++ libavfilter/diffs/03_doc_filters.diff Tue Jul 27 18:17:15 2010 (r5872) @@ -1,6 +1,6 @@ Index: doc/filters.texi =================================================================== ---- doc/filters.texi (revision 24294) +--- doc/filters.texi (revision 24545) +++ doc/filters.texi (working copy) @@ -39,6 +39,114 @@ @@ -265,19 +265,7 @@ Index: doc/filters.texi @section unsharp Sharpen or blur the input video. -@@ -229,6 +450,11 @@ - - Below is a description of the currently available video sources. - -+@section buffer -+ -+This input filter is used by the client application to feed pictures to -+the filter chain. See ffmpeg.c for an usage example. -+ - @section color - - Provide an uniformly colored input. -@@ -268,6 +494,27 @@ +@@ -308,6 +529,27 @@ "color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]" @end example

1 0

[soc]: r5871 - mms/mmst.c
by spyfeng 27 Jul '10

27 Jul '10

Author: spyfeng Date: Tue Jul 27 18:11:35 2010 New Revision: 5871 Log: use mms.h. Modified: mms/mmst.c Modified: mms/mmst.c ============================================================================== --- mms/mmst.c Tue Jul 27 17:30:35 2010 (r5870) +++ mms/mmst.c Tue Jul 27 18:11:35 2010 (r5871) @@ -28,7 +28,7 @@ * [2]http://msdn.microsoft.com/en-us/library/bb643323.aspx */ -#include "avformat.h" +#include "mms.h" #include "internal.h" #include "libavutil/intreadwrite.h" #include "libavcodec/bytestream.h" @@ -83,50 +83,6 @@ typedef enum { /*@}*/ } MMSSCPacketType; -typedef struct { - int id; -}MMSStream; - -typedef struct { - int outgoing_packet_seq; ///< Outgoing packet sequence number. - char path[256]; ///< Path of the resource being asked for. - char host[128]; ///< Host of the resources. - - URLContext *mms_hd; ///< TCP connection handle - MMSStream streams[MAX_STREAMS]; - - /** Buffer for outgoing packets. */ - /*@{*/ - uint8_t *write_out_ptr; ///< Pointer for writting the buffer. - uint8_t out_buffer[512]; ///< Buffer for outgoing packet. - /*@}*/ - - /** Buffer for incoming packets. */ - /*@{*/ - uint8_t in_buffer[8192]; ///< Buffer for incoming packets. - uint8_t *read_in_ptr; ///< Pointer for reading from incoming buffer. - int remaining_in_len; ///< Reading length from incoming buffer. - /*@}*/ - - int incoming_packet_seq; ///< Incoming packet sequence number. - int incoming_flags; ///< Incoming packet flags. - - int packet_id; ///< Identifier for packets in the current stream. - unsigned int header_packet_id; ///< default is 2. - - /** Internal handling of the ASF header */ - /*@{*/ - uint8_t *asf_header; ///< Stored ASF header. - int asf_header_size; ///< Size of stored ASF header. - int header_parsed; ///< The header has been received and parsed. - int asf_packet_len; - int asf_header_read_size; - /*@}*/ - - int stream_num; ///< stream numbers. - int is_playing; -} MMSContext; - /** Create MMST command packet header */ static void start_command_packet(MMSContext *mms, MMSCSPacketType packet_type) {

1 0

[soc]: r5870 - in mms: mms.h mmsh.c
by spyfeng 27 Jul '10

27 Jul '10

Author: spyfeng Date: Tue Jul 27 17:30:35 2010 New Revision: 5870 Log: move MMSHContext into mms.h for ready to extract common field with MMSContext. Modified: mms/mms.h mms/mmsh.c Modified: mms/mms.h ============================================================================== --- mms/mms.h Tue Jul 27 17:06:25 2010 (r5869) +++ mms/mms.h Tue Jul 27 17:30:35 2010 (r5870) @@ -66,4 +66,27 @@ typedef struct { int stream_num; ///< stream numbers. int is_playing; } MMSContext; + +typedef struct +{ + URLContext *mms_hd; + uint8_t out_buffer[8192]; ///< Buffer for outgoing packet. + uint8_t in_buffer[8192]; //TODO, maybe reused by out_buffer. + uint8_t *read_in_ptr; + MMSStream streams[MAX_STREAMS]; + + uint8_t *asf_header; + int asf_header_size; + int asf_header_read_size; + int asf_data_remaining_len; + int asf_packet_len; + + + char location[1024]; + int seekable; + int stream_num; + int request_seq; + int chunk_seq; + int is_header_parsed; +}MMSHContext; #endif Modified: mms/mmsh.c ============================================================================== --- mms/mmsh.c Tue Jul 27 17:06:25 2010 (r5869) +++ mms/mmsh.c Tue Jul 27 17:30:35 2010 (r5870) @@ -18,7 +18,7 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avformat.h" +#include "mms.h" #include "internal.h" #include "libavutil/intreadwrite.h" #include <string.h> @@ -68,33 +68,6 @@ static const char* mmsh_live_request = "Pragma: stream-switch-entry=%s\r\n" "Connection: Close\r\n\r\n"; -typedef struct { - int id; -}MMSStream; - -typedef struct -{ - URLContext *mms_hd; - uint8_t out_buffer[8192]; ///< Buffer for outgoing packet. - uint8_t in_buffer[8192]; //TODO, maybe reused by out_buffer. - uint8_t *read_in_ptr; - MMSStream streams[MAX_STREAMS]; - - uint8_t *asf_header; - int asf_header_size; - int asf_header_read_size; - int asf_data_remaining_len; - int asf_packet_len; - - - char location[1024]; - int seekable; - int stream_num; - int request_seq; - int chunk_seq; - int is_header_parsed; -}MMSHContext; - static int mmsh_close(URLContext *h) { MMSHContext *mms = (MMSHContext *)h->priv_data;

1 0

[soc]: r5869 - mms/mmsh.c
by spyfeng 27 Jul '10

27 Jul '10

Author: spyfeng Date: Tue Jul 27 17:06:25 2010 New Revision: 5869 Log: use asf_header_parser() instead of the same function in mmsh.c. because that one is more maturity. Modified: mms/mmsh.c Modified: mms/mmsh.c ============================================================================== --- mms/mmsh.c Tue Jul 27 16:54:41 2010 (r5868) +++ mms/mmsh.c Tue Jul 27 17:06:25 2010 (r5869) @@ -102,54 +102,67 @@ static int mmsh_close(URLContext *h) url_close(mms->mms_hd); av_freep(&h->priv_data); av_freep(&mms->asf_header); - //TODO free other alloced mem. return 0; } -static int asf_header_parser(MMSHContext * mms) +static int asf_header_parser(MMSHContext *mms) { uint8_t *p = mms->asf_header; uint8_t *end; - int flags, stream_id, real_header_size; + int flags, stream_id; mms->stream_num = 0; if (mms->asf_header_size < sizeof(ff_asf_guid) * 2 + 22 || - memcmp(p, ff_asf_header, sizeof(ff_asf_guid))) - return -1; + memcmp(p, ff_asf_header, sizeof(ff_asf_guid))) { + av_log(NULL, AV_LOG_ERROR, + "Corrupt stream (invalid ASF header, size=%d)\n", + mms->asf_header_size); + return AVERROR_INVALIDDATA; + } - real_header_size = AV_RL64(p + sizeof(ff_asf_guid)); - end = mms->asf_header + real_header_size; + end = mms->asf_header + mms->asf_header_size; p += sizeof(ff_asf_guid) + 14; while(end - p >= sizeof(ff_asf_guid) + 8) { uint64_t chunksize = AV_RL64(p + sizeof(ff_asf_guid)); if (!chunksize || chunksize > end - p) { - dprintf(NULL, "chunksize is exceptional value:%"PRId64"!\n", chunksize); - return -1; + av_log(NULL, AV_LOG_ERROR, + "Corrupt stream (header chunksize %"PRId64" is invalid)\n", + chunksize); + return AVERROR_INVALIDDATA; } if (!memcmp(p, ff_asf_file_header, sizeof(ff_asf_guid))) { /* read packet size */ if (end - p > sizeof(ff_asf_guid) * 2 + 68) { mms->asf_packet_len = AV_RL32(p + sizeof(ff_asf_guid) * 2 + 64); if (mms->asf_packet_len <= 0 || mms->asf_packet_len > sizeof(mms->in_buffer)) { - dprintf(NULL,"Too large packet len:%d" - " may overwrite in_buffer when padding", mms->asf_packet_len); - return -1; + av_log(NULL, AV_LOG_ERROR, + "Corrupt stream (too large pkt_len %d)\n", + mms->asf_packet_len); + return AVERROR_INVALIDDATA; } } } else if (!memcmp(p, ff_asf_stream_header, sizeof(ff_asf_guid))) { flags = AV_RL16(p + sizeof(ff_asf_guid)*3 + 24); stream_id = flags & 0x7F; - if (mms->stream_num < MAX_STREAMS ) { + //The second condition is for checking CS_PKT_STREAM_ID_REQUEST packet size, + //we can calcuate the packet size by stream_num. + //Please see function send_stream_selection_request(). + if (mms->stream_num < MAX_STREAMS && + 46 + mms->stream_num * 6 < sizeof(mms->out_buffer)) { mms->streams[mms->stream_num].id = stream_id; mms->stream_num++; } else { - dprintf(NULL, "Too many streams.\n"); - return -1; + av_log(NULL, AV_LOG_ERROR, + "Corrupt stream (too many A/V streams)\n"); + return AVERROR_INVALIDDATA; } + } else if (!memcmp(p, ff_asf_head1_guid, sizeof(ff_asf_guid))) { + chunksize = 46; // see mmst.c references [2] section 3.4. This should be set 46. } p += chunksize; } + return 0; }

1 0