diff options
author | Andriy Gelman <andriy.gelman@gmail.com> | 2020-01-13 07:11:29 +0300 |
---|---|---|
committer | Mark Thompson <sw@jkqxz.net> | 2020-02-02 00:39:05 +0300 |
commit | 73e23b404c93a339b5a77d013a7a1274e5b4e063 (patch) | |
tree | 11ad209ec108b30b5574a9b5008592bf130424c5 /libavcodec/v4l2_m2m.c | |
parent | 4c1a3e91665c102136ded4a78310166e9eb99604 (diff) |
avcodec/v4l2_m2m: Use consistent logging context
Before this commit v4l2_m2m used two different logging contexts (from
V4L2m2mPriv and AVCodecContext). For consistency always use AVCodecContext.
Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
Diffstat (limited to 'libavcodec/v4l2_m2m.c')
-rw-r--r-- | libavcodec/v4l2_m2m.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c index b5a9fd1034..6f62e69412 100644 --- a/libavcodec/v4l2_m2m.c +++ b/libavcodec/v4l2_m2m.c @@ -63,7 +63,7 @@ static inline int v4l2_mplane_video(struct v4l2_capability *cap) static int v4l2_prepare_contexts(V4L2m2mContext* s, int probe) { struct v4l2_capability cap; - void *log_ctx = s->priv; + void *log_ctx = s->avctx; int ret; s->capture.done = s->output.done = 0; @@ -99,7 +99,7 @@ static int v4l2_prepare_contexts(V4L2m2mContext* s, int probe) static int v4l2_probe_driver(V4L2m2mContext* s) { - void *log_ctx = s->priv; + void *log_ctx = s->avctx; int ret; s->fd = open(s->devname, O_RDWR | O_NONBLOCK, 0); @@ -135,7 +135,7 @@ done: static int v4l2_configure_contexts(V4L2m2mContext* s) { - void *log_ctx = s->priv; + void *log_ctx = s->avctx; int ret; struct v4l2_format ofmt, cfmt; @@ -204,7 +204,7 @@ error: ******************************************************************************/ int ff_v4l2_m2m_codec_reinit(V4L2m2mContext* s) { - void *log_ctx = s->priv; + void *log_ctx = s->avctx; int ret; av_log(log_ctx, AV_LOG_DEBUG, "reinit context\n"); @@ -340,11 +340,11 @@ int ff_v4l2_m2m_codec_end(V4L2m2mPriv *priv) ret = ff_v4l2_context_set_status(&s->output, VIDIOC_STREAMOFF); if (ret) - av_log(priv, AV_LOG_ERROR, "VIDIOC_STREAMOFF %s\n", s->output.name); + av_log(s->avctx, AV_LOG_ERROR, "VIDIOC_STREAMOFF %s\n", s->output.name); ret = ff_v4l2_context_set_status(&s->capture, VIDIOC_STREAMOFF); if (ret) - av_log(priv, AV_LOG_ERROR, "VIDIOC_STREAMOFF %s\n", s->capture.name); + av_log(s->avctx, AV_LOG_ERROR, "VIDIOC_STREAMOFF %s\n", s->capture.name); ff_v4l2_context_release(&s->output); @@ -373,7 +373,7 @@ int ff_v4l2_m2m_codec_init(V4L2m2mPriv *priv) continue; snprintf(node, sizeof(node), "/dev/%s", entry->d_name); - av_log(priv, AV_LOG_DEBUG, "probing device %s\n", node); + av_log(s->avctx, AV_LOG_DEBUG, "probing device %s\n", node); strncpy(s->devname, node, strlen(node) + 1); ret = v4l2_probe_driver(s); if (!ret) @@ -383,13 +383,13 @@ int ff_v4l2_m2m_codec_init(V4L2m2mPriv *priv) closedir(dirp); if (ret) { - av_log(priv, AV_LOG_ERROR, "Could not find a valid device\n"); + av_log(s->avctx, AV_LOG_ERROR, "Could not find a valid device\n"); memset(s->devname, 0, sizeof(s->devname)); return ret; } - av_log(priv, AV_LOG_INFO, "Using device %s\n", node); + av_log(s->avctx, AV_LOG_INFO, "Using device %s\n", node); return v4l2_configure_contexts(s); } |