summaryrefslogtreecommitdiffstats
path: root/libmpdemux/asf_streaming.c
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux/asf_streaming.c')
-rw-r--r--libmpdemux/asf_streaming.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/libmpdemux/asf_streaming.c b/libmpdemux/asf_streaming.c
index c7e1ec06af..e360d9f805 100644
--- a/libmpdemux/asf_streaming.c
+++ b/libmpdemux/asf_streaming.c
@@ -552,9 +552,14 @@ asf_http_parse_response( HTTP_header_t *http_hdr ) {
mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to parse HTTP response\n");
return -1;
}
- if( http_hdr->status_code!=200 ) {
- mp_msg(MSGT_NETWORK,MSGL_ERR,"Server return %d:%s\n", http_hdr->status_code, http_hdr->reason_phrase);
- return -1;
+ switch( http_hdr->status_code ) {
+ case 200:
+ break;
+ case 401: // Authentication required
+ return ASF_Authenticate_e;
+ default:
+ mp_msg(MSGT_NETWORK,MSGL_ERR,"Server return %d:%s\n", http_hdr->status_code, http_hdr->reason_phrase);
+ return -1;
}
content_type = http_get_field( http_hdr, "Content-Type");
@@ -609,6 +614,7 @@ asf_http_streaming_start( stream_t *stream ) {
int i, ret;
int fd = stream->fd;
int done;
+ int auth_retry = 0;
asf_http_ctrl = (asf_http_streaming_ctrl_t*)malloc(sizeof(asf_http_streaming_ctrl_t));
if( asf_http_ctrl==NULL ) {
@@ -702,6 +708,11 @@ asf_http_streaming_start( stream_t *stream ) {
stream->type = STREAMTYPE_PLAYLIST;
done = 1;
break;
+ case ASF_Authenticate_e:
+ if( http_authenticate( http_hdr, url, &auth_retry)<0 ) return -1;
+ asf_http_ctrl->streaming_type = ASF_Unknown_e;
+ done = 0;
+ break;
case ASF_Unknown_e:
default:
mp_msg(MSGT_NETWORK,MSGL_ERR,"Unknown ASF streaming type\n");