generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavd/v4l2: extend error/debug feedback in case of invalid codec/pix_fmt

Browse Source
This commit is contained in:
Stefano Sabatini
2013-01-15 09:57:50 +01:00
parent c994bb2fb7
commit 1b325ce91a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavdevice/v4l2.c
View File

@@ -761,6 +761,10 @@ static uint32_t device_try_init(AVFormatContext *s1,
for (i = 0; i<FF_ARRAY_ELEMS(fmt_conversion_table); i++) { for (i = 0; i<FF_ARRAY_ELEMS(fmt_conversion_table); i++) {
if (s1->video_codec_id == AV_CODEC_ID_NONE || if (s1->video_codec_id == AV_CODEC_ID_NONE ||
fmt_conversion_table[i].codec_id == s1->video_codec_id) { fmt_conversion_table[i].codec_id == s1->video_codec_id) {
av_log(s1, AV_LOG_DEBUG, "Trying to set codec:%s pix_fmt:%s\n",
avcodec_get_name(fmt_conversion_table[i].codec_id),
(char *)av_x_if_null(av_get_pix_fmt_name(fmt_conversion_table[i].ff_fmt), "none"));
desired_format = fmt_conversion_table[i].v4l2_fmt; desired_format = fmt_conversion_table[i].v4l2_fmt;
if (device_init(s1, width, height, desired_format) >= 0) { if (device_init(s1, width, height, desired_format) >= 0) {
break; break;
@@ -848,7 +852,9 @@ static int v4l2_read_header(AVFormatContext *s1)
if (desired_format == 0) { if (desired_format == 0) {
av_log(s1, AV_LOG_ERROR, "Cannot find a proper format for " av_log(s1, AV_LOG_ERROR, "Cannot find a proper format for "
"codec_id %d, pix_fmt %d.\n", s1->video_codec_id, pix_fmt); "codec '%s' (id %d), pixel format '%s' (id %d)\n",
avcodec_get_name(s1->video_codec_id), s1->video_codec_id,
(char *)av_x_if_null(av_get_pix_fmt_name(pix_fmt), "none"), pix_fmt);
v4l2_close(s->fd); v4l2_close(s->fd);
return AVERROR(EIO); return AVERROR(EIO);