]> git.sesse.net Git - ffmpeg/blobdiff - libavformat/mmst.c
img2enc: Refactor the atomic renaming code
[ffmpeg] / libavformat / mmst.c
index 75fb4c634619880c3a77ab08809b74c8c1a8b0ff..1489076ad3bb6d1aca2407d6088f55a7a1ba571e 100644 (file)
@@ -1,31 +1,41 @@
 /*
  * MMS protocol over TCP
  * Copyright (c) 2006,2007 Ryan Martell
- * Copyright (c) 2007 Björn Axelsson
+ * Copyright (c) 2007 Björn Axelsson
  * Copyright (c) 2010 Zhentan Feng <spyfeng at gmail dot com>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+/* References
+ * MMS protocol specification:
+ *  [1]http://msdn.microsoft.com/en-us/library/cc234711(PROT.10).aspx
+ * ASF specification. Revision 01.20.03.
+ *  [2]http://msdn.microsoft.com/en-us/library/bb643323.aspx
+ */
+
 #include "avformat.h"
+#include "mms.h"
 #include "internal.h"
+#include "avio_internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavcodec/bytestream.h"
 #include "network.h"
-#include "asf.h"
+#include "url.h"
 
 #define LOCAL_ADDRESS 0xc0a80081    // FIXME get and use correct local ip address.
 #define LOCAL_PORT    1037          // as above.
@@ -75,52 +85,21 @@ typedef enum {
     /*@}*/
 } MMSSCPacketType;
 
-typedef struct {
-    int id;
-}MMSStream;
-
-typedef struct {
+typedef struct MMSTContext {
+    MMSContext  mms;
     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 stream_num;                      ///< stream numbers.
-    int is_playing;
-} MMSContext;
+} MMSTContext;
 
 /** Create MMST command packet header */
-static void start_command_packet(MMSContext *mms, MMSCSPacketType packet_type)
+static void start_command_packet(MMSTContext *mmst, MMSCSPacketType packet_type)
 {
+    MMSContext *mms    = &mmst->mms;
     mms->write_out_ptr = mms->out_buffer;
 
     bytestream_put_le32(&mms->write_out_ptr, 1); // start sequence
@@ -128,7 +107,7 @@ static void start_command_packet(MMSContext *mms, MMSCSPacketType packet_type)
     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->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);
@@ -144,9 +123,11 @@ static void insert_command_prefixes(MMSContext *mms,
 }
 
 /** Send a prepared MMST command packet. */
