aa3155e4c2
Add muxer for vvcc byte stream format.
Add AV_CODEC_ID_VVC to ff_mp4_obj_type.
Add AV_CODEC_ID_VVC to ISO Media codec (VvcConfigurationBox vvi1,
vvc1 defined in ISO/IEC 14496-15:2021).
Add VvcConfigurationBox vvcC which extends FullBox type in
ISO/IEC 14496-15:2021.
Tested with:
ffmpeg -i NovosobornayaSquare_1920x1080.mp4 -c:v libvvenc test.mp4 && ffmpeg -i test.mp4 -f null -
ffmpeg -i NovosobornayaSquare_1920x1080.mp4 -c:v copy test.mp4 && ffmpeg -i test.mp4 -f md5 -
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Thomas Siedel <thomas.ff@spin-digital.com>
Co-Authored-By: Nuo Mi <nuomi2021@gmail.com>
100 lines
4.2 KiB
C
100 lines
4.2 KiB
C
/*
|
|
* H.266 / VVC helper functions for muxers
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg 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.
|
|
*
|
|
* FFmpeg 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 FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* internal header for H.266/VVC (de)muxer utilities
|
|
*/
|
|
|
|
#ifndef AVFORMAT_VVC_H
|
|
#define AVFORMAT_VVC_H
|
|
|
|
#include <stdint.h>
|
|
#include "avio.h"
|
|
|
|
/**
|
|
* Writes Annex B formatted H.266/VVC NAL units to the provided AVIOContext.
|
|
*
|
|
* The NAL units are converted to an MP4-compatible format (start code prefixes
|
|
* are replaced by 4-byte size fields, as per ISO/IEC 14496-15).
|
|
*
|
|
* If filter_ps is non-zero, any VVC parameter sets found in the input will be
|
|
* discarded, and *ps_count will be set to the number of discarded PS NAL units.
|
|
*
|
|
* @param pb address of the AVIOContext where the data shall be written
|
|
* @param buf_in address of the buffer holding the input data
|
|
* @param size size (in bytes) of the input buffer
|
|
* @param filter_ps whether to write parameter set NAL units to the output (0)
|
|
* or to discard them (non-zero)
|
|
* @param ps_count address of the variable where the number of discarded
|
|
* parameter set NAL units shall be written, may be NULL
|
|
* @return the amount (in bytes) of data written in case of success, a negative
|
|
* value corresponding to an AVERROR code in case of failure
|
|
*/
|
|
int ff_vvc_annexb2mp4(AVIOContext *pb, const uint8_t *buf_in,
|
|
int size, int filter_ps, int *ps_count);
|
|
|
|
/**
|
|
* Writes Annex B formatted H.266/VVC NAL units to a data buffer.
|
|
*
|
|
* The NAL units are converted to an MP4-compatible format (start code prefixes
|
|
* are replaced by 4-byte size fields, as per ISO/IEC 14496-15).
|
|
*
|
|
* If filter_ps is non-zero, any VVC parameter sets found in the input will be
|
|
* discarded, and *ps_count will be set to the number of discarded PS NAL units.
|
|
*
|
|
* On success, *size holds the size (in bytes) of the output data buffer.
|
|
*
|
|
* @param buf_in address of the buffer holding the input data
|
|
* @param size address of the variable holding the size (in bytes) of the input
|
|
* buffer (on input) and of the output buffer (on success)
|
|
* @param buf_out on success, address of the variable holding the address of
|
|
* the output buffer
|
|
* @param filter_ps whether to write parameter set NAL units to the output (0)
|
|
* or to discard them (non-zero)
|
|
* @param ps_count address of the variable where the number of discarded
|
|
* parameter set NAL units shall be written, may be NULL
|
|
* @return 0 in case of success, a negative value corresponding to an AVERROR
|
|
* code in case of failure
|
|
* @note *buf_out will be treated as uninitialized on input and won't be freed.
|
|
*/
|
|
int ff_vvc_annexb2mp4_buf(const uint8_t *buf_in, uint8_t **buf_out,
|
|
int *size, int filter_ps, int *ps_count);
|
|
|
|
/**
|
|
* Writes H.266/VVC extradata (parameter sets, declarative SEI NAL units) to
|
|
* the provided AVIOContext.
|
|
*
|
|
* If the extradata is Annex B format, it gets converted to vvcC format before
|
|
* writing.
|
|
*
|
|
* @param pb address of the AVIOContext where the vvcC shall be written
|
|
* @param data address of the buffer holding the data needed to write the vvcC
|
|
* @param size size (in bytes) of the data buffer
|
|
* @param ps_array_completeness whether all parameter sets are in the vvcC (1)
|
|
* or there may be additional parameter sets in the bitstream (0)
|
|
* @return >=0 in case of success, a negative value corresponding to an AVERROR
|
|
* code in case of failure
|
|
*/
|
|
int ff_isom_write_vvcc(AVIOContext *pb, const uint8_t *data,
|
|
int size, int ps_array_completeness);
|
|
|
|
#endif /* AVFORMAT_VVC_H */
|