virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

dshow: show device name when outputting buffer overflow log message

Browse Source 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
rogerdpack 2014-03-27 13:44:20 -06:00 committed by Michael Niedermayer
parent 64b79141bd
commit 773eb74bab
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavdevice/dshow.c
View File

@ -180,7 +180,7 @@ static char *dup_wchar_to_utf8(wchar_t *w)
return s; return s;
} }
static int shall_we_drop(AVFormatContext *s, int index) static int shall_we_drop(AVFormatContext *s, int index, enum dshowDeviceType devtype)
{ {
struct dshow_ctx *ctx = s->priv_data; struct dshow_ctx *ctx = s->priv_data;
static const uint8_t dropscore[] = {62, 75, 87, 100}; static const uint8_t dropscore[] = {62, 75, 87, 100};
@ -189,7 +189,7 @@ static int shall_we_drop(AVFormatContext *s, int index)
if(dropscore[++ctx->video_frame_num%ndropscores] <= buffer_fullness) { if(dropscore[++ctx->video_frame_num%ndropscores] <= buffer_fullness) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"real-time buffer[%d] too full (%d%% of size: %d)! frame dropped!\n", index, buffer_fullness, s->max_picture_buffer); "real-time buffer[%s] too full (%d%% of size: %d)! frame dropped!\n", ctx->device_name[devtype], buffer_fullness, s->max_picture_buffer);
return 1; return 1;
} }
@ -197,7 +197,7 @@ static int shall_we_drop(AVFormatContext *s, int index)
} }
static void static void
callback(void *priv_data, int index, uint8_t *buf, int buf_size, int64_t time) callback(void *priv_data, int index, uint8_t *buf, int buf_size, int64_t time, enum dshowDeviceType devtype)
{ {
AVFormatContext *s = priv_data; AVFormatContext *s = priv_data;
struct dshow_ctx *ctx = s->priv_data; struct dshow_ctx *ctx = s->priv_data;
@ -207,7 +207,7 @@ callback(void *priv_data, int index, uint8_t *buf, int buf_size, int64_t time)
WaitForSingleObject(ctx->mutex, INFINITE); WaitForSingleObject(ctx->mutex, INFINITE);
if(shall_we_drop(s, index)) if(shall_we_drop(s, index, devtype))
goto fail; goto fail;
pktl_next = av_mallocz(sizeof(AVPacketList)); pktl_next = av_mallocz(sizeof(AVPacketList));

2
libavdevice/dshow_capture.h
View File

@ -254,7 +254,7 @@ struct libAVFilter {
void *priv_data; void *priv_data;
int stream_index; int stream_index;
int64_t start_time; int64_t start_time;
void (*callback)(void *priv_data, int index, uint8_t *buf, int buf_size, int64_t time); void (*callback)(void *priv_data, int index, uint8_t *buf, int buf_size, int64_t time, enum dshowDeviceType type);
}; };
long WINAPI libAVFilter_QueryInterface (libAVFilter *, const GUID *, void **); long WINAPI libAVFilter_QueryInterface (libAVFilter *, const GUID *, void **);

2
libavdevice/dshow_pin.c
View File

@ -328,7 +328,7 @@ libAVMemInputPin_Receive(libAVMemInputPin *this, IMediaSample *sample)
priv_data = pin->filter->priv_data; priv_data = pin->filter->priv_data;
index = pin->filter->stream_index; index = pin->filter->stream_index;
pin->filter->callback(priv_data, index, buf, buf_size, curtime); pin->filter->callback(priv_data, index, buf, buf_size, curtime, devtype);
return S_OK; return S_OK;
} }