[FFmpeg-devel] [PATCH v2 1/2] avcodec/videotoolbox: use AV_WB16 where possible

[James Almer]

On 9/27/2017 7:19 PM, Aman Gupta wrote:
> From: Aman Gupta <aman at tmm1.net>
> 
> additional changes to hevc patchset, as suggested on-list
> 
> if these look fine, I will squash into previous patchset and push it to
> master.
> ---
>  libavcodec/videotoolbox.c | 27 +++++++++------------------
>  1 file changed, 9 insertions(+), 18 deletions(-)
> 
> diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
> index 078174cc61..c96200cbdb 100644
> --- a/libavcodec/videotoolbox.c
> +++ b/libavcodec/videotoolbox.c
> @@ -165,10 +165,8 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx)
>                   ptlc.non_packed_constraint_flag << 5 |
>                   ptlc.frame_only_constraint_flag << 4);
>      AV_W8(p + 7, 0);
> -    AV_W8(p + 8, 0);
> -    AV_W8(p + 9, 0);
> -    AV_W8(p + 10, 0);
> -    AV_W8(p + 11, 0);
> +    AV_WB16(p + 8, 0);
> +    AV_WB16(p + 10, 0);

AV_WB32(p + 8, 0)

or even AV_WN32(p + 8, 0) since it's 0 and endianness doesn't matter.

>  
>      /* unsigned int(8) general_level_idc; */
>      AV_W8(p + 12, ptlc.level_idc);
> @@ -215,8 +213,7 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx)
>      AV_W8(p + 18, (sps->bit_depth_chroma - 8) | 0xfc);
>  
>      /* bit(16) avgFrameRate; */
> -    AV_W8(p + 19, 0);
> -    AV_W8(p + 20, 0);
> +    AV_WB16(p + 19, 0);
>  
>      /*
>       * bit(2) constantFrameRate;
> @@ -242,11 +239,9 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx)
>      AV_W8(p, 1 << 7 |
>               HEVC_NAL_VPS & 0x3f);
>      /* unsigned int(16) numNalus; */
> -    AV_W8(p + 1, 0);
> -    AV_W8(p + 2, 1);
> +    AV_WB16(p + 1, 1);
>      /* unsigned int(16) nalUnitLength; */
> -    AV_W8(p + 3, vps->data_size >> 8);
> -    AV_W8(p + 4, vps->data_size & 0xffff);
> +    AV_WB16(p + 3, vps->data_size);
>      /* bit(8*nalUnitLength) nalUnit; */
>      memcpy(p + 5, vps->data, vps->data_size);
>      p += 5 + vps->data_size;
> @@ -254,24 +249,20 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx)
>      /* sps */
>      AV_W8(p, 1 << 7 |
>               HEVC_NAL_SPS & 0x3f);
> -    AV_W8(p + 1, 0);
> -    AV_W8(p + 2, 1);
> -    AV_W8(p + 3, sps->data_size >> 8);
> -    AV_W8(p + 4, sps->data_size & 0xffff);
> +    AV_WB16(p + 1, 1);
> +    AV_WB16(p + 3, sps->data_size);
>      memcpy(p + 5, sps->data, sps->data_size);
>      p += 5 + sps->data_size;
>  
>      /* pps */
>      AV_W8(p, 1 << 7 |
>               HEVC_NAL_PPS & 0x3f);
> -    AV_W8(p + 1, num_pps >> 8);
> -    AV_W8(p + 2, num_pps & 0xffff);
> +    AV_WB16(p + 1, num_pps);
>      p += 3;
>      for (i = 0; i < MAX_PPS_COUNT; i++) {
>          if (h->ps.pps_list[i]) {
>              const HEVCPPS *pps = (const HEVCPPS *)h->ps.pps_list[i]->data;
> -            AV_W8(p + 0, pps->data_size >> 8);
> -            AV_W8(p + 1, pps->data_size & 0xffff);
> +            AV_WB16(p, pps->data_size);
>              memcpy(p + 2, pps->data, pps->data_size);
>              p += 2 + pps->data_size;
>          }
>