-static int send_command_packet(MMSContext *mms)
+static int send_command_packet(MMSTContext *mmst)
 {
-    int exact_length= mms->write_out_ptr - mms->out_buffer;
+    MMSContext *mms  = &mmst->mms;
+    int len= mms->write_out_ptr - mms->out_buffer;
+    int exact_length = FFALIGN(len, 8);
     int first_length= exact_length - 16;
     int len8= first_length/8;
     int write_result;
@@ -155,13 +136,17 @@ static int send_command_packet(MMSContext *mms)
     AV_WL32(mms->out_buffer + 8, first_length);
     AV_WL32(mms->out_buffer + 16, len8);
     AV_WL32(mms->out_buffer + 32, len8-2);
+    memset(mms->write_out_ptr, 0, exact_length - len);
 
     // write it out.
-    write_result= url_write(mms->mms_hd, mms->out_buffer, exact_length);
+    write_result= ffurl_write(mms->mms_hd, mms->out_buffer, exact_length);
     if(write_result != exact_length) {
-        dprintf(NULL, "url_write returned: %d != %d\n",
-                write_result, exact_length);
-        return AVERROR_IO;
+        av_log(NULL, AV_LOG_ERROR,
+               "Failed to write data of length %d: %d (%s)\n",
+               exact_length, write_result,
+               write_result < 0 ? strerror(AVUNERROR(write_result)) :
+                   "The server closed the connection");
+        return AVERROR(EIO);
     }
 
     return 0;
@@ -169,28 +154,29 @@ static int send_command_packet(MMSContext *mms)
 
 static void mms_put_utf16(MMSContext *mms, uint8_t *src)
 {
-    ByteIOContext bic;
+    AVIOContext bic;
     int size = mms->write_out_ptr - mms->out_buffer;
     int len;
-    init_put_byte(&bic, mms->write_out_ptr,
+    ffio_init_context(&bic, mms->write_out_ptr,
             sizeof(mms->out_buffer) - size, 1, NULL, NULL, NULL, NULL);
 
-    len = ff_put_str16_nolen(&bic, src);
+    len = avio_put_str16le(&bic, src);
     mms->write_out_ptr += len;
 }
 
-static int send_time_test_data(MMSContext *mms)
+static int send_time_test_data(MMSTContext *mmst)
 {
-    start_command_packet(mms, CS_PKT_TIMING_DATA_REQUEST);
-    insert_command_prefixes(mms, 0xf0f0f0f1, 0x0004000b);
-    return send_command_packet(mms);
+    start_command_packet(mmst, CS_PKT_TIMING_DATA_REQUEST);
+    insert_command_prefixes(&mmst->mms, 0x00f0f0f0, 0x0004000b);
+    return send_command_packet(mmst);
 }
 
-static int send_protocol_select(MMSContext *mms)
+static int send_protocol_select(MMSTContext *mmst)
 {
     char data_string[256];
+    MMSContext *mms = &mmst->mms;
 
-    start_command_packet(mms, CS_PKT_PROTOCOL_SELECT);
+    start_command_packet(mmst, CS_PKT_PROTOCOL_SELECT);
     insert_command_prefixes(mms, 0, 0xffffffff);
     bytestream_put_le32(&mms->write_out_ptr, 0);          // maxFunnelBytes
     bytestream_put_le32(&mms->write_out_ptr, 0x00989680); // maxbitRate
@@ -204,35 +190,37 @@ static int send_protocol_select(MMSContext *mms)
             LOCAL_PORT);
 
     mms_put_utf16(mms, data_string);
-    return send_command_packet(mms);
+    return send_command_packet(mmst);
 }
 
-static int send_media_file_request(MMSContext *mms)
+static int send_media_file_request(MMSTContext *mmst)
 {
-    start_command_packet(mms, CS_PKT_MEDIA_FILE_REQUEST);
+    MMSContext *mms = &mmst->mms;
+    start_command_packet(mmst, CS_PKT_MEDIA_FILE_REQUEST);
     insert_command_prefixes(mms, 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(mms, mmst->path + 1); // +1 for skip "/"
 
-    return send_command_packet(mms);
+    return send_command_packet(mmst);
 }
 
-static void handle_packet_stream_changing_type(MMSContext *mms)
+static void handle_packet_stream_changing_type(MMSTContext *mmst)
 {
-    dprintf(NULL, "Stream changing!\n");
+    MMSContext *mms = &mmst->mms;
+    av_log(NULL, AV_LOG_TRACE, "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->header_packet_id= AV_RL32(mms->in_buffer + 40 + 7);
+    av_log(NULL, AV_LOG_TRACE, "Changed header prefix to 0x%x", mmst->header_packet_id);
 }
 
-static int send_keepalive_packet(MMSContext *mms)
+static int send_keepalive_packet(MMSTContext *mmst)
 {
     // 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, CS_PKT_KEEPALIVE);
+    insert_command_prefixes(&mmst->mms, 1, 0x100FFFF);
+    return send_command_packet(mmst);
 }
 
 /** Pad media packets smaller than max_packet_size and/or adjust read position
@@ -247,143 +235,167 @@ static void pad_media_packet(MMSContext *mms)
 }
 
 /** Read incoming MMST media, header or command packet. */
-static MMSSCPacketType get_tcp_server_response(MMSContext *mms)
+static MMSSCPacketType get_tcp_server_response(MMSTContext *mmst)
 {
     int read_result;
     MMSSCPacketType packet_type= -1;
-
+    MMSContext *mms = &mmst->mms;
     for(;;) {
-        if((read_result= url_read_complete(mms->mms_hd, mms->in_buffer, 8))==8) {
-            // handle command packet.
-            if(AV_RL32(mms->in_buffer + 4)==0xb00bface) {
-                mms->incoming_flags= mms->in_buffer[3];
-                read_result= url_read_complete(mms->mms_hd, mms->in_buffer+8, 4);
-                if(read_result == 4) {
-                    int length_remaining= AV_RL32(mms->in_buffer+8) + 4;
-
-                    dprintf(NULL, "Length remaining is %d\n", length_remaining);
-                    // read the rest of the packet.
-                    if (length_remaining < 0
-                        || length_remaining > sizeof(mms->in_buffer) - 12) {
-                        dprintf(NULL, "Incoming message len %d exceeds buffer len %d\n",
-                            length_remaining, sizeof(mms->in_buffer) - 12);
-                        return -1;
-                    }
-                    read_result = url_read_complete(mms->mms_hd, mms->in_buffer + 12,
-                                                  length_remaining) ;
-                    if (read_result == length_remaining) {
-                        packet_type= AV_RL16(mms->in_buffer+36);
-                    } else {
-                        dprintf(NULL, "read for packet type failed%d!\n", read_result);
-                        return -1;
-                    }
-                } else {
-                    dprintf(NULL, "read for length remaining failed%d!\n", read_result);
-                    return -1;
-                }
+        read_result = ffurl_read_complete(mms->mms_hd, mms->in_buffer, 8);
+        if (read_result != 8) {
+            if(read_result < 0) {
+                av_log(NULL, AV_LOG_ERROR,
+                       "Error reading packet header: %d (%s)\n",
+                       read_result, strerror(AVUNERROR(read_result)));
+                packet_type = SC_PKT_CANCEL;
             } else {
-                int length_remaining;
-                int packet_id_type;
-                int tmp;
-
-                assert(mms->remaining_in_len==0);
-
-                // note we cache the first 8 bytes,
-                // 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);
-                packet_id_type            = mms->in_buffer[4];
-                mms->incoming_flags       = mms->in_buffer[5];
-
-                if (length_remaining < 0
-                        || length_remaining > sizeof(mms->in_buffer) - 8) {
-                    dprintf(NULL, "Incoming data len %d exceeds buffer len %d\n",
-                            length_remaining, sizeof(mms->in_buffer));
-                    return -1;
-                }
-                mms->remaining_in_len    = length_remaining;
-                mms->read_in_ptr         = mms->in_buffer;
-                read_result= url_read_complete(mms->mms_hd, mms->in_buffer, length_remaining);
-                if(read_result != length_remaining) {
-                    dprintf(NULL, "read_bytes result: %d asking for %d\n",
-                            read_result, length_remaining);
-                    return -1;
-                } else {
-                    // if we successfully read everything.
-                    if(packet_id_type == mms->header_packet_id) {
-                        packet_type = SC_PKT_ASF_HEADER;
-                        // Store the asf header
-                        if(!mms->header_parsed) {
-                            void *p = av_realloc(mms->asf_header,
-                                              mms->asf_header_size
-                                              + mms->remaining_in_len);
-                            if (!p) {
-                                av_freep(&mms->asf_header);
-                                return AVERROR(ENOMEM);
-                            }
-                            mms->asf_header = p;
-                            memcpy(mms->asf_header + mms->asf_header_size,
-                                                 mms->read_in_ptr,
-                                                 mms->remaining_in_len);
-                            mms->asf_header_size += mms->remaining_in_len;
-                        }
-                    } else if(packet_id_type == mms->packet_id) {
-                        packet_type = SC_PKT_ASF_MEDIA;
-                    } else {
-                        dprintf(NULL, "packet id type %d is old.", packet_id_type);
-                        continue;
-                    }
-                }
+                av_log(NULL, AV_LOG_ERROR,
+                       "The server closed the connection\n");
+                packet_type = SC_PKT_NO_DATA;
+            }
+            return packet_type;
+        }
+
+        // handle command packet.
+        if(AV_RL32(mms->in_buffer + 4)==0xb00bface) {
+            int length_remaining, hr;
+
+            mmst->incoming_flags= mms->in_buffer[3];
+            read_result= ffurl_read_complete(mms->mms_hd, mms->in_buffer+8, 4);
+            if(read_result != 4) {
+                av_log(NULL, AV_LOG_ERROR,
+                       "Reading command packet length failed: %d (%s)\n",
+                       read_result,
+                       read_result < 0 ? strerror(AVUNERROR(read_result)) :
+                           "The server closed the connection");
+                return read_result < 0 ? read_result : AVERROR(EIO);
             }
 
-            // preprocess some packet type
-            if(packet_type == SC_PKT_KEEPALIVE) {
-                send_keepalive_packet(mms);
-                continue;
-            } else if(packet_type == SC_PKT_STREAM_CHANGING) {
-                handle_packet_stream_changing_type(mms);
-            } else if(packet_type == SC_PKT_ASF_MEDIA) {
-                pad_media_packet(mms);
+            length_remaining= AV_RL32(mms->in_buffer+8) + 4;
+            av_log(NULL, AV_LOG_TRACE, "Length remaining is %d\n", length_remaining);
+            // read the rest of the packet.
+            if (length_remaining < 0
+                || length_remaining > sizeof(mms->in_buffer) - 12) {
+                av_log(NULL, AV_LOG_ERROR,
+                       "Incoming packet length %d exceeds bufsize %zu\n",
+                       length_remaining, sizeof(mms->in_buffer) - 12);
+                return AVERROR_INVALIDDATA;
+            }
+            read_result = ffurl_read_complete(mms->mms_hd, mms->in_buffer + 12,
+                                            length_remaining) ;
+            if (read_result != length_remaining) {
+                av_log(NULL, AV_LOG_ERROR,
+                       "Reading pkt data (length=%d) failed: %d (%s)\n",
+                       length_remaining, read_result,
+                       read_result < 0 ? strerror(AVUNERROR(read_result)) :
+                           "The server closed the connection");
+                return read_result < 0 ? read_result : AVERROR(EIO);
+            }
+            packet_type= AV_RL16(mms->in_buffer+36);
+            if (read_result >= 44 && (hr = AV_RL32(mms->in_buffer + 40))) {
+                av_log(NULL, AV_LOG_ERROR,
+                       "Server sent a message with packet type 0x%x and error status code 0x%08x\n", packet_type, hr);
+                return AVERROR(EINVAL);
             }
-            return packet_type;
         } else {
-            if(read_result<0) {
-                dprintf(NULL, "Read error (or cancelled) returned %d!\n", read_result);
-                packet_type = SC_PKT_CANCEL;
+            int length_remaining;
+            int packet_id_type;
+            int tmp;
+
+            // note we cache the first 8 bytes,
+            // then fill up the buffer with the others
+            tmp                       = AV_RL16(mms->in_buffer + 6);
+            length_remaining          = (tmp - 8) & 0xffff;
+            mmst->incoming_packet_seq = AV_RL32(mms->in_buffer);
+            packet_id_type            = mms->in_buffer[4];
+            mmst->incoming_flags      = mms->in_buffer[5];
+
+            if (length_remaining < 0
+                || length_remaining > sizeof(mms->in_buffer) - 8) {
+                av_log(NULL, AV_LOG_ERROR,
+                       "Data length %d is invalid or too large (max=%zu)\n",
+                       length_remaining, sizeof(mms->in_buffer));
+                return AVERROR_INVALIDDATA;
+            }
+            mms->remaining_in_len    = length_remaining;
+            mms->read_in_ptr         = mms->in_buffer;
+            read_result= ffurl_read_complete(mms->mms_hd, mms->in_buffer, length_remaining);
+            if(read_result != length_remaining) {
+                av_log(NULL, AV_LOG_ERROR,
+                       "Failed to read packet data of size %d: %d (%s)\n",
+                       length_remaining, read_result,
+                       read_result < 0 ? strerror(AVUNERROR(read_result)) :
+                           "The server closed the connection");
+                return read_result < 0 ? read_result : AVERROR(EIO);
+            }
+
+            // if we successfully read everything.
+            if(packet_id_type == mmst->header_packet_id) {
+                int err;
+                packet_type = SC_PKT_ASF_HEADER;
+                // Store the asf header
+                if(!mms->header_parsed) {
+                    if ((err = av_reallocp(&mms->asf_header,
+                                           mms->asf_header_size +
+                                           mms->remaining_in_len)) < 0) {
+                        mms->asf_header_size = 0;
+                        return err;
+                    }
+                    memcpy(mms->asf_header + mms->asf_header_size,
+                           mms->read_in_ptr, mms->remaining_in_len);
+                    mms->asf_header_size += mms->remaining_in_len;
+                }
+                // 0x04 means asf header is sent in multiple packets.
+                if (mmst->incoming_flags == 0x04)
+                    continue;
+            } else if(packet_id_type == mmst->packet_id) {
+                packet_type = SC_PKT_ASF_MEDIA;
             } else {
-                dprintf(NULL, "Read result of zero?!\n");
-                packet_type = SC_PKT_NO_DATA;
+                av_log(NULL, AV_LOG_TRACE, "packet id type %d is old.", packet_id_type);
+                continue;
             }
-            return packet_type;
         }
+
+        // preprocess some packet type
+        if(packet_type == SC_PKT_KEEPALIVE) {
+            send_keepalive_packet(mmst);
+            continue;
+        } else if(packet_type == SC_PKT_STREAM_CHANGING) {
+            handle_packet_stream_changing_type(mmst);
+        } else if(packet_type == SC_PKT_ASF_MEDIA) {
+            pad_media_packet(mms);
+        }
+        return packet_type;
     }
 }
 
-static int mms_safe_send_recv(MMSContext *mms,
-                              int (*send_fun)(MMSContext *mms),
+static int mms_safe_send_recv(MMSTContext *mmst,
+                              int (*send_fun)(MMSTContext *mmst),
                               const MMSSCPacketType expect_type)
 {
     MMSSCPacketType type;
     if(send_fun) {
-        int ret = send_fun(mms);
+        int ret = send_fun(mmst);
         if (ret < 0) {
-            dprintf(NULL, "Send Packet error before expecting recv packet %d\n", expect_type);
+            av_log(NULL, AV_LOG_TRACE, "Send Packet error before expecting recv packet %d\n", expect_type);
             return ret;
         }
     }
 
-    if ((type = get_tcp_server_response(mms)) != expect_type) {
-        dprintf(NULL,"Unexpected packet type %d with type %d\n", type, expect_type);
-        return -1;
+    if ((type = get_tcp_server_response(mmst)) != expect_type) {
+        av_log(NULL, AV_LOG_ERROR,
+               "Corrupt stream (unexpected packet type 0x%x, expected 0x%x)\n",
+               type, expect_type);
+        return AVERROR_INVALIDDATA;
     } else {
         return 0;
     }
 }
 
-static int send_media_header_request(MMSContext *mms)
+static int send_media_header_request(MMSTContext *mmst)
 {
-    start_command_packet(mms, CS_PKT_MEDIA_HEADER_REQUEST);
+    MMSContext *mms = &mmst->mms;
+    start_command_packet(mmst, CS_PKT_MEDIA_HEADER_REQUEST);
     insert_command_prefixes(mms, 1, 0);
     bytestream_put_le32(&mms->write_out_ptr, 0);
     bytestream_put_le32(&mms->write_out_ptr, 0x00800000);
@@ -398,234 +410,149 @@ static int send_media_header_request(MMSContext *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);
 }
 
 /** Send the initial handshake. */
-static int send_startup_packet(MMSContext *mms)
+static int send_startup_packet(MMSTContext *mmst)
 {
     char data_string[256];
+    MMSContext *mms = &mmst->mms;
     // SubscriberName is defined in MS specification linked below.
     // The guid value can be any valid value.
     // http://download.microsoft.com/
     // 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->host);
 
-    start_command_packet(mms, CS_PKT_INITIAL);
+    start_command_packet(mmst, 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);
-}
-
-static int asf_header_parser(MMSContext *mms)
-{
-    uint8_t *p = mms->asf_header;
-    uint8_t *end;
-    int flags, stream_id, real_header_size;
-    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;
-
-    real_header_size = AV_RL64(p + sizeof(ff_asf_guid));
-    end = mms->asf_header + real_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:%d!\n", chunksize);
-            return -1;
-        }
-        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;
-                }
-            }
-        } 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;
-            //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;
-            }
-        }
-        p += chunksize;
-    }
-
-    return 0;
+    return send_command_packet(mmst);
 }
 
 /** 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)
 {
     int i;
-
+    MMSContext *mms = &mmst->mms;
     //  send the streams we want back...
-    start_command_packet(mms, CS_PKT_STREAM_ID_REQUEST);
+    start_command_packet(mmst, 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
     }
-
-    bytestream_put_le16(&mms->write_out_ptr, 0);
-
-    return send_command_packet(mms);
-}
-
-static int read_data(MMSContext *mms, uint8_t *buf, const int buf_size)
-{
-    int read_size;
-    read_size = FFMIN(buf_size, mms->remaining_in_len);
-    memcpy(buf, mms->read_in_ptr, read_size);
-    mms->remaining_in_len -= read_size;
-    mms->read_in_ptr      += read_size;
-    return read_size;
+    return send_command_packet(mmst);
 }
 
-/** 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 send_close_packet(MMSTContext *mmst)
 {
-    int result = 0, read_header_size = 0;
-    int size_to_copy;
+    start_command_packet(mmst, CS_PKT_STREAM_CLOSE);
+    insert_command_prefixes(&mmst->mms, 1, 1);
 
-    do {
-        if(read_header_size < mms->asf_header_size && !mms->is_playing) {
-            /* Read from ASF header buffer */
-            size_to_copy= FFMIN(buf_size,
-                                mms->asf_header_size - read_header_size);
-            memcpy(buf, mms->asf_header + read_header_size, size_to_copy);
-            read_header_size += size_to_copy;
-            result += size_to_copy;
-            dprintf(NULL, "Copied %d bytes from stored header. left: %d\n",
-                   size_to_copy, mms->asf_header_size - read_header_size);
-            if (mms->asf_header_size == read_header_size) {
-                av_freep(&mms->asf_header);
-                mms->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);
-        } else {
-            /* Read from network */
-            int err = mms_safe_send_recv(mms, NULL, SC_PKT_ASF_MEDIA);
-            if (err == 0) {
-                if(mms->remaining_in_len>mms->asf_packet_len) {
-                    dprintf(NULL, "Incoming packet"
-                            "larger than the asf packet size stated (%d>%d)\n",
-                            mms->remaining_in_len, mms->asf_packet_len);
-                    result= AVERROR_IO;
-                } else {
-                    // copy the data to the packet buffer.
-                    result = read_data(mms, buf, buf_size);
-                    if (result == 0) {
-                        dprintf(NULL, "read asf media paket size is zero!\n");
-                        break;
-                    }
-                }
-            } else {
-                dprintf(NULL, "read packet error!\n");
-                break;
-            }
-        }
-    } while(!result); // only return one packet.
-    return result;
-}
-
-static int send_close_packet(MMSContext *mms)
-{
-    start_command_packet(mms, CS_PKT_STREAM_CLOSE);
-    insert_command_prefixes(mms, 1, 1);
-
-    return send_command_packet(mms);
+    return send_command_packet(mmst);
 }
 
 /** Close the MMSH/MMST connection */
 static int mms_close(URLContext *h)
 {
-    MMSContext *mms = (MMSContext *)h->priv_data;
-
+    MMSTContext *mmst = (MMSTContext *)h->priv_data;
+    MMSContext *mms   = &mmst->mms;
     if(mms->mms_hd) {
-        send_close_packet(mms);
-        url_close(mms->mms_hd);
+        send_close_packet(mmst);
+        ffurl_close(mms->mms_hd);
     }
 
     /* free all separately allocated pointers in mms */
+    av_free(mms->streams);
     av_free(mms->asf_header);
-    av_freep(&h->priv_data);
 
     return 0;
 }
 
