On 5/14/2017 6:24 PM, Mark Thompson wrote:
> Also add a namespace prefix.
> ---
> libavcodec/h264.h | 12 ++++++++++++
> libavcodec/h264_sei.c | 14 +++++++-------
> libavcodec/h264_sei.h | 14 +-------------
> libavcodec/vaapi_encode_h264.c | 6 +++---
> 4 files changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/libavcodec/h264.h b/libavcodec/h264.h
> index eb3805c06..ae6b3577d 100644
> --- a/libavcodec/h264.h
> +++ b/libavcodec/h264.h
> @@ -44,4 +44,16 @@ enum {
> H264_NAL_AUXILIARY_SLICE = 19,
> };
>
> +/* SEI message types */
> +enum {
> + H264_SEI_TYPE_BUFFERING_PERIOD = 0, ///< buffering period
> (H.264, D.1.1)
> + H264_SEI_TYPE_PIC_TIMING = 1, ///< picture timing
> + H264_SEI_TYPE_FILLER_PAYLOAD = 3, ///< filler data
> + H264_SEI_TYPE_USER_DATA_REGISTERED = 4, ///< registered user data as
> specified by Rec. ITU-T T.35
> + H264_SEI_TYPE_USER_DATA_UNREGISTERED = 5, ///< unregistered user data
> + H264_SEI_TYPE_RECOVERY_POINT = 6, ///< recovery point (frame #
> to decoder sync)
> + H264_SEI_TYPE_FRAME_PACKING = 45, ///< frame packing
> arrangement
> + H264_SEI_TYPE_DISPLAY_ORIENTATION = 47, ///< display orientation
> +};
Why? They were in a standalone SEI specific header, so why move them
here? You're not untangling anything by moving them here, and saving one
include line per file doesn't seem like a good reason to me.
The namespace prefix change is good, though.
> +
> #endif /* AVCODEC_H264_H */
> diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
> index 17f89cec6..357df03ea 100644
> --- a/libavcodec/h264_sei.c
> +++ b/libavcodec/h264_sei.c
> @@ -375,25 +375,25 @@ int ff_h264_sei_decode(H264SEIContext *h, GetBitContext
> *gb,
> }
>
> switch (type) {
> - case SEI_TYPE_PIC_TIMING: // Picture timing SEI
> + case H264_SEI_TYPE_PIC_TIMING: // Picture timing SEI
> ret = decode_picture_timing(&h->picture_timing, gb, ps->sps,
> logctx);
> break;
> - case SEI_TYPE_USER_DATA_REGISTERED:
> + case H264_SEI_TYPE_USER_DATA_REGISTERED:
> ret = decode_registered_user_data(h, gb, logctx, size);
> break;
> - case SEI_TYPE_USER_DATA_UNREGISTERED:
> + case H264_SEI_TYPE_USER_DATA_UNREGISTERED:
> ret = decode_unregistered_user_data(&h->unregistered, gb,
> logctx, size);
> break;
> - case SEI_TYPE_RECOVERY_POINT:
> + case H264_SEI_TYPE_RECOVERY_POINT:
> ret = decode_recovery_point(&h->recovery_point, gb);
> break;
> - case SEI_TYPE_BUFFERING_PERIOD:
> + case H264_SEI_TYPE_BUFFERING_PERIOD:
> ret = decode_buffering_period(&h->buffering_period, gb, ps,
> logctx);
> break;
> - case SEI_TYPE_FRAME_PACKING:
> + case H264_SEI_TYPE_FRAME_PACKING:
> ret = decode_frame_packing_arrangement(&h->frame_packing, gb);
> break;
> - case SEI_TYPE_DISPLAY_ORIENTATION:
> + case H264_SEI_TYPE_DISPLAY_ORIENTATION:
> ret = decode_display_orientation(&h->display_orientation, gb);
> break;
> default:
> diff --git a/libavcodec/h264_sei.h b/libavcodec/h264_sei.h
> index 8815aa389..c4517caab 100644
> --- a/libavcodec/h264_sei.h
> +++ b/libavcodec/h264_sei.h
> @@ -20,19 +20,7 @@
> #define AVCODEC_H264_SEI_H
>
> #include "get_bits.h"
> -
> -/**
> - * SEI message types
> - */
> -typedef enum {
> - SEI_TYPE_BUFFERING_PERIOD = 0, ///< buffering period (H.264,
> D.1.1)
> - SEI_TYPE_PIC_TIMING = 1, ///< picture timing
> - SEI_TYPE_USER_DATA_REGISTERED = 4, ///< registered user data as
> specified by Rec. ITU-T T.35
> - SEI_TYPE_USER_DATA_UNREGISTERED = 5, ///< unregistered user data
> - SEI_TYPE_RECOVERY_POINT = 6, ///< recovery point (frame # to
> decoder sync)
> - SEI_TYPE_FRAME_PACKING = 45, ///< frame packing arrangement
> - SEI_TYPE_DISPLAY_ORIENTATION = 47, ///< display orientation
> -} SEI_Type;
> +#include "h264.h"
>
> /**
> * pic_struct in picture timing SEI message
> diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
> index 0c3ac3441..7583a20c1 100644
> --- a/libavcodec/vaapi_encode_h264.c
> +++ b/libavcodec/vaapi_encode_h264.c
> @@ -650,18 +650,18 @@ static void vaapi_encode_h264_write_sei(PutBitContext
> *pbc,
>
> for (payload_type = 0; payload_type < 64; payload_type++) {
> switch (payload_type) {
> - case SEI_TYPE_BUFFERING_PERIOD:
> + case H264_SEI_TYPE_BUFFERING_PERIOD:
> if (!priv->send_timing_sei ||
> pic->type != PICTURE_TYPE_IDR)
> continue;
> write_payload = &vaapi_encode_h264_write_buffering_period;
> break;
> - case SEI_TYPE_PIC_TIMING:
> + case H264_SEI_TYPE_PIC_TIMING:
> if (!priv->send_timing_sei)
> continue;
> write_payload = &vaapi_encode_h264_write_pic_timing;
> break;
> - case SEI_TYPE_USER_DATA_UNREGISTERED:
> + case H264_SEI_TYPE_USER_DATA_UNREGISTERED:
> if (pic->encode_order != 0)
> continue;
> write_payload = &vaapi_encode_h264_write_identifier;
>
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
