vaapi_h265: Convert to use coded bitstream infrastructure

Also improves the metadata and generally makes the configuration
a bit cleaner.

configure

@@ -2290,7 +2290,7 @@ hevc_nvenc_encoder_deps="nvenc"
 hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser hevc_qsv_hwaccel qsvdec"
 hevc_qsv_encoder_select="hevc_ps qsvenc"
 hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC"
-hevc_vaapi_encoder_select="vaapi_encode golomb"
+hevc_vaapi_encoder_select="cbs_h265 vaapi_encode"
 mjpeg_qsv_encoder_deps="libmfx"
 mjpeg_qsv_encoder_select="qsvenc"
 mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"

libavcodec/Makefile

@@ -285,7 +285,7 @@ OBJS-$(CONFIG_HEVC_NVENC_ENCODER)      += nvenc_hevc.o
 OBJS-$(CONFIG_HEVC_QSV_DECODER)        += qsvdec_h2645.o
 OBJS-$(CONFIG_HEVC_QSV_ENCODER)        += qsvenc_hevc.o hevc_ps_enc.o       \
                                           h2645_parse.o hevc_data.o
-OBJS-$(CONFIG_HEVC_VAAPI_ENCODER)      += vaapi_encode_h265.o vaapi_encode_h26x.o
+OBJS-$(CONFIG_HEVC_VAAPI_ENCODER)      += vaapi_encode_h265.o
 OBJS-$(CONFIG_HNM4_VIDEO_DECODER)      += hnm4video.o
 OBJS-$(CONFIG_HQ_HQA_DECODER)          += hq_hqa.o hq_hqadata.o hq_hqadsp.o \
                                           canopus.o

libavcodec/vaapi_encode_h26x.c

-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <stdint.h>
-
-#include "vaapi_encode_h26x.h"
-
-int ff_vaapi_encode_h26x_nal_unit_to_byte_stream(uint8_t *dst, size_t *dst_bit_len,
-                                                 uint8_t *src, size_t src_bit_len)
-{
-    size_t dp, sp;
-    int zero_run = 0;
-    size_t dst_len = *dst_bit_len / 8;
-    size_t src_len = (src_bit_len + 7) / 8;
-    int trailing_zeroes = src_len * 8 - src_bit_len;
-
-    if (dst_len < src_len + 4) {
-        // Definitely doesn't fit.
-        goto fail;
-    }
-
-    // Start code.
-    dst[0] = dst[1] = dst[2] = 0;
-    dst[3] = 1;
-    dp = 4;
-
-    for (sp = 0; sp < src_len; sp++) {
-        if (dp >= dst_len)
-            goto fail;
-        if (zero_run < 2) {
-            if (src[sp] == 0)
-                ++zero_run;
-            else
-                zero_run = 0;
-        } else {
-            if ((src[sp] & ~3) == 0) {
-                // emulation_prevention_three_byte
-                dst[dp++] = 3;
-                if (dp >= dst_len)
-                    goto fail;
-            }
-            zero_run = src[sp] == 0;
-        }
-        dst[dp++] = src[sp];
-    }
-
-    *dst_bit_len = 8 * dp - trailing_zeroes;
-    return 0;
-
-fail:
-    *dst_bit_len = 0;
-    return AVERROR(ENOSPC);
-}

libavcodec/vaapi_encode_h26x.h

-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VAAPI_ENCODE_H26X_H
-#define AVCODEC_VAAPI_ENCODE_H26X_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "golomb.h"
-#include "put_bits.h"
-
-
-// Debug code may be interested in the name of the syntax element being
-// for tracing purposes.  Here, it is just discarded.
-
-#define write_u(pbc, width, value, name) put_bits(pbc, width, value)
-#define write_ue(pbc, value, name)       set_ue_golomb(pbc, value)
-#define write_se(pbc, value, name)       set_se_golomb(pbc, value)
-
-#define u(width, ...) write_u(pbc, width, __VA_ARGS__)
-#define ue(...)       write_ue(pbc, __VA_ARGS__)
-#define se(...)       write_se(pbc, __VA_ARGS__)
-
-
-// Copy from src to dst, applying emulation prevention.
-int ff_vaapi_encode_h26x_nal_unit_to_byte_stream(uint8_t *dst, size_t *dst_len,
-                                                 uint8_t *src, size_t src_len);
-
-#endif /* AVCODEC_VAAPI_ENCODE_H26X_H */