[FFmpeg-devel] [PATCH 1/2] avcodec/msmpeg4enc: Fix indentation

[FFmpeg-devel] [PATCH 1/2] avcodec/msmpeg4enc: Fix indentation

[Andreas Rheinhardt]

Forgotten after 2b9ab1d54a35f7d689b2396cfc59f9dbdcae391f.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/msmpeg4enc.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c
index e40acdf3fc..f0d0045e69 100644
--- a/libavcodec/msmpeg4enc.c
+++ b/libavcodec/msmpeg4enc.c
@@ -279,15 +279,15 @@ void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
 
 void ff_msmpeg4_encode_ext_header(MpegEncContext * s)
 {
-        unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1);
-        put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29
+    unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1);
+    put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29
 
-        put_bits(&s->pb, 11, FFMIN(s->bit_rate/1024, 2047));
+    put_bits(&s->pb, 11, FFMIN(s->bit_rate / 1024, 2047));
 
-        if(s->msmpeg4_version>=3)
-            put_bits(&s->pb, 1, s->flipflop_rounding);
-        else
-            av_assert0(s->flipflop_rounding==0);
+    if (s->msmpeg4_version >= 3)
+        put_bits(&s->pb, 1, s->flipflop_rounding);
+    else
+        av_assert0(!s->flipflop_rounding);
 }
 
 void ff_msmpeg4_encode_motion(MpegEncContext * s,
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] avcodec/wmv2enc: Inline extradata size

[Andreas Rheinhardt]

This also allows the compiler to optimize the implicit
checks performed by the PutBit-API away (Clang does so).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/wmv2enc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c
index 8a6d897468..d2f8afc892 100644
--- a/libavcodec/wmv2enc.c
+++ b/libavcodec/wmv2enc.c
@@ -29,6 +29,8 @@
 #include "wmv2.h"
 #include "wmv2enc.h"
 
+#define WMV2_EXTRADATA_SIZE 4
+
 typedef struct WMV2EncContext {
     MSMPEG4EncContext msmpeg4;
     WMV2Context common;
@@ -49,7 +51,7 @@ static int encode_ext_header(WMV2EncContext *w)
     PutBitContext pb;
     int code;
 
-    init_put_bits(&pb, s->avctx->extradata, s->avctx->extradata_size);
+    init_put_bits(&pb, s->avctx->extradata, WMV2_EXTRADATA_SIZE);
 
     put_bits(&pb, 5, s->avctx->time_base.den / s->avctx->time_base.num); // yes 29.97 -> 29
     put_bits(&pb, 11, FFMIN(s->bit_rate / 1024, 2047));
@@ -80,7 +82,7 @@ static av_cold int wmv2_encode_init(AVCodecContext *avctx)
 
     ff_wmv2_common_init(s);
 
-    avctx->extradata_size = 4;
+    avctx->extradata_size = WMV2_EXTRADATA_SIZE;
     avctx->extradata      = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
     if (!avctx->extradata)
         return AVERROR(ENOMEM);
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/2] avcodec/msmpeg4enc: Fix indentation

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Forgotten after 2b9ab1d54a35f7d689b2396cfc59f9dbdcae391f.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/msmpeg4enc.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c
> index e40acdf3fc..f0d0045e69 100644
> --- a/libavcodec/msmpeg4enc.c
> +++ b/libavcodec/msmpeg4enc.c
> @@ -279,15 +279,15 @@ void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
>  
>  void ff_msmpeg4_encode_ext_header(MpegEncContext * s)
>  {
> -        unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1);
> -        put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29
> +    unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1);
> +    put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29
>  
> -        put_bits(&s->pb, 11, FFMIN(s->bit_rate/1024, 2047));
> +    put_bits(&s->pb, 11, FFMIN(s->bit_rate / 1024, 2047));
>  
> -        if(s->msmpeg4_version>=3)
> -            put_bits(&s->pb, 1, s->flipflop_rounding);
> -        else
> -            av_assert0(s->flipflop_rounding==0);
> +    if (s->msmpeg4_version >= 3)
> +        put_bits(&s->pb, 1, s->flipflop_rounding);
> +    else
> +        av_assert0(!s->flipflop_rounding);
>  }
>  
>  void ff_msmpeg4_encode_motion(MpegEncContext * s,

Will apply these trivialities tonight unless there are objections.

- Andreas

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".