[vlc-commits] packetizer: hevc_nal: rename for consistency

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Dec  8 11:50:51 2015 +0100| [9b7480331eeeb53fe1e73a4d46e4ffec1d93524e] | committer: Francois Cartegnie

packetizer: hevc_nal: rename for consistency

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b7480331eeeb53fe1e73a4d46e4ffec1d93524e
---

 modules/codec/omxil/mediacodec.c |    2 +-
 modules/codec/omxil/omxil.c      |    2 +-
 modules/packetizer/hevc_nal.c    |    2 +-
 modules/packetizer/hevc_nal.h    |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c
index b73d329..bfeb9b8 100644
--- a/modules/codec/omxil/mediacodec.c
+++ b/modules/codec/omxil/mediacodec.c
@@ -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);
         } 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_sys->u.video.i_nal_length_size) == VLC_SUCCESS)
             {
diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index 4ec30a8..7c53f52 100644
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -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 )
         {
             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_header->pBuffer, p_header->nAllocLen,
                                     (uint32_t*) &p_header->nFilledLen,
diff --git a/modules/packetizer/hevc_nal.c b/modules/packetizer/hevc_nal.c
index 076fdaa..592d99f 100644
--- a/modules/packetizer/hevc_nal.c
+++ b/modules/packetizer/hevc_nal.c
@@ -23,7 +23,7 @@
 #include <limits.h>
 
 /* 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_out_buf_size, uint32_t *p_sps_pps_size,
                            uint8_t *p_nal_size)
diff --git a/modules/packetizer/hevc_nal.h b/modules/packetizer/hevc_nal.h
index a4d80c6..ad8fbd8 100644
--- a/modules/packetizer/hevc_nal.h
+++ b/modules/packetizer/hevc_nal.h
@@ -63,8 +63,8 @@ enum hevc_nal_unit_type_e
     HEVC_NAL_UNKNOWN
 };
 
-/* Parse the hvcC Metadata and convert it to annex b format */
-int convert_hevc_nal_units( decoder_t *p_dec, const uint8_t *p_buf,
+/* Converts HEVCDecoderConfigurationRecord to Annex B format */
+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_out_buf_size, uint32_t *p_sps_pps_size,
                             uint8_t *p_nal_size);