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) {
av_log(NULL, AV_LOG_ERROR,
"Failed to write data of length %d: %d (%s)\n",
exact_length, write_result,
- write_result < 0 ? strerror(write_result) :
+ write_result < 0 ? strerror(AVUNERROR(write_result)) :
"The server closed the connection");
- return AVERROR_IO;
+ return AVERROR(EIO);
}
return 0;
MMSSCPacketType packet_type= -1;
MMSContext *mms = &mmst->mms;
for(;;) {
- read_result = url_read_complete(mms->mms_hd, mms->in_buffer, 8);
+ 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(read_result));
+ read_result, strerror(AVUNERROR(read_result)));
packet_type = SC_PKT_CANCEL;
} else {
av_log(NULL, AV_LOG_ERROR,
int length_remaining, hr;
mmst->incoming_flags= mms->in_buffer[3];
- read_result= url_read_complete(mms->mms_hd, mms->in_buffer+8, 4);
+ 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(read_result) :
+ read_result < 0 ? strerror(AVUNERROR(read_result)) :
"The server closed the connection");
- return read_result < 0 ? read_result : AVERROR_IO;
+ return read_result < 0 ? read_result : AVERROR(EIO);
}
length_remaining= AV_RL32(mms->in_buffer+8) + 4;
length_remaining, sizeof(mms->in_buffer) - 12);
return AVERROR_INVALIDDATA;
}
- read_result = url_read_complete(mms->mms_hd, mms->in_buffer + 12,
+ 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(read_result) :
+ read_result < 0 ? strerror(AVUNERROR(read_result)) :
"The server closed the connection");
- return read_result < 0 ? read_result : AVERROR_IO;
+ 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_UNKNOWN;
+ return AVERROR(EINVAL);
}
} else {
int length_remaining;
}
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);
+ 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(read_result) :
+ read_result < 0 ? strerror(AVUNERROR(read_result)) :
"The server closed the connection");
- return read_result < 0 ? read_result : AVERROR_IO;
+ return read_result < 0 ? read_result : AVERROR(EIO);
}
// if we successfully read everything.
MMSContext *mms = &mmst->mms;
if(mms->mms_hd) {
send_close_packet(mmst);
- url_close(mms->mms_hd);
+ 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 mms_open(URLContext *h, const char *uri, int flags)
{
- MMSTContext *mmst;
+ MMSTContext *mmst = h->priv_data;
MMSContext *mms;
int port, err;
char tcpname[256];
h->is_streamed = 1;
- mmst = h->priv_data = av_mallocz(sizeof(MMSTContext));
- if (!h->priv_data)
- return AVERROR(ENOMEM);
mms = &mmst->mms;
// only for MMS over TCP, so set proto = NULL
// establish tcp connection.
ff_url_join(tcpname, sizeof(tcpname), "tcp", NULL, mmst->host, port, NULL);
- err = ffurl_open(&mms->mms_hd, tcpname, URL_RDWR);
+ err = ffurl_open(&mms->mms_hd, tcpname, AVIO_FLAG_READ_WRITE,
+ &h->interrupt_callback, NULL);
if (err)
goto fail;
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_NOFMT;
+ err = AVERROR(EINVAL);
goto fail;
}
err = ff_mms_asf_header_parser(mms);
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_IO;
+ result= AVERROR(EIO);
} else {
// copy the data to the packet buffer.
result = ff_mms_read_data(mms, buf, size);
if (result == 0) {
- av_dlog(NULL, "read asf media paket size is zero!\n");
+ av_dlog(NULL, "Read ASF media packet size is zero!\n");
break;
}
}
}
URLProtocol ff_mmst_protocol = {
- "mmst",
- mms_open,
- mms_read,
- NULL, // write
- NULL, // seek
- mms_close,
+ .name = "mmst",
+ .url_open = mms_open,
+ .url_read = mms_read,
+ .url_close = mms_close,
+ .priv_data_size = sizeof(MMSTContext),
+ .flags = URL_PROTOCOL_FLAG_NETWORK,
};