| Message ID | 1588251554-3665-1-git-send-email-lance.lmwang@gmail.com |
|---|---|
| State | Accepted |
| Commit | e468106269fb5b1b983d20d6b94447ab94f7195e |
| Headers | show |
| Series | [FFmpeg-devel,1/5] avcodec/v4l2_m2m_enc: reindent code | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On Thu, 30. Apr 20:59, lance.lmwang@gmail.com wrote: > From: Limin Wang <lance.lmwang@gmail.com> > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > --- > libavcodec/v4l2_m2m_enc.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c > index 8454e2326c..98b93c61af 100644 > --- a/libavcodec/v4l2_m2m_enc.c > +++ b/libavcodec/v4l2_m2m_enc.c > @@ -204,11 +204,11 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) > switch (avctx->codec_id) { > case AV_CODEC_ID_H264: > if (avctx->profile != FF_PROFILE_UNKNOWN) { > - val = v4l2_h264_profile_from_ff(avctx->profile); > - if (val < 0) > - av_log(avctx, AV_LOG_WARNING, "h264 profile not found\n"); > - else > - v4l2_set_ext_ctrl(s, MPEG_CID(H264_PROFILE), val, "h264 profile", 1); > + val = v4l2_h264_profile_from_ff(avctx->profile); > + if (val < 0) > + av_log(avctx, AV_LOG_WARNING, "h264 profile not found\n"); > + else > + v4l2_set_ext_ctrl(s, MPEG_CID(H264_PROFILE), val, "h264 profile", 1); > } > qmin_cid = MPEG_CID(H264_MIN_QP); > qmax_cid = MPEG_CID(H264_MAX_QP); > @@ -217,11 +217,11 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) > break; > case AV_CODEC_ID_MPEG4: > if (avctx->profile != FF_PROFILE_UNKNOWN) { > - val = v4l2_mpeg4_profile_from_ff(avctx->profile); > - if (val < 0) > - av_log(avctx, AV_LOG_WARNING, "mpeg4 profile not found\n"); > - else > - v4l2_set_ext_ctrl(s, MPEG_CID(MPEG4_PROFILE), val, "mpeg4 profile", 1); > + val = v4l2_mpeg4_profile_from_ff(avctx->profile); > + if (val < 0) > + av_log(avctx, AV_LOG_WARNING, "mpeg4 profile not found\n"); > + else > + v4l2_set_ext_ctrl(s, MPEG_CID(MPEG4_PROFILE), val, "mpeg4 profile", 1); > } > qmin_cid = MPEG_CID(MPEG4_MIN_QP); > qmax_cid = MPEG_CID(MPEG4_MAX_QP); lgtm Thanks,
On Thu, Apr 30, 2020 at 11:47:11AM -0400, Andriy Gelman wrote: > On Thu, 30. Apr 20:59, lance.lmwang@gmail.com wrote: > > From: Limin Wang <lance.lmwang@gmail.com> > > > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > > --- > > libavcodec/v4l2_m2m_enc.c | 20 ++++++++++---------- > > 1 file changed, 10 insertions(+), 10 deletions(-) > > > > diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c > > index 8454e2326c..98b93c61af 100644 > > --- a/libavcodec/v4l2_m2m_enc.c > > +++ b/libavcodec/v4l2_m2m_enc.c > > @@ -204,11 +204,11 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) > > switch (avctx->codec_id) { > > case AV_CODEC_ID_H264: > > if (avctx->profile != FF_PROFILE_UNKNOWN) { > > - val = v4l2_h264_profile_from_ff(avctx->profile); > > - if (val < 0) > > - av_log(avctx, AV_LOG_WARNING, "h264 profile not found\n"); > > - else > > - v4l2_set_ext_ctrl(s, MPEG_CID(H264_PROFILE), val, "h264 profile", 1); > > + val = v4l2_h264_profile_from_ff(avctx->profile); > > + if (val < 0) > > + av_log(avctx, AV_LOG_WARNING, "h264 profile not found\n"); > > + else > > + v4l2_set_ext_ctrl(s, MPEG_CID(H264_PROFILE), val, "h264 profile", 1); > > } > > qmin_cid = MPEG_CID(H264_MIN_QP); > > qmax_cid = MPEG_CID(H264_MAX_QP); > > @@ -217,11 +217,11 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) > > break; > > case AV_CODEC_ID_MPEG4: > > if (avctx->profile != FF_PROFILE_UNKNOWN) { > > - val = v4l2_mpeg4_profile_from_ff(avctx->profile); > > - if (val < 0) > > - av_log(avctx, AV_LOG_WARNING, "mpeg4 profile not found\n"); > > - else > > - v4l2_set_ext_ctrl(s, MPEG_CID(MPEG4_PROFILE), val, "mpeg4 profile", 1); > > + val = v4l2_mpeg4_profile_from_ff(avctx->profile); > > + if (val < 0) > > + av_log(avctx, AV_LOG_WARNING, "mpeg4 profile not found\n"); > > + else > > + v4l2_set_ext_ctrl(s, MPEG_CID(MPEG4_PROFILE), val, "mpeg4 profile", 1); > > } > > qmin_cid = MPEG_CID(MPEG4_MIN_QP); > > qmax_cid = MPEG_CID(MPEG4_MAX_QP); > > lgtm will apply the rest of patchset #1,#2,#5 tomorrow if no more comments. > > Thanks, > -- > Andriy
diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 8454e2326c..98b93c61af 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -204,11 +204,11 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) switch (avctx->codec_id) { case AV_CODEC_ID_H264: if (avctx->profile != FF_PROFILE_UNKNOWN) { - val = v4l2_h264_profile_from_ff(avctx->profile); - if (val < 0) - av_log(avctx, AV_LOG_WARNING, "h264 profile not found\n"); - else - v4l2_set_ext_ctrl(s, MPEG_CID(H264_PROFILE), val, "h264 profile", 1); + val = v4l2_h264_profile_from_ff(avctx->profile); + if (val < 0) + av_log(avctx, AV_LOG_WARNING, "h264 profile not found\n"); + else + v4l2_set_ext_ctrl(s, MPEG_CID(H264_PROFILE), val, "h264 profile", 1); } qmin_cid = MPEG_CID(H264_MIN_QP); qmax_cid = MPEG_CID(H264_MAX_QP); @@ -217,11 +217,11 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) break; case AV_CODEC_ID_MPEG4: if (avctx->profile != FF_PROFILE_UNKNOWN) { - val = v4l2_mpeg4_profile_from_ff(avctx->profile); - if (val < 0) - av_log(avctx, AV_LOG_WARNING, "mpeg4 profile not found\n"); - else - v4l2_set_ext_ctrl(s, MPEG_CID(MPEG4_PROFILE), val, "mpeg4 profile", 1); + val = v4l2_mpeg4_profile_from_ff(avctx->profile); + if (val < 0) + av_log(avctx, AV_LOG_WARNING, "mpeg4 profile not found\n"); + else + v4l2_set_ext_ctrl(s, MPEG_CID(MPEG4_PROFILE), val, "mpeg4 profile", 1); } qmin_cid = MPEG_CID(MPEG4_MIN_QP); qmax_cid = MPEG_CID(MPEG4_MAX_QP);