[FFmpeg-devel] [PATCH 1/6] avcodec/internal, avfilter/qp_table: Remove unused FF_QSCALE_TYPEs

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
>  libavcodec/internal.h  | 2 --
>  libavfilter/qp_table.h | 4 ----
>  2 files changed, 6 deletions(-)
> 
> diff --git a/libavcodec/internal.h b/libavcodec/internal.h
> index badca4c9dd..f9809926b8 100644
> --- a/libavcodec/internal.h
> +++ b/libavcodec/internal.h
> @@ -37,8 +37,6 @@
>  
>  #define FF_QSCALE_TYPE_MPEG1 0
>  #define FF_QSCALE_TYPE_MPEG2 1
> -#define FF_QSCALE_TYPE_H264  2
> -#define FF_QSCALE_TYPE_VP56  3
>  
>  #define FF_SANE_NB_CHANNELS 512U
>  
> diff --git a/libavfilter/qp_table.h b/libavfilter/qp_table.h
> index 4758ee8538..169a7a7fea 100644
> --- a/libavfilter/qp_table.h
> +++ b/libavfilter/qp_table.h
> @@ -33,16 +33,12 @@ int ff_qp_table_extract(AVFrame *frame, int8_t **table, int *table_w, int *table
>  
>  /**
>   * Normalize the qscale factor
> - * FIXME the H264 qscale is a log based scale, mpeg1/2 is not, the code below
> - *       cannot be optimal
>   */
>  static inline int ff_norm_qscale(int qscale, int type)
>  {
>      switch (type) {
>      case FF_QSCALE_TYPE_MPEG1: return qscale;
>      case FF_QSCALE_TYPE_MPEG2: return qscale >> 1;
> -    case FF_QSCALE_TYPE_H264:  return qscale >> 2;
> -    case FF_QSCALE_TYPE_VP56:  return (63 - qscale + 2) >> 2;
>      }
>      return qscale;
>  }

Will apply this patchset tomorrow unless there are objections.

- Andreas