RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-17 20:58:20 +00:00
Code Issues Releases Wiki Activity

fixed MP3 ICY detection, return detected file format for open_stream

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4730 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2002-02-16 21:48:59 +00:00
parent 5979a71903
commit d6d9502386
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libmpdemux/network.c
View File

@ -34,7 +34,7 @@ static struct {
int demuxer_type; int demuxer_type;
} mime_type_table[] = { } mime_type_table[] = {
// MP3 streaming, some MP3 streaming server answer with audio/mpeg // MP3 streaming, some MP3 streaming server answer with audio/mpeg
{ "audio/mpeg", DEMUXER_TYPE_MPEG_PS }, { "audio/mpeg", DEMUXER_TYPE_AUDIO },
// MPEG streaming // MPEG streaming
{ "video/mpeg", DEMUXER_TYPE_MPEG_PS }, { "video/mpeg", DEMUXER_TYPE_MPEG_PS },
// AVI ??? => video/x-msvideo // AVI ??? => video/x-msvideo
@ -68,6 +68,8 @@ static struct {
{ "viv", DEMUXER_TYPE_VIVO }, { "viv", DEMUXER_TYPE_VIVO },
{ "rm", DEMUXER_TYPE_REAL }, { "rm", DEMUXER_TYPE_REAL },
{ "y4m", DEMUXER_TYPE_Y4M }, { "y4m", DEMUXER_TYPE_Y4M },
{ "mp3", DEMUXER_TYPE_AUDIO },
{ "wav", DEMUXER_TYPE_AUDIO },
}; };
streaming_ctrl_t * streaming_ctrl_t *
@ -400,7 +402,7 @@ extension=NULL;
// Check if the response is an ICY status_code reason_phrase // Check if the response is an ICY status_code reason_phrase
if( !strcasecmp(http_hdr->protocol, "ICY") ) { if( !strcasecmp(http_hdr->protocol, "ICY") ) {
// Ok, we have detected an mp3 streaming // Ok, we have detected an mp3 streaming
*file_format = DEMUXER_TYPE_MPEG_PS; *file_format = DEMUXER_TYPE_AUDIO;
return 0; return 0;
} }
@ -658,7 +660,7 @@ rtp_streaming_start( stream_t *stream ) {
} }
int int
streaming_start(stream_t *stream, int demuxer_type, URL_t *url) { streaming_start(stream_t *stream, int *demuxer_type, URL_t *url) {
int ret; int ret;
if( stream==NULL ) return -1; if( stream==NULL ) return -1;
@ -667,7 +669,7 @@ streaming_start(stream_t *stream, int demuxer_type, URL_t *url) {
return -1; return -1;
} }
stream->streaming_ctrl->url = check4proxies( url ); stream->streaming_ctrl->url = check4proxies( url );
ret = autodetectProtocol( stream->streaming_ctrl, &stream->fd, &demuxer_type ); ret = autodetectProtocol( stream->streaming_ctrl, &stream->fd, demuxer_type );
if( ret<0 ) { if( ret<0 ) {
return -1; return -1;
} }
@ -683,7 +685,7 @@ streaming_start(stream_t *stream, int demuxer_type, URL_t *url) {
ret = rtp_streaming_start( stream ); ret = rtp_streaming_start( stream );
} else } else
// For connection-oriented streams, we can usually determine the streaming type. // For connection-oriented streams, we can usually determine the streaming type.
switch( demuxer_type ) { switch( *demuxer_type ) {
case DEMUXER_TYPE_ASF: case DEMUXER_TYPE_ASF:
// Send the appropriate HTTP request // Send the appropriate HTTP request
// Need to filter the network stream. // Need to filter the network stream.
@ -693,10 +695,17 @@ streaming_start(stream_t *stream, int demuxer_type, URL_t *url) {
printf("asf_streaming_start failed\n"); printf("asf_streaming_start failed\n");
} }
break; break;
case DEMUXER_TYPE_AVI:
case DEMUXER_TYPE_MOV:
case DEMUXER_TYPE_MPEG_ES: case DEMUXER_TYPE_MPEG_ES:
case DEMUXER_TYPE_MPEG_PS: case DEMUXER_TYPE_MPEG_PS:
case DEMUXER_TYPE_AVI:
case DEMUXER_TYPE_MOV:
case DEMUXER_TYPE_VIVO:
case DEMUXER_TYPE_FLI:
case DEMUXER_TYPE_REAL:
case DEMUXER_TYPE_Y4M:
case DEMUXER_TYPE_FILM:
case DEMUXER_TYPE_ROQ:
case DEMUXER_TYPE_AUDIO:
case DEMUXER_TYPE_UNKNOWN: case DEMUXER_TYPE_UNKNOWN:
// Generic start, doesn't need to filter // Generic start, doesn't need to filter
// the network stream, it's a raw stream // the network stream, it's a raw stream

2
libmpdemux/network.h
View File

@ -38,7 +38,7 @@ typedef struct streaming_control {
void *data; void *data;
} streaming_ctrl_t; } streaming_ctrl_t;
//int streaming_start( stream_t *stream, int demuxer_type, URL_t *url ); //int streaming_start( stream_t *stream, int *demuxer_type, URL_t *url );
int streaming_bufferize( streaming_ctrl_t *streaming_ctrl, char *buffer, int size); int streaming_bufferize( streaming_ctrl_t *streaming_ctrl, char *buffer, int size);

2
libmpdemux/open.c
View File

@ -410,7 +410,7 @@ tv_err:
url = url_new(filename); url = url_new(filename);
if(url) { if(url) {
stream=new_stream(f,STREAMTYPE_STREAM); stream=new_stream(f,STREAMTYPE_STREAM);
if( streaming_start( stream, *file_format, url )<0){ if( streaming_start( stream, file_format, url )<0){
mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_UnableOpenURL, filename); mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_UnableOpenURL, filename);
url_free(url); url_free(url);
return NULL; return NULL;