amlhwdmx: CF1 change src to aml-hwdemux [1/1]
PD#SWPL-179465
Problem:
need to change src to aml-hwdemx
Solution:
change src to aml-hwdemx
Verify:
ap222
Change-Id: I779aab04e2fab038c838110320f9f3f934d2e40e
Signed-off-by: hanghang.luo <hanghang.luo@amlogic.com>
diff --git a/Makefile.am b/Makefile.am
index daa62bc..1e99d5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
if HWDEMUX
-AMLHWDEMUX = src
+AMLHWDEMUX = aml-hwdemux
endif
if QTDEMUX
diff --git a/src/Makefile.am b/aml-hwdemux/Makefile.am
similarity index 100%
rename from src/Makefile.am
rename to aml-hwdemux/Makefile.am
diff --git a/src/aml_defs.h b/aml-hwdemux/aml_defs.h
similarity index 99%
rename from src/aml_defs.h
rename to aml-hwdemux/aml_defs.h
index 542fc69..08b3098 100644
--- a/src/aml_defs.h
+++ b/aml-hwdemux/aml_defs.h
@@ -242,7 +242,7 @@
GST_MTS_DESC_DVB_CELL_LIST = 0x6C,
GST_MTS_DESC_DVB_CELL_FREQUENCY_LINK = 0x6D,
GST_MTS_DESC_DVB_ANNOUNCEMENT_SUPPORT = 0x6E,
- GST_MTS_DESC_DVB_APPLICATION_SIGNALLING = 0x6F,
+ GST_MTS_DESC_DVB_APPLICATION_SIGNALING = 0x6F,
GST_MTS_DESC_DVB_ADAPTATION_FIELD_DATA = 0x70,
GST_MTS_DESC_DVB_SERVICE_IDENTIFIER = 0x71,
GST_MTS_DESC_DVB_SERVICE_AVAILABILITY = 0x72,
diff --git a/src/gstamladapterpipe.c b/aml-hwdemux/gstamladapterpipe.c
similarity index 100%
rename from src/gstamladapterpipe.c
rename to aml-hwdemux/gstamladapterpipe.c
diff --git a/src/gstamladapterpipe.h b/aml-hwdemux/gstamladapterpipe.h
similarity index 98%
rename from src/gstamladapterpipe.h
rename to aml-hwdemux/gstamladapterpipe.h
index 05eebda..e222cc2 100644
--- a/src/gstamladapterpipe.h
+++ b/aml-hwdemux/gstamladapterpipe.h
@@ -61,7 +61,7 @@
#define GST_ADAPTER_PIPE_SIGNAL(m) \
G_STMT_START \
{ \
- GST_TRACE("signalling from thread %p", g_thread_self()); \
+ GST_TRACE("signaling from thread %p", g_thread_self()); \
g_cond_signal(&m->cond); \
} \
G_STMT_END
diff --git a/src/gstamldmabufmgrwrap.c b/aml-hwdemux/gstamldmabufmgrwrap.c
similarity index 100%
rename from src/gstamldmabufmgrwrap.c
rename to aml-hwdemux/gstamldmabufmgrwrap.c
diff --git a/src/gstamldmabufmgrwrap.h b/aml-hwdemux/gstamldmabufmgrwrap.h
similarity index 100%
rename from src/gstamldmabufmgrwrap.h
rename to aml-hwdemux/gstamldmabufmgrwrap.h
diff --git a/src/gstamldmx.c b/aml-hwdemux/gstamldmx.c
similarity index 99%
rename from src/gstamldmx.c
rename to aml-hwdemux/gstamldmx.c
index 8e16d81..9426d09 100644
--- a/src/gstamldmx.c
+++ b/aml-hwdemux/gstamldmx.c
@@ -1046,7 +1046,7 @@
/* do the seek, segment.position contains new position. */
// TODO:real seek
- /* if successfull seek, we update our real segment and push out the new segment. */
+ /* if successful seek, we update our real segment and push out the new segment. */
if (res)
{
memcpy(&amlhwdmx->segment, &seeksegment, sizeof(GstSegment));
diff --git a/src/gstamldmx.h b/aml-hwdemux/gstamldmx.h
similarity index 100%
rename from src/gstamldmx.h
rename to aml-hwdemux/gstamldmx.h
diff --git a/src/gstamldmxfilter.c b/aml-hwdemux/gstamldmxfilter.c
similarity index 100%
rename from src/gstamldmxfilter.c
rename to aml-hwdemux/gstamldmxfilter.c
diff --git a/src/gstamldmxfilter.h b/aml-hwdemux/gstamldmxfilter.h
similarity index 100%
rename from src/gstamldmxfilter.h
rename to aml-hwdemux/gstamldmxfilter.h
diff --git a/src/gstamldmxmgr.c b/aml-hwdemux/gstamldmxmgr.c
similarity index 100%
rename from src/gstamldmxmgr.c
rename to aml-hwdemux/gstamldmxmgr.c
diff --git a/src/gstamldmxmgr.h b/aml-hwdemux/gstamldmxmgr.h
similarity index 100%
rename from src/gstamldmxmgr.h
rename to aml-hwdemux/gstamldmxmgr.h
diff --git a/src/gstamldmxwrap.c b/aml-hwdemux/gstamldmxwrap.c
similarity index 100%
rename from src/gstamldmxwrap.c
rename to aml-hwdemux/gstamldmxwrap.c
diff --git a/src/gstamldmxwrap.h b/aml-hwdemux/gstamldmxwrap.h
similarity index 100%
rename from src/gstamldmxwrap.h
rename to aml-hwdemux/gstamldmxwrap.h
diff --git a/src/libdvr_include/am_crypt.h b/aml-hwdemux/libdvr_include/am_crypt.h
similarity index 100%
rename from src/libdvr_include/am_crypt.h
rename to aml-hwdemux/libdvr_include/am_crypt.h
diff --git a/src/libdvr_include/des.h b/aml-hwdemux/libdvr_include/des.h
similarity index 100%
rename from src/libdvr_include/des.h
rename to aml-hwdemux/libdvr_include/des.h
diff --git a/src/libdvr_include/dmx.h b/aml-hwdemux/libdvr_include/dmx.h
similarity index 100%
rename from src/libdvr_include/dmx.h
rename to aml-hwdemux/libdvr_include/dmx.h
diff --git a/src/libdvr_include/dvb_dmx_wrapper.h b/aml-hwdemux/libdvr_include/dvb_dmx_wrapper.h
similarity index 100%
rename from src/libdvr_include/dvb_dmx_wrapper.h
rename to aml-hwdemux/libdvr_include/dvb_dmx_wrapper.h
diff --git a/src/libdvr_include/dvb_frontend_wrapper.h b/aml-hwdemux/libdvr_include/dvb_frontend_wrapper.h
similarity index 100%
rename from src/libdvr_include/dvb_frontend_wrapper.h
rename to aml-hwdemux/libdvr_include/dvb_frontend_wrapper.h
diff --git a/src/libdvr_include/dvb_utils.h b/aml-hwdemux/libdvr_include/dvb_utils.h
similarity index 100%
rename from src/libdvr_include/dvb_utils.h
rename to aml-hwdemux/libdvr_include/dvb_utils.h
diff --git a/src/libdvr_include/dvr_crypto.h b/aml-hwdemux/libdvr_include/dvr_crypto.h
similarity index 100%
rename from src/libdvr_include/dvr_crypto.h
rename to aml-hwdemux/libdvr_include/dvr_crypto.h
diff --git a/src/libdvr_include/dvr_mutex.h b/aml-hwdemux/libdvr_include/dvr_mutex.h
similarity index 100%
rename from src/libdvr_include/dvr_mutex.h
rename to aml-hwdemux/libdvr_include/dvr_mutex.h
diff --git a/src/libdvr_include/dvr_playback.h b/aml-hwdemux/libdvr_include/dvr_playback.h
similarity index 98%
rename from src/libdvr_include/dvr_playback.h
rename to aml-hwdemux/libdvr_include/dvr_playback.h
index 276e0a6..a289279 100644
--- a/src/libdvr_include/dvr_playback.h
+++ b/aml-hwdemux/libdvr_include/dvr_playback.h
@@ -118,7 +118,7 @@
typedef struct
{
Playback_Speeds_t speed; /**< playback speed */
- DVR_PlaybackSpeedMode_t mode; /**< playback 0: fast forword or 1: fast backword*/
+ DVR_PlaybackSpeedMode_t mode; /**< playback 0: fast forward or 1: fast backward*/
} DVR_PlaybackSpeed_t;
@@ -140,7 +140,7 @@
typedef enum
{
DVR_PLAYBACK_PID_ERROR, /**< uninit state */
- DVR_PLAYBACK_FMT_ERROR /**< fmt not support backword */
+ DVR_PLAYBACK_FMT_ERROR /**< fmt not support backward */
} DVR_PlaybackError_t;
@@ -151,7 +151,7 @@
DVR_PLAYBACK_STATE_STOP, /**< stop */
DVR_PLAYBACK_STATE_PAUSE, /**< pause */
DVR_PLAYBACK_STATE_FF, /**< fast forward */
- DVR_PLAYBACK_STATE_FB /**< fast backword */
+ DVR_PLAYBACK_STATE_FB /**< fast backward */
} DVR_PlaybackPlayState_t;
/**\brief playback play status*/
@@ -255,7 +255,7 @@
DVR_PLAYBACK_CMD_RESUME, /**< resume */
DVR_PLAYBACK_CMD_SEEK, /**< seek */
DVR_PLAYBACK_CMD_FF, /**< fast forward */
- DVR_PLAYBACK_CMD_FB, /**< fast backword */
+ DVR_PLAYBACK_CMD_FB, /**< fast backward */
DVR_PLAYBACK_CMD_NONE, /**< none */
} DVR_PlaybackCmd_t;
@@ -292,7 +292,7 @@
typedef struct
{
am_tsplayer_handle handle; /**< tsplayer handle */
- DVR_Bool_t segment_is_open; /**<segment is opend*/
+ DVR_Bool_t segment_is_open; /**<segment is opened*/
uint64_t cur_segment_id; /**< Current segment id*/
DVR_PlaybackSegmentInfo_t cur_segment; /**< Current playing segment*/
uint64_t last_segment_id; /**< last segment id*/
@@ -306,7 +306,7 @@
float speed; /**< playback speed*/
DVR_PlaybackPlayState_t state; /**< playback state*/
DVR_PlaybackFlag_t play_flag; /**< playback play flag*/
- int is_running; /**< playback htread is runing*/
+ int is_running; /**< playback htread is running*/
DVR_PlaybackCmdInfo_t cmd; /**< playback cmd*/
int offset; /**< segment read offset*/
uint32_t dur; /**< segment dur*/
diff --git a/src/libdvr_include/dvr_record.h b/aml-hwdemux/libdvr_include/dvr_record.h
similarity index 100%
rename from src/libdvr_include/dvr_record.h
rename to aml-hwdemux/libdvr_include/dvr_record.h
diff --git a/src/libdvr_include/dvr_segment.h b/aml-hwdemux/libdvr_include/dvr_segment.h
similarity index 100%
rename from src/libdvr_include/dvr_segment.h
rename to aml-hwdemux/libdvr_include/dvr_segment.h
diff --git a/src/libdvr_include/dvr_types.h b/aml-hwdemux/libdvr_include/dvr_types.h
similarity index 100%
rename from src/libdvr_include/dvr_types.h
rename to aml-hwdemux/libdvr_include/dvr_types.h
diff --git a/src/libdvr_include/dvr_utils.h b/aml-hwdemux/libdvr_include/dvr_utils.h
similarity index 100%
rename from src/libdvr_include/dvr_utils.h
rename to aml-hwdemux/libdvr_include/dvr_utils.h
diff --git a/src/libdvr_include/dvr_wrapper.h b/aml-hwdemux/libdvr_include/dvr_wrapper.h
similarity index 100%
rename from src/libdvr_include/dvr_wrapper.h
rename to aml-hwdemux/libdvr_include/dvr_wrapper.h
diff --git a/src/libdvr_include/frontend.h b/aml-hwdemux/libdvr_include/frontend.h
similarity index 100%
rename from src/libdvr_include/frontend.h
rename to aml-hwdemux/libdvr_include/frontend.h
diff --git a/src/libdvr_include/index_file.h b/aml-hwdemux/libdvr_include/index_file.h
similarity index 100%
rename from src/libdvr_include/index_file.h
rename to aml-hwdemux/libdvr_include/index_file.h
diff --git a/src/libdvr_include/list.h b/aml-hwdemux/libdvr_include/list.h
similarity index 100%
rename from src/libdvr_include/list.h
rename to aml-hwdemux/libdvr_include/list.h
diff --git a/src/libdvr_include/list_file.h b/aml-hwdemux/libdvr_include/list_file.h
similarity index 100%
rename from src/libdvr_include/list_file.h
rename to aml-hwdemux/libdvr_include/list_file.h
diff --git a/src/libdvr_include/record_device.h b/aml-hwdemux/libdvr_include/record_device.h
similarity index 100%
rename from src/libdvr_include/record_device.h
rename to aml-hwdemux/libdvr_include/record_device.h
diff --git a/src/libdvr_include/segment.h b/aml-hwdemux/libdvr_include/segment.h
similarity index 98%
rename from src/libdvr_include/segment.h
rename to aml-hwdemux/libdvr_include/segment.h
index bcc2709..7c7a5d2 100644
--- a/src/libdvr_include/segment.h
+++ b/aml-hwdemux/libdvr_include/segment.h
@@ -98,7 +98,7 @@
*/
loff_t segment_tell_position(Segment_Handle_t handle);
-/**\brief Tell position time of the given segment's postion. Function is used for playback.
+/**\brief Tell position time of the given segment's position. Function is used for playback.
* \param[in] handle, Segment handle
* \param[in] position, Segment's file position
* \return position time in ms on success, or -1 on failure
diff --git a/src/ts_patpmt_parse.c b/aml-hwdemux/ts_patpmt_parse.c
similarity index 100%
rename from src/ts_patpmt_parse.c
rename to aml-hwdemux/ts_patpmt_parse.c
diff --git a/src/ts_patpmt_parse.h b/aml-hwdemux/ts_patpmt_parse.h
similarity index 100%
rename from src/ts_patpmt_parse.h
rename to aml-hwdemux/ts_patpmt_parse.h
diff --git a/configure.ac b/configure.ac
index e9196ca..074cba2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@
GST_REQUIRED=1.0.0
DRM_REQUIRED=2.4
-AC_CONFIG_SRCDIR([src])
+AC_CONFIG_SRCDIR([aml-hwdemux])
AC_CONFIG_SRCDIR([aml-qtdemux])
AC_CONFIG_SRCDIR([aml-tsdemux])
AC_CONFIG_HEADERS([config.h])
@@ -122,6 +122,6 @@
AM_CONDITIONAL([TSDEMUX], [test x${amltsdemux} = xtrue])
AC_CONFIG_FILES([Makefile
- src/Makefile aml-qtdemux/Makefile aml-tsdemux/Makefile
+ aml-hwdemux/Makefile aml-qtdemux/Makefile aml-tsdemux/Makefile
])
AC_OUTPUT