RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libdc1394: add video_size private option.

This commit is contained in:
Anton Khirnov 2011-05-24 07:43:01 +02:00
parent 284bac2e77
commit fd48620e3e
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavdevice/libdc1394.c
View File

@ -24,6 +24,7 @@
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#if HAVE_LIBDC1394_2 #if HAVE_LIBDC1394_2
#include <dc1394/dc1394.h> #include <dc1394/dc1394.h>
@ -59,6 +60,7 @@ typedef struct dc1394_data {
#endif #endif
int current_frame; int current_frame;
int fps; int fps;
char *video_size; /**< String describing video size, set by a private option. */
AVPacket packet; AVPacket packet;
} dc1394_data; } dc1394_data;
@ -90,10 +92,13 @@ struct dc1394_frame_rate {
{ 0, 0 } /* gotta be the last one */ { 0, 0 } /* gotta be the last one */
}; };
#define OFFSET(x) offsetof(dc1394_data, x)
#define DEC AV_OPT_FLAG_DECODING_PARAM
static const AVOption options[] = { static const AVOption options[] = {
#if HAVE_LIBDC1394_1 #if HAVE_LIBDC1394_1
{ "channel", "", offsetof(dc1394_data, channel), FF_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, { "channel", "", offsetof(dc1394_data, channel), FF_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
#endif #endif
{ "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = "qvga"}, 0, 0, DEC },
{ NULL }, { NULL },
}; };
@ -113,11 +118,21 @@ static inline int dc1394_read_common(AVFormatContext *c, AVFormatParameters *ap,
struct dc1394_frame_format *fmt; struct dc1394_frame_format *fmt;
struct dc1394_frame_rate *fps; struct dc1394_frame_rate *fps;
enum PixelFormat pix_fmt = ap->pix_fmt == PIX_FMT_NONE ? PIX_FMT_UYVY422 : ap->pix_fmt; /* defaults */ enum PixelFormat pix_fmt = ap->pix_fmt == PIX_FMT_NONE ? PIX_FMT_UYVY422 : ap->pix_fmt; /* defaults */
int width = !ap->width ? 320 : ap->width; int width, height;
int height = !ap->height ? 240 : ap->height;
int frame_rate = !ap->time_base.num ? 30000 : av_rescale(1000, ap->time_base.den, ap->time_base.num); int frame_rate = !ap->time_base.num ? 30000 : av_rescale(1000, ap->time_base.den, ap->time_base.num);
int ret = 0; int ret = 0;
if ((ret = av_parse_video_size(&width, &height, dc1394->video_size)) < 0) {
av_log(c, AV_LOG_ERROR, "Couldn't parse video size.\n");
goto out;
}
#if FF_API_FORMAT_PARAMETERS
if (ap->width > 0)
width = ap->width;
if (ap->height > 0)
height = ap->height;
#endif
for (fmt = dc1394_frame_formats; fmt->width; fmt++) for (fmt = dc1394_frame_formats; fmt->width; fmt++)
if (fmt->pix_fmt == pix_fmt && fmt->width == width && fmt->height == height) if (fmt->pix_fmt == pix_fmt && fmt->width == width && fmt->height == height)
break; break;
@ -161,6 +176,7 @@ static inline int dc1394_read_common(AVFormatContext *c, AVFormatParameters *ap,
*select_fps = fps; *select_fps = fps;
*select_fmt = fmt; *select_fmt = fmt;
out: out:
av_freep(&dc1394->video_size);
return ret; return ret;
} }