Re: [FFmpeg-devel] [PATCH] libavcodec, libpostproc: Remove outcommented START/STOP_TIMER

2020-03-14 Thread Michael Niedermayer 
On Fri, Mar 13, 2020 at 02:06:01PM +0100, Andreas Rheinhardt wrote:
> as well as includes of libavutil/timer.h.
> 
> Signed-off-by: Andreas Rheinhardt 
> ---
>  libavcodec/cabac.c |  1 -
>  libavcodec/dnxhddec.c  |  3 --
>  libavcodec/dnxhdenc.c  |  4 +-
>  libavcodec/ffv1.c  |  1 -
>  libavcodec/ffv1.h  |  1 -
>  libavcodec/ffv1dec.c   |  3 --
>  libavcodec/ffv1enc.c   |  3 --
>  libavcodec/h264_cabac.c|  3 --
>  libavcodec/h264_picture.c  |  1 -
>  libavcodec/h264_slice.c|  3 --
>  libavcodec/h264dec.c   |  1 -
>  libavcodec/ivi.c   |  5 --
>  libavcodec/mpegvideo.c |  4 --
>  libavcodec/mpegvideo_enc.c | 76 ++
>  libpostproc/postprocess.c  |  7 +--
>  libpostproc/postprocess_template.c |  8 +---
>  16 files changed, 6 insertions(+), 118 deletions(-)

will apply

thx

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

"You are 36 times more likely to die in a bathtub than at the hands of a
terrorist. Also, you are 2.5 times more likely to become a president and
2 times more likely to become an astronaut, than to die in a terrorist
attack." -- Thoughty2



signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

[FFmpeg-devel] [PATCH] libavcodec, libpostproc: Remove outcommented START/STOP_TIMER

2020-03-13 Thread Andreas Rheinhardt 
as well as includes of libavutil/timer.h.

Signed-off-by: Andreas Rheinhardt 
---
 libavcodec/cabac.c |  1 -
 libavcodec/dnxhddec.c  |  3 --
 libavcodec/dnxhdenc.c  |  4 +-
 libavcodec/ffv1.c  |  1 -
 libavcodec/ffv1.h  |  1 -
 libavcodec/ffv1dec.c   |  3 --
 libavcodec/ffv1enc.c   |  3 --
 libavcodec/h264_cabac.c|  3 --
 libavcodec/h264_picture.c  |  1 -
 libavcodec/h264_slice.c|  3 --
 libavcodec/h264dec.c   |  1 -
 libavcodec/ivi.c   |  5 --
 libavcodec/mpegvideo.c |  4 --
 libavcodec/mpegvideo_enc.c | 76 ++
 libpostproc/postprocess.c  |  7 +--
 libpostproc/postprocess_template.c |  8 +---
 16 files changed, 6 insertions(+), 118 deletions(-)

diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index e51139de3b..54e9bb4d8f 100644
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -27,7 +27,6 @@
 #include 
 
 #include "libavutil/common.h"
-#include "libavutil/timer.h"
 
 #include "cabac.h"
 #include "cabac_functions.h"
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 2ec004333f..f7585458b9 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -25,7 +25,6 @@
  */
 
 #include "libavutil/imgutils.h"
-#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "blockdsp.h"
 #define  UNCHECKED_BITSTREAM_READER 1
@@ -607,13 +606,11 @@ static int dnxhd_decode_row(AVCodecContext *avctx, void 
*data,
 return ret;
 }
 for (x = 0; x < ctx->mb_width; x++) {
-//START_TIMER;
 int ret = dnxhd_decode_macroblock(ctx, row, data, x, rownb);
 if (ret < 0) {
 row->errors++;
 return ret;
 }
-//STOP_TIMER("decode macroblock");
 }
 
 return 0;
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 2feb8baf21..32ac90f751 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -26,7 +26,6 @@
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
 #include "libavutil/opt.h"
-#include "libavutil/timer.h"
 
 #include "avcodec.h"
 #include "blockdsp.h"
@@ -933,9 +932,8 @@ static int dnxhd_encode_thread(AVCodecContext *avctx, void 
*arg,
 int last_index = ctx->m.dct_quantize(>m, block,
  ctx->is_444 ? (((i >> 1) % 3) 
< 1 ? 0 : 4): 4 & (2*i),
  qscale, );
-// START_TIMER;
+
 dnxhd_encode_block(ctx, block, last_index, n);
-// STOP_TIMER("encode_block");
 }
 }
 if (put_bits_count(>m.pb) & 31)
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index a14dd2aab2..93cec14244 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -31,7 +31,6 @@
 #include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/pixdesc.h"
-#include "libavutil/timer.h"
 
 #include "avcodec.h"
 #include "internal.h"
diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h
index f0bb19350a..147fe7ae16 100644
--- a/libavcodec/ffv1.h
+++ b/libavcodec/ffv1.h
@@ -33,7 +33,6 @@
 #include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/pixdesc.h"
-#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index e465ed49d7..ca1286f413 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -30,7 +30,6 @@
 #include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/pixdesc.h"
-#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "internal.h"
 #include "get_bits.h"
@@ -138,7 +137,6 @@ static int decode_plane(FFV1Context *s, uint8_t *src,
 sample[1][-1] = sample[0][0];
 sample[0][w]  = sample[0][w - 1];
 
-// { START_TIMER
 if (s->avctx->bits_per_raw_sample <= 8) {
 int ret = decode_line(s, w, sample, plane_index, 8);
 if (ret < 0)
@@ -159,7 +157,6 @@ static int decode_plane(FFV1Context *s, uint8_t *src,
 }
 }
 }
-// STOP_TIMER("decode-line") }
 }
 return 0;
 }
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index c521b7d445..97dc15eac9 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -31,7 +31,6 @@
 #include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/pixdesc.h"
-#include "libavutil/timer.h"
 
 #include "avcodec.h"
 #include "internal.h"
@@ -287,7 +286,6 @@ static int encode_plane(FFV1Context *s, uint8_t *src, int 
w, int h,
 
 sample[0][-1]= sample[1][0  ];
 sample[1][ w]= sample[1][w-1];
-// { START_TIMER
 if (s->bits_per_raw_sample <= 8) {
 for (x = 0; x < w; x++)
 sample[0][x] = src[x * pixel_stride + stride * y];
@@ -306,7 +304,6 @@ static int encode_plane(FFV1Context *s, uint8_t *src, int 
w,