+static int send_media_packet_request(MMSTContext *mmst)
+{
+    MMSContext *mms = &mmst->mms;
+    start_command_packet(mmst, CS_PKT_START_FROM_PKT_ID);
+    insert_command_prefixes(mms, 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
+    bytestream_put_byte(&mms->write_out_ptr, 0xff);       // max stream time limit
+    bytestream_put_byte(&mms->write_out_ptr, 0xff);       // max stream time limit
+    bytestream_put_byte(&mms->write_out_ptr, 0xff);       // max stream time limit
+    bytestream_put_byte(&mms->write_out_ptr, 0x00);       // stream time limit flag
+
+    mmst->packet_id++;                                     // new packet_id
+    bytestream_put_le32(&mms->write_out_ptr, mmst->packet_id);
+    return send_command_packet(mmst);
+}
+
+
+static void clear_stream_buffers(MMSContext *mms)
+{
+    mms->remaining_in_len = 0;
+    mms->read_in_ptr      = mms->in_buffer;
+}
+
 static int mms_open(URLContext *h, const char *uri, int flags)
 {
+    MMSTContext *mmst = h->priv_data;
     MMSContext *mms;
     int port, err;
     char tcpname[256];
 
     h->is_streamed = 1;
-    mms = h->priv_data = av_mallocz(sizeof(MMSContext));
-    if (!h->priv_data)
-        return AVERROR(ENOMEM);
+    mms = &mmst->mms;
 
     // 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->host, sizeof(mmst->host), &port, mmst->path,
+            sizeof(mmst->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);
-    err = url_open(&mms->mms_hd, tcpname, URL_RDWR);
+    ff_url_join(tcpname, sizeof(tcpname), "tcp", NULL, mmst->host, port, NULL);
+    err = ffurl_open(&mms->mms_hd, tcpname, AVIO_FLAG_READ_WRITE,
+                     &h->interrupt_callback, NULL, h->protocols, h);
     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->packet_id        = 3;          // default, initial value.
+    mmst->header_packet_id = 2;          // default, initial value.
+    err = mms_safe_send_recv(mmst, 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, 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, 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, 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, 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, NULL, SC_PKT_ASF_HEADER);
     if (err)
         goto fail;
-    if((mms->incoming_flags != 0X08) && (mms->incoming_flags != 0X0C))
+    if((mmst->incoming_flags != 0X08) && (mmst->incoming_flags != 0X0C)) {
+        av_log(NULL, AV_LOG_ERROR,
+               "The server does not support MMST (try MMSH or RTSP)\n");
+        err = AVERROR(EINVAL);
         goto fail;
-    err = asf_header_parser(mms);
+    }
+    err = ff_mms_asf_header_parser(mms);
     if (err) {
-        dprintf(NULL, "asf header parsed failed!\n");
+        av_log(NULL, AV_LOG_TRACE, "asf header parsed failed!\n");
         goto fail;
     }
     mms->header_parsed = 1;
@@ -633,68 +560,70 @@ static int mms_open(URLContext *h, const char *uri, int flags)
     if (!mms->asf_packet_len || !mms->stream_num)
         goto fail;
 
-    dprintf(NULL, "Leaving open (success)\n");
+    clear_stream_buffers(mms);
+    err = mms_safe_send_recv(mmst, send_stream_selection_request, SC_PKT_STREAM_ID_ACCEPTED);
+    if (err)
+        goto fail;
+    // send media packet request
+    err = mms_safe_send_recv(mmst, send_media_packet_request, SC_PKT_MEDIA_PKT_FOLLOWS);
+    if (err) {
+        goto fail;
+    }
+    av_log(NULL, AV_LOG_TRACE, "Leaving open (success)\n");
     return 0;
 fail:
     mms_close(h);
-    dprintf(NULL, "Leaving open (failure: %d)\n", err);
+    av_log(NULL, AV_LOG_TRACE, "Leaving open (failure: %d)\n", err);
     return err;
 }
 
-static int send_media_packet_request(MMSContext *mms)
-{
-    start_command_packet(mms, CS_PKT_START_FROM_PKT_ID);
-    insert_command_prefixes(mms, 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
-    bytestream_put_byte(&mms->write_out_ptr, 0xff);       // max stream time limit
-    bytestream_put_byte(&mms->write_out_ptr, 0xff);       // max stream time limit
-    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);
-}
-
-
-static void clear_stream_buffers(MMSContext *mms)
-{
-    mms->remaining_in_len = 0;
-    mms->read_in_ptr      = mms->in_buffer;
-}
-
 /** Read ASF data through the protocol. */
 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 = h->priv_data;
+    MMSContext *mms   = &mmst->mms;
     int result = 0;
 
-    /* Since we read the header at open(), this shouldn't be possible */
-    assert(mms->header_parsed);
-
-    if (!mms->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);
-        if (result)
-            return result;
-        // send media packet request
-        result = mms_safe_send_recv(mms, send_media_packet_request, SC_PKT_MEDIA_PKT_FOLLOWS);
-        if (result) {
-            return result;
+    do {
+        if(mms->asf_header_read_size < mms->asf_header_size) {
+            /* Read from ASF header buffer */
+            result = ff_mms_read_header(mms, buf, size);
+        } 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 = ff_mms_read_data(mms, buf, size);
+        } else {
+            /* Read from network */
+            int err = mms_safe_send_recv(mmst, NULL, SC_PKT_ASF_MEDIA);
+            if (err == 0) {
+                if(mms->remaining_in_len>mms->asf_packet_len) {
+                    av_log(NULL, AV_LOG_ERROR,
+                           "Incoming pktlen %d is larger than ASF pktsize %d\n",
+                           mms->remaining_in_len, mms->asf_packet_len);
+                    result= AVERROR(EIO);
+                } else {
+                    // copy the data to the packet buffer.
+                    result = ff_mms_read_data(mms, buf, size);
+                    if (result == 0) {
+                        av_log(NULL, AV_LOG_TRACE, "Read ASF media packet size is zero!\n");
+                        break;
+                    }
+                }
+            } else {
+                av_log(NULL, AV_LOG_TRACE, "read packet error!\n");
+                break;
+            }
         }
-    }
-    return read_mms_packet(mms, buf, size);
+    } while(!result); // only return one packet.
+    return result;
 }
 
-URLProtocol mmst_protocol = {
-    "mmst",
-    mms_open,
-    mms_read,
-    NULL, // write
-    NULL, // seek
-    mms_close,
+const URLProtocol ff_mmst_protocol = {
+    .name           = "mmst",
+    .url_open       = mms_open,
+    .url_read       = mms_read,
+    .url_close      = mms_close,
+    .priv_data_size = sizeof(MMSTContext),
+    .flags          = URL_PROTOCOL_FLAG_NETWORK,
 };