[vlc-devel] [PATCH 6/7] qsv: fix indentation after previous commit

Steve Lhomme robux4 at ycbcr.xyz
Fri Aug 14 16:00:28 CEST 2020


---
 modules/codec/qsv.c | 46 ++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/modules/codec/qsv.c b/modules/codec/qsv.c
index 384bd44c810..25295315f26 100644
--- a/modules/codec/qsv.c
+++ b/modules/codec/qsv.c
@@ -761,7 +761,7 @@ static int Open(vlc_object_t *this)
         sys->params.IOPattern |=  MFX_IOPATTERN_IN_VIDEO_MEMORY;
     else
 #endif
-    sys->params.IOPattern |= MFX_IOPATTERN_IN_SYSTEM_MEMORY;
+        sys->params.IOPattern |= MFX_IOPATTERN_IN_SYSTEM_MEMORY;
     sys->params.AsyncDepth      = var_InheritInteger(enc, SOUT_CFG_PREFIX "async-depth");
     sys->params.mfx.GopOptFlag  = 1; /* TODO */
     sys->params.mfx.GopPicSize  = var_InheritInteger(enc, SOUT_CFG_PREFIX "gop-size");
@@ -932,19 +932,19 @@ static int Open(vlc_object_t *this)
     else
 #endif
     {
-    enc->fmt_in.i_codec                = VLC_CODEC_NV12; // Intel Media SDK requirement
-    enc->fmt_in.video.i_chroma         = VLC_CODEC_NV12;
-    enc->fmt_in.video.i_bits_per_pixel = 12;
-    // require aligned pictures on input, a filter may be added before the encoder
-    enc->fmt_in.video.i_width          = sys->params.mfx.FrameInfo.Width;
-    enc->fmt_in.video.i_height         = sys->params.mfx.FrameInfo.Height;
-
-    sys->input_pool = picture_pool_NewFromFormat( &enc->fmt_in.video, 18 );
-    if (sys->input_pool == NULL)
-    {
-        msg_Err(enc, "Failed to create the internal pool");
-        goto nomem;
-    }
+        enc->fmt_in.i_codec                = VLC_CODEC_NV12; // Intel Media SDK requirement
+        enc->fmt_in.video.i_chroma         = VLC_CODEC_NV12;
+        enc->fmt_in.video.i_bits_per_pixel = 12;
+        // require aligned pictures on input, a filter may be added before the encoder
+        enc->fmt_in.video.i_width          = sys->params.mfx.FrameInfo.Width;
+        enc->fmt_in.video.i_height         = sys->params.mfx.FrameInfo.Height;
+
+        sys->input_pool = picture_pool_NewFromFormat( &enc->fmt_in.video, 18 );
+        if (sys->input_pool == NULL)
+        {
+            msg_Err(enc, "Failed to create the internal pool");
+            goto nomem;
+        }
     }
 
     enc->pf_encode_video = Encode;
@@ -1076,16 +1076,16 @@ static int submit_frame(encoder_t *enc, picture_t *pic, QSVFrame **new_frame)
         qf->pic = picture_Hold( pic );
     else
     {
-    qf->pic = picture_pool_Get( sys->input_pool );
-    if (unlikely(!qf->pic))
-    {
-        msg_Warn(enc, "Unable to find an unlocked surface in the pool");
-        qf->used = 0;
-        return ret;
-    }
-    picture_Copy( qf->pic, pic );
+        qf->pic = picture_pool_Get( sys->input_pool );
+        if (unlikely(!qf->pic))
+        {
+            msg_Warn(enc, "Unable to find an unlocked surface in the pool");
+            qf->used = 0;
+            return ret;
+        }
+        picture_Copy( qf->pic, pic );
 
-    assert(qf->pic->p[0].p_pixels + (qf->pic->p[0].i_pitch * qf->pic->p[0].i_lines) == qf->pic->p[1].p_pixels);
+        assert(qf->pic->p[0].p_pixels + (qf->pic->p[0].i_pitch * qf->pic->p[0].i_lines) == qf->pic->p[1].p_pixels);
     }
 
     qf->surface.Info = sys->params.mfx.FrameInfo;
-- 
2.26.2



More information about the vlc-devel mailing list