[vlc-commits] move h264/hevc nal helper code to packetizer
Thomas Guillem
git at videolan.org
Tue Apr 28 17:49:36 CEST 2015
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Apr 23 16:03:42 2015 +0200| [6ea9e51b6b826fb4f8ad05fc82b186841a145f35] | committer: Thomas Guillem
move h264/hevc nal helper code to packetizer
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6ea9e51b6b826fb4f8ad05fc82b186841a145f35
---
modules/codec/Makefile.am | 11 ++++++-----
modules/codec/crystalhd.c | 2 +-
modules/codec/mft.c | 2 +-
modules/codec/omxil/android_mediacodec.c | 4 ++--
modules/codec/omxil/omxil.c | 4 ++--
modules/codec/omxil/utils.c | 2 +-
modules/packetizer/Makefile.am | 2 +-
modules/packetizer/h264.c | 2 +-
modules/{codec => packetizer}/h264_nal.c | 0
modules/{codec => packetizer}/h264_nal.h | 0
modules/{codec => packetizer}/hevc_nal.c | 0
modules/{codec => packetizer}/hevc_nal.h | 0
12 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index e5f7ed8..a81cdbf 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -375,8 +375,8 @@ noinst_HEADERS += \
libomxil_plugin_la_SOURCES = \
codec/omxil/utils.c codec/omxil/omxil_utils.h \
- codec/h264_nal.c codec/h264_nal.h \
- codec/hevc_nal.c codec/hevc_nal.h \
+ packetizer/h264_nal.c packetizer/h264_nal.h \
+ packetizer/hevc_nal.c packetizer/hevc_nal.h \
codec/omxil/qcom.c codec/omxil/qcom.h \
codec/omxil/omxil.c codec/omxil/omxil.h codec/omxil/omxil_core.c codec/omxil/omxil_core.h \
video_chroma/copy.c
@@ -396,7 +396,8 @@ libiomx_plugin_la_LIBADD = $(libomxil_plugin_la_LIBADD)
libmediacodec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil
libmediacodec_plugin_la_SOURCES = codec/omxil/android_mediacodec.c codec/omxil/utils.c \
video_chroma/copy.c codec/omxil/android_opaque.c codec/omxil/android_opaque.h \
- codec/h264_nal.c codec/h264_nal.h codec/hevc_nal.c codec/hevc_nal.h
+ packetizer/h264_nal.c packetizer/h264_nal.h
+ packetizer/hevc_nal.c packetizer/hevc_nal.h
codec_LTLIBRARIES += $(LTLIBomxil) $(LTLIBomxil_vout)
EXTRA_LTLIBRARIES += libomxil_plugin.la libomxil_vout_plugin.la
@@ -474,7 +475,7 @@ codec_LTLIBRARIES += $(LTLIBtwolame)
### Hardware encoders ###
-libcrystalhd_plugin_la_SOURCES = codec/crystalhd.c codec/h264_nal.c codec/h264_nal.h
+libcrystalhd_plugin_la_SOURCES = codec/crystalhd.c packetizer/h264_nal.c packetizer/h264_nal.h
libcrystalhd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
libcrystalhd_plugin_la_LIBADD = $(LIBS_crystalhd)
EXTRA_LTLIBRARIES += libcrystalhd_plugin.la
@@ -498,7 +499,7 @@ libdmo_plugin_la_LIBADD += -lole32 -luuid
codec_LTLIBRARIES += libdmo_plugin.la
endif
-libmft_plugin_la_SOURCES = codec/mft.c codec/h264_nal.c codec/h264_nal.h
+libmft_plugin_la_SOURCES = codec/mft.c packetizer/h264_nal.c packetizer/h264_nal.h
if HAVE_WIN32
libmft_plugin_la_LIBADD = -lole32 -luuid -lmfuuid -lmfplat
codec_LTLIBRARIES += libmft_plugin.la
diff --git a/modules/codec/crystalhd.c b/modules/codec/crystalhd.c
index b8e39af..d3b99ba 100644
--- a/modules/codec/crystalhd.c
+++ b/modules/codec/crystalhd.c
@@ -39,7 +39,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
-#include "h264_nal.h"
+#include "../packetizer/h264_nal.h"
/* Workaround for some versions of libcrystalHD */
#if !defined(_WIN32) && !defined(__APPLE__)
diff --git a/modules/codec/mft.c b/modules/codec/mft.c
index 22e647f..8c9373a 100644
--- a/modules/codec/mft.c
+++ b/modules/codec/mft.c
@@ -42,7 +42,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
-#include <h264_nal.h>
+#include "../packetizer/h264_nal.h"
#define _VIDEOINFOHEADER_
#include <vlc_codecs.h>
diff --git a/modules/codec/omxil/android_mediacodec.c b/modules/codec/omxil/android_mediacodec.c
index 3e03c33..f98934d 100644
--- a/modules/codec/omxil/android_mediacodec.c
+++ b/modules/codec/omxil/android_mediacodec.c
@@ -37,8 +37,8 @@
#include <vlc_block_helper.h>
#include <vlc_cpu.h>
-#include "../h264_nal.h"
-#include "../hevc_nal.h"
+#include "../../packetizer/h264_nal.h"
+#include "../../packetizer/hevc_nal.h"
#include <OMX_Core.h>
#include <OMX_Component.h>
#include "omxil_utils.h"
diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index 0176707..1418340 100644
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -35,8 +35,8 @@
#include <vlc_codec.h>
#include <vlc_block_helper.h>
#include <vlc_cpu.h>
-#include "../h264_nal.h"
-#include "../hevc_nal.h"
+#include "../../packetizer/h264_nal.h"
+#include "../../packetizer/hevc_nal.h"
#include "omxil.h"
#include "omxil_core.h"
diff --git a/modules/codec/omxil/utils.c b/modules/codec/omxil/utils.c
index 4ec6981..8263ad1 100644
--- a/modules/codec/omxil/utils.c
+++ b/modules/codec/omxil/utils.c
@@ -37,7 +37,7 @@
#include "omxil.h"
#include "qcom.h"
#include "../../video_chroma/copy.h"
-#include "../h264_nal.h"
+#include "../../packetizer/h264_nal.h"
/*****************************************************************************
* Events utility functions
diff --git a/modules/packetizer/Makefile.am b/modules/packetizer/Makefile.am
index 40ad488..b6bf074 100644
--- a/modules/packetizer/Makefile.am
+++ b/modules/packetizer/Makefile.am
@@ -5,7 +5,7 @@ libpacketizer_mpegvideo_plugin_la_SOURCES = packetizer/mpegvideo.c
libpacketizer_mpeg4video_plugin_la_SOURCES = packetizer/mpeg4video.c
libpacketizer_mpeg4audio_plugin_la_SOURCES = packetizer/mpeg4audio.c
libpacketizer_h264_plugin_la_SOURCES = \
- codec/h264_nal.c codec/h264_nal.h \
+ packetizer/h264_nal.c packetizer/h264_nal.h \
packetizer/h264.c
libpacketizer_vc1_plugin_la_SOURCES = packetizer/vc1.c
libpacketizer_mlp_plugin_la_SOURCES = packetizer/mlp.c
diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index 29fd4b6..6401ea4 100644
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -41,7 +41,7 @@
#include <vlc_block_helper.h>
#include <vlc_bits.h>
#include "../codec/cc.h"
-#include "../codec/h264_nal.h"
+#include "h264_nal.h"
#include "packetizer_helper.h"
#include "../demux/mpeg/mpeg_parser_helpers.h"
diff --git a/modules/codec/h264_nal.c b/modules/packetizer/h264_nal.c
similarity index 100%
rename from modules/codec/h264_nal.c
rename to modules/packetizer/h264_nal.c
diff --git a/modules/codec/h264_nal.h b/modules/packetizer/h264_nal.h
similarity index 100%
rename from modules/codec/h264_nal.h
rename to modules/packetizer/h264_nal.h
diff --git a/modules/codec/hevc_nal.c b/modules/packetizer/hevc_nal.c
similarity index 100%
rename from modules/codec/hevc_nal.c
rename to modules/packetizer/hevc_nal.c
diff --git a/modules/codec/hevc_nal.h b/modules/packetizer/hevc_nal.h
similarity index 100%
rename from modules/codec/hevc_nal.h
rename to modules/packetizer/hevc_nal.h
More information about the vlc-commits
mailing list