Commit 9b748033 authored by Francois Cartegnie's avatar Francois Cartegnie

packetizer: hevc_nal: rename for consistency

parent 2fc89606
...@@ -320,7 +320,7 @@ static int ParseVideoExtra(decoder_t *p_dec, uint8_t *p_extra, int i_extra) ...@@ -320,7 +320,7 @@ static int ParseVideoExtra(decoder_t *p_dec, uint8_t *p_extra, int i_extra)
H264SetCSD(p_dec, p_buf, size, NULL); H264SetCSD(p_dec, p_buf, size, NULL);
} else } else
{ {
if (convert_hevc_nal_units(p_dec, p_extra, i_extra, if (hevc_hvcC_to_AnnexB_NAL(p_dec, p_extra, i_extra,
p_buf, buf_size, &size, p_buf, buf_size, &size,
&p_sys->u.video.i_nal_length_size) == VLC_SUCCESS) &p_sys->u.video.i_nal_length_size) == VLC_SUCCESS)
{ {
......
...@@ -1183,7 +1183,7 @@ static int OpenGeneric( vlc_object_t *p_this, bool b_encode ) ...@@ -1183,7 +1183,7 @@ static int OpenGeneric( vlc_object_t *p_this, bool b_encode )
else if( p_dec->fmt_in.i_codec == VLC_CODEC_HEVC && !p_sys->in.b_direct ) else if( p_dec->fmt_in.i_codec == VLC_CODEC_HEVC && !p_sys->in.b_direct )
{ {
p_header->nFilledLen = 0; p_header->nFilledLen = 0;
convert_hevc_nal_units( p_dec, p_dec->fmt_in.p_extra, hevc_hvcC_to_AnnexB_NAL( p_dec, p_dec->fmt_in.p_extra,
p_dec->fmt_in.i_extra, p_dec->fmt_in.i_extra,
p_header->pBuffer, p_header->nAllocLen, p_header->pBuffer, p_header->nAllocLen,
(uint32_t*) &p_header->nFilledLen, (uint32_t*) &p_header->nFilledLen,
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <limits.h> #include <limits.h>
/* Inspired by libavcodec/hevc.c */ /* Inspired by libavcodec/hevc.c */
int convert_hevc_nal_units(decoder_t *p_dec, const uint8_t *p_buf, int hevc_hvcC_to_AnnexB_NAL(decoder_t *p_dec, const uint8_t *p_buf,
uint32_t i_buf_size, uint8_t *p_out_buf, uint32_t i_buf_size, uint8_t *p_out_buf,
uint32_t i_out_buf_size, uint32_t *p_sps_pps_size, uint32_t i_out_buf_size, uint32_t *p_sps_pps_size,
uint8_t *p_nal_size) uint8_t *p_nal_size)
......
...@@ -63,8 +63,8 @@ enum hevc_nal_unit_type_e ...@@ -63,8 +63,8 @@ enum hevc_nal_unit_type_e
HEVC_NAL_UNKNOWN HEVC_NAL_UNKNOWN
}; };
/* Parse the hvcC Metadata and convert it to annex b format */ /* Converts HEVCDecoderConfigurationRecord to Annex B format */
int convert_hevc_nal_units( decoder_t *p_dec, const uint8_t *p_buf, int hevc_hvcC_to_AnnexB_NAL( decoder_t *p_dec, const uint8_t *p_buf,
uint32_t i_buf_size, uint8_t *p_out_buf, uint32_t i_buf_size, uint8_t *p_out_buf,
uint32_t i_out_buf_size, uint32_t *p_sps_pps_size, uint32_t i_out_buf_size, uint32_t *p_sps_pps_size,
uint8_t *p_nal_size); uint8_t *p_nal_size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment