Commit e3e9c137 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Pass content-type from access to stream

parent d8fc0a94
...@@ -60,8 +60,10 @@ enum stream_query_e ...@@ -60,8 +60,10 @@ enum stream_query_e
/* Special for direct access control from demuxer. /* Special for direct access control from demuxer.
* XXX: avoid using it by all means */ * XXX: avoid using it by all means */
STREAM_CONTROL_ACCESS /* arg1= int i_access_query, args res: can fail STREAM_CONTROL_ACCESS, /* arg1= int i_access_query, args res: can fail
if access unreachable or access control answer */ if access unreachable or access control answer */
STREAM_GET_CONTENT_TYPE, /**< arg1= char ** res=can file */
}; };
VLC_EXPORT( int, stream_Read, ( stream_t *s, void *p_read, int i_read ) ); VLC_EXPORT( int, stream_Read, ( stream_t *s, void *p_read, int i_read ) );
...@@ -91,17 +93,31 @@ static inline int64_t stream_Size( stream_t *s ) ...@@ -91,17 +93,31 @@ static inline int64_t stream_Size( stream_t *s )
stream_Control( s, STREAM_GET_SIZE, &i_pos ); stream_Control( s, STREAM_GET_SIZE, &i_pos );
return i_pos; return i_pos;
} }
static inline int stream_MTU( stream_t *s ) static inline int stream_MTU( stream_t *s )
{ {
int i_mtu; int i_mtu;
stream_Control( s, STREAM_GET_MTU, &i_mtu ); stream_Control( s, STREAM_GET_MTU, &i_mtu );
return i_mtu; return i_mtu;
} }
static inline int stream_Seek( stream_t *s, int64_t i_pos ) static inline int stream_Seek( stream_t *s, int64_t i_pos )
{ {
return stream_Control( s, STREAM_SET_POSITION, i_pos ); return stream_Control( s, STREAM_SET_POSITION, i_pos );
} }
/**
* Get the Content-Type of a stream, or NULL if unknown.
* Result must be free()'d.
*/
static inline char *stream_ContentType( stream_t *s )
{
char *res;
if( stream_Control( s, STREAM_GET_CONTENT_TYPE, &res ) )
return NULL;
return res;
}
/** /**
* Create a special stream and a demuxer, this allows chaining demuxers * Create a special stream and a demuxer, this allows chaining demuxers
*/ */
......
...@@ -508,6 +508,7 @@ static int DStreamControl( stream_t *s, int i_query, va_list args ) ...@@ -508,6 +508,7 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
return VLC_SUCCESS; return VLC_SUCCESS;
case STREAM_CONTROL_ACCESS: case STREAM_CONTROL_ACCESS:
case STREAM_GET_CONTENT_TYPE:
return VLC_EGENERIC; return VLC_EGENERIC;
default: default:
......
...@@ -123,6 +123,7 @@ static int Control( stream_t *s, int i_query, va_list args ) ...@@ -123,6 +123,7 @@ static int Control( stream_t *s, int i_query, va_list args )
break; break;
case STREAM_GET_MTU: case STREAM_GET_MTU:
case STREAM_GET_CONTENT_TYPE:
return VLC_EGENERIC; return VLC_EGENERIC;
case STREAM_CONTROL_ACCESS: case STREAM_CONTROL_ACCESS:
......
...@@ -556,6 +556,10 @@ static int AStreamControl( stream_t *s, int i_query, va_list args ) ...@@ -556,6 +556,10 @@ static int AStreamControl( stream_t *s, int i_query, va_list args )
} }
return access2_vaControl( p_access, i_int, args ); return access2_vaControl( p_access, i_int, args );
case STREAM_GET_CONTENT_TYPE:
return access2_Control( p_access, ACCESS_GET_CONTENT_TYPE,
va_arg( args, char ** ) );
default: default:
msg_Err( s, "invalid stream_vaControl query=0x%x", i_query ); msg_Err( s, "invalid stream_vaControl query=0x%x", i_query );
return VLC_EGENERIC; return VLC_EGENERIC;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment