Commit e72a7987 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Put VFU request method in the video encoder interface.

parent 3d7e66f7
...@@ -146,5 +146,8 @@ typedef enum _MSPlayerState MSPlayerState; ...@@ -146,5 +146,8 @@ typedef enum _MSPlayerState MSPlayerState;
/** Interface definitions for video encoders */ /** Interface definitions for video encoders */
#define MS_VIDEO_ENCODER_HAS_BUILTIN_CONVERTER \ #define MS_VIDEO_ENCODER_HAS_BUILTIN_CONVERTER \
MS_FILTER_METHOD(MSFilterVideoEncoderInterface, 0, bool_t) MS_FILTER_METHOD(MSFilterVideoEncoderInterface, 0, bool_t)
/* request a video-fast-update (=I frame for H263,MP4V-ES) to a video encoder*/
#define MS_VIDEO_ENCODER_REQ_VFU \
MS_FILTER_METHOD_NO_ARG(MSFilterVideoEncoderInterface, 1)
#endif #endif
...@@ -339,6 +339,7 @@ MS2_PUBLIC bool_t ms_video_update_average_fps(MSAverageFPS* afps, uint32_t curre ...@@ -339,6 +339,7 @@ MS2_PUBLIC bool_t ms_video_update_average_fps(MSAverageFPS* afps, uint32_t curre
#define MS_FILTER_GET_FPS MS_FILTER_BASE_METHOD(105,float) #define MS_FILTER_GET_FPS MS_FILTER_BASE_METHOD(105,float)
/* request a video-fast-update (=I frame for H263,MP4V-ES) to a video encoder*/ /* request a video-fast-update (=I frame for H263,MP4V-ES) to a video encoder*/
/* DEPRECATED: Use MS_VIDEO_ENCODER_REQ_VFU instead */
#define MS_FILTER_REQ_VFU MS_FILTER_BASE_METHOD_NO_ARG(106) #define MS_FILTER_REQ_VFU MS_FILTER_BASE_METHOD_NO_ARG(106)
#endif #endif
...@@ -899,6 +899,7 @@ static MSFilterMethod methods[]={ ...@@ -899,6 +899,7 @@ static MSFilterMethod methods[]={
{ MS_FILTER_GET_BITRATE , enc_get_br }, { MS_FILTER_GET_BITRATE , enc_get_br },
{ MS_FILTER_SET_MTU , enc_set_mtu }, { MS_FILTER_SET_MTU , enc_set_mtu },
{ MS_FILTER_REQ_VFU , enc_req_vfu }, { MS_FILTER_REQ_VFU , enc_req_vfu },
{ MS_VIDEO_ENCODER_REQ_VFU, enc_req_vfu },
{ 0 , NULL } { 0 , NULL }
}; };
......
...@@ -630,7 +630,7 @@ void video_stream_change_camera(VideoStream *stream, MSWebCam *cam){ ...@@ -630,7 +630,7 @@ void video_stream_change_camera(VideoStream *stream, MSWebCam *cam){
void video_stream_send_vfu(VideoStream *stream){ void video_stream_send_vfu(VideoStream *stream){
if (stream->encoder) if (stream->encoder)
ms_filter_call_method_noarg(stream->encoder,MS_FILTER_REQ_VFU); ms_filter_call_method_noarg(stream->encoder, MS_VIDEO_ENCODER_REQ_VFU);
} }
void void
......
...@@ -354,6 +354,7 @@ static MSFilterMethod enc_methods[]={ ...@@ -354,6 +354,7 @@ static MSFilterMethod enc_methods[]={
{ MS_FILTER_GET_BITRATE, enc_get_br }, { MS_FILTER_GET_BITRATE, enc_get_br },
{ MS_FILTER_SET_MTU, enc_set_mtu }, { MS_FILTER_SET_MTU, enc_set_mtu },
{ MS_FILTER_REQ_VFU, enc_req_vfu }, { MS_FILTER_REQ_VFU, enc_req_vfu },
{ MS_VIDEO_ENCODER_REQ_VFU, enc_req_vfu },
{ 0 , NULL } { 0 , NULL }
}; };
......
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