diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-29 02:55:19 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-29 03:34:35 +0200 |
commit | b8a43bc1b50f409414493a05f6c4b7895ca4ddf9 (patch) | |
tree | 95dda1b7289aac9bdb1f457417baf9515aa4383a /libavdevice | |
parent | 39d607e5bbc25ad9629683702b510e865434ef21 (diff) | |
parent | 90da52f01f8b6c22af22a002eb226989b1cf7ef8 (diff) |
Merge remote-tracking branch 'qatar/master' into master
* qatar/master: (27 commits)
ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits()
ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits.
ac3dsp: fix loop condition in ac3_update_bap_counts_c()
ARM: unbreak build
ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4.
ac3enc: split mantissa bit counting into a separate function.
ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct.
get_bits: add av_unused tag to cache variable
sws: replace all long with int.
ARM: aacdec: fix constraints on inline asm
ARM: remove unnecessary volatile from inline asm
ARM: add "cc" clobbers to inline asm where needed
ARM: improve FASTDIV asm
ac3enc: use LOCAL_ALIGNED macro
APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7).
lavu: add av_get_pix_fmt_name() convenience function
cmdutils: remove OPT_FUNC2
swscale: fix crash in bilinear scaling.
vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping
webm: support stereo videos in matroska/webm muxer
...
Conflicts:
Changelog
cmdutils.c
cmdutils.h
doc/APIchanges
doc/muxers.texi
ffmpeg.c
ffplay.c
libavcodec/ac3enc.c
libavcodec/ac3enc_float.c
libavcodec/avcodec.h
libavcodec/get_bits.h
libavcodec/libvpxenc.c
libavcodec/version.h
libavdevice/libdc1394.c
libavformat/matroskaenc.c
libavutil/avutil.h
libswscale/rgb2rgb.c
libswscale/swscale.c
libswscale/swscale_template.c
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
-rw-r--r-- | libavdevice/libdc1394.c | 13 | ||||
-rw-r--r-- | libavdevice/v4l2.c | 18 |
2 files changed, 28 insertions, 3 deletions
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index bbb606b935..5a9043bc24 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -29,6 +29,7 @@ #include <stdlib.h> #include <string.h> #include "libavutil/parseutils.h" +#include "libavutil/pixdesc.h" #include <dc1394/dc1394.h> @@ -42,6 +43,7 @@ typedef struct dc1394_data { int current_frame; int fps; char *video_size; /**< String describing video size, set by a private option. */ + char *pixel_format; /**< Set by a private option. */ AVPacket packet; } dc1394_data; @@ -82,6 +84,7 @@ struct dc1394_frame_rate { #define DEC AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = "qvga"}, 0, 0, DEC }, + { "pixel_format", "", OFFSET(pixel_format), FF_OPT_TYPE_STRING, {.str = "uyvy422"}, 0, 0, DEC }, { NULL }, }; @@ -134,6 +137,14 @@ static int dc1394_read_header(AVFormatContext *c, AVFormatParameters * ap) goto out_camera; } + if (dc1394->pixel_format) { + if ((ap->pix_fmt = av_get_pix_fmt(dc1394->pixel_format)) == PIX_FMT_NONE) { + av_log(c, AV_LOG_ERROR, "No such pixel format: %s.\n", dc1394->pixel_format); + ret = AVERROR(EINVAL); + goto out; + } + } + if (dc1394->video_size) { if ((ret = av_parse_video_size(&ap->width, &ap->height, dc1394->video_size)) < 0) { av_log(c, AV_LOG_ERROR, "Couldn't parse video size.\n"); @@ -303,6 +314,8 @@ out_camera: dc1394_video_set_transmission(dc1394->camera, DC1394_OFF); dc1394_camera_free (dc1394->camera); out: + av_freep(&dc1394->video_size); + av_freep(&dc1394->pixel_format); dc1394_free(dc1394->d); return ret; } diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 29ca01e7b5..9adf367fcb 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -50,6 +50,7 @@ #include "libavutil/opt.h" #include "avdevice.h" #include "libavutil/parseutils.h" +#include "libavutil/pixdesc.h" static const int desired_video_buffers = 256; @@ -74,6 +75,7 @@ struct video_data { char *standard; int channel; char *video_size; /**< String describing video size, set by a private option. */ + char *pixel_format; /**< Set by a private option. */ }; struct buff_data { @@ -534,12 +536,12 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap) } static uint32_t device_try_init(AVFormatContext *s1, - const AVFormatParameters *ap, + enum PixelFormat pix_fmt, int *width, int *height, enum CodecID *codec_id) { - uint32_t desired_format = fmt_ff2v4l(ap->pix_fmt, s1->video_codec_id); + uint32_t desired_format = fmt_ff2v4l(pix_fmt, s1->video_codec_id); if (desired_format == 0 || device_init(s1, width, height, desired_format) < 0) { @@ -572,6 +574,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) int res = 0; uint32_t desired_format, capabilities; enum CodecID codec_id; + enum PixelFormat pix_fmt = PIX_FMT_NONE; st = av_new_stream(s1, 0); if (!st) { @@ -584,11 +587,18 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) av_log(s1, AV_LOG_ERROR, "Couldn't parse video size.\n"); goto out; } + if (s->pixel_format && (pix_fmt = av_get_pix_fmt(s->pixel_format)) == PIX_FMT_NONE) { + av_log(s1, AV_LOG_ERROR, "No such pixel format: %s.\n", s->pixel_format); + res = AVERROR(EINVAL); + goto out; + } #if FF_API_FORMAT_PARAMETERS if (ap->width > 0) s->width = ap->width; if (ap->height > 0) s->height = ap->height; + if (ap->pix_fmt) + pix_fmt = ap->pix_fmt; #endif capabilities = 0; @@ -614,7 +624,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) av_log(s1, AV_LOG_VERBOSE, "Setting frame size to %dx%d\n", s->width, s->height); } - desired_format = device_try_init(s1, ap, &s->width, &s->height, &codec_id); + desired_format = device_try_init(s1, pix_fmt, &s->width, &s->height, &codec_id); if (desired_format == 0) { av_log(s1, AV_LOG_ERROR, "Cannot find a proper format for " "codec_id %d, pix_fmt %d.\n", s1->video_codec_id, ap->pix_fmt); @@ -659,6 +669,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) out: av_freep(&s->video_size); + av_freep(&s->pixel_format); return res; } @@ -709,6 +720,7 @@ static const AVOption options[] = { { "standard", "", OFFSET(standard), FF_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, { "channel", "", OFFSET(channel), FF_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, + { "pixel_format", "", OFFSET(pixel_format), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { NULL }, }; |