[FFmpeg-devel] [PATCH] Deprecate AFD field and add AFD as side-data

[Michael Niedermayer]

On Tue, Jul 29, 2014 at 12:14:03AM +0100, Kieran Kunhya wrote:
> ---
>  doc/APIchanges            |    4 ++++
>  libavcodec/avcodec.h      |    5 ++++-
>  libavcodec/mpeg12dec.c    |   21 ++++++++++++++++++++-
>  libavcodec/version.h      |    5 ++++-
>  libavfilter/vf_showinfo.c |    3 +++
>  libavutil/frame.h         |   12 ++++++++++++
>  libavutil/version.h       |    2 +-
>  7 files changed, 48 insertions(+), 4 deletions(-)
> 
> diff --git a/doc/APIchanges b/doc/APIchanges
> index 9535b88..92fb8a3 100644
> --- a/doc/APIchanges
> +++ b/doc/APIchanges
> @@ -13,6 +13,10 @@ libavutil:     2013-12-xx
>  
>  API changes, most recent first:
>  
> +2014-07-xx - xxxxxxx - lavc 55.58.0 - avcodec.h
> +2014-07-xx - xxxxxxx - lavu 53.19.0 - frame.h
> +  Deprecate AVCodecContext.dtg_active_format and use side-data instead
> +

iam not sure but maybe this should be 2 commits, one for libavutil
addition and bump and one for libavcodec


[...]
> @@ -2234,7 +2249,12 @@ static void mpeg_decode_user_data(AVCodecContext *avctx,
>          if (flags & 0x40) {
>              if (buf_end - p < 1)
>                  return;
> +#if FF_API_AFD
>              avctx->dtg_active_format = p[0] & 0x0f;
> +#else
> +            s1->has_afd = 1;
> +            s1->afd = p[0] & 0x0f;
> +#endif

why else ?
cant the side data be exported immedeatly ?


[...]
> diff --git a/libavutil/frame.h b/libavutil/frame.h
> index b2159d3..cbc48f1 100644
> --- a/libavutil/frame.h
> +++ b/libavutil/frame.h
> @@ -82,8 +82,20 @@ enum AVFrameSideDataType {
>       * See libavutil/display.h for a detailed description of the data.
>       */
>      AV_FRAME_DATA_DISPLAYMATRIX,
> +    /**
> +     * Active Format Description data consisting of a single byte as specified in ETSI TS 101 154
> +     */

this should refer to "AV_DTG_AFD_*", its not hard to find as its below
now but with growing list of AV_FRAME_DATA this may change


> +    AV_FRAME_DATA_AFD,
>  };
>  
> +#define AV_DTG_AFD_SAME         8
> +#define AV_DTG_AFD_4_3          9
> +#define AV_DTG_AFD_16_9         10
> +#define AV_DTG_AFD_14_9         11
> +#define AV_DTG_AFD_4_3_SP_14_9  13
> +#define AV_DTG_AFD_16_9_SP_14_9 14
> +#define AV_DTG_AFD_SP_4_3       15

shouldnt this be a enum ?

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Avoid a single point of failure, be that a person or equipment.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140729/c50136bd/attachment.asc>