lineage-rockchip/android_external_ffmpeg
1
0
Fork 0
Code Activity Actions

avdevice: migrate to AVFormatContext->url

Browse source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2017-12-29 23:29:52 +01:00
parent 25a2d269bd
commit 4bb0409820
31 changed files with 59 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libavdevice/v4l2.c
View file

@ -106,7 +106,7 @@ struct buff_data {
int index;
};
static int device_open(AVFormatContext *ctx)
static int device_open(AVFormatContext *ctx, const char* device_path)
{
struct video_data *s = ctx->priv_data;
struct v4l2_capability cap;
@ -147,11 +147,11 @@ static int device_open(AVFormatContext *ctx)
flags |= O_NONBLOCK;
}
fd = v4l2_open(ctx->filename, flags, 0);
fd = v4l2_open(device_path, flags, 0);
if (fd < 0) {
err = AVERROR(errno);
av_log(ctx, AV_LOG_ERROR, "Cannot open video device %s: %s\n",
ctx->filename, av_err2str(err));
device_path, av_err2str(err));
return err;
}
@ -840,7 +840,7 @@ static int v4l2_read_header(AVFormatContext *ctx)
v4l2_log_file = fopen("/dev/null", "w");
#endif
s->fd = device_open(ctx);
s->fd = device_open(ctx, ctx->url);
if (s->fd < 0)
return s->fd;
@ -1042,11 +1042,13 @@ static int v4l2_get_device_list(AVFormatContext *ctx, AVDeviceInfoList *device_l
return ret;
}
while ((entry = readdir(dir))) {
char device_name[256];
if (!v4l2_is_v4l_dev(entry->d_name))
continue;
snprintf(ctx->filename, sizeof(ctx->filename), "/dev/%s", entry->d_name);
if ((s->fd = device_open(ctx)) < 0)
snprintf(device_name, sizeof(device_name), "/dev/%s", entry->d_name);
if ((s->fd = device_open(ctx, device_name)) < 0)
continue;
if (v4l2_ioctl(s->fd, VIDIOC_QUERYCAP, &cap) < 0) {
@ -1060,7 +1062,7 @@ static int v4l2_get_device_list(AVFormatContext *ctx, AVDeviceInfoList *device_l
ret = AVERROR(ENOMEM);
goto fail;
}
device->device_name = av_strdup(ctx->filename);
device->device_name = av_strdup(device_name);
device->device_description = av_strdup(cap.card);
if (!device->device_name || !device->device_description) {
ret = AVERROR(ENOMEM);