mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-31 04:30:55 +00:00
gst/level/gstlevel.c: Use guint8 * instead of gpointer then vs6 know the size of data pointed when moving the pointer.
Original commit message from CVS: * gst/level/gstlevel.c: (gst_level_calculate_##TYPE), (gst_level_transform_ip): Use guint8 * instead of gpointer then vs6 know the size of data pointed when moving the pointer. * gst/rtp/gstrtph264pay.c: (gst_rtp_h264_pay_handle_buffer): Move instructions after variables declaration. * win32/vs6/autogen.dsp: * win32/vs6/libgstrtp.dsp: * win32/vs6/libgstrtsp.dsp: Update vs6 project files.
This commit is contained in:
Sébastien Moutte
parent
d29215b257
commit
f636fb8b34
7 changed files with 42 additions and 13 deletions
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,16 @@
|
|||
2007-05-09 Sebastien Moutte <sebastien@moutte.net>
|
||||
|
||||
* gst/level/gstlevel.c: (gst_level_calculate_##TYPE),
|
||||
(gst_level_transform_ip):
|
||||
Use guint8 * instead of gpointer then vs6 know the size of data
|
||||
pointed when moving the pointer.
|
||||
* gst/rtp/gstrtph264pay.c: (gst_rtp_h264_pay_handle_buffer):
|
||||
Move instructions after variables declaration.
|
||||
* win32/vs6/autogen.dsp:
|
||||
* win32/vs6/libgstrtp.dsp:
|
||||
* win32/vs6/libgstrtsp.dsp:
|
||||
Update vs6 project files.
|
||||
|
||||
2007-05-09 Wim Taymans <wim@fluendo.com>
|
||||
|
||||
* gst/rtsp/Makefile.am:
|
||||
|
|
|
|||
2
common
2
common
|
|
@ -1 +1 @@
|
|||
Subproject commit 61edc2dc7b8eba179d85a6545e46e0d65239e94d
|
||||
Subproject commit a6e41a42ec1b93fddbd14b2e5af87e2d456b8962
|
||||
|
|
@ -313,7 +313,7 @@ gst_level_get_property (GObject * object, guint prop_id,
|
|||
|
||||
#define DEFINE_INT_LEVEL_CALCULATOR(TYPE, RESOLUTION) \
|
||||
static void inline \
|
||||
gst_level_calculate_##TYPE (gpointer data, guint num, guint channels, \
|
||||
gst_level_calculate_##TYPE (guint8 *data, guint num, guint channels, \
|
||||
gdouble *NCS, gdouble *NPS) \
|
||||
{ \
|
||||
TYPE * in = (TYPE *)data; \
|
||||
|
|
@ -344,7 +344,7 @@ DEFINE_INT_LEVEL_CALCULATOR (gint8, 7);
|
|||
|
||||
#define DEFINE_FLOAT_LEVEL_CALCULATOR(TYPE) \
|
||||
static void inline \
|
||||
gst_level_calculate_##TYPE (gpointer data, guint num, guint channels, \
|
||||
gst_level_calculate_##TYPE (guint8 *data, guint num, guint channels, \
|
||||
gdouble *NCS, gdouble *NPS) \
|
||||
{ \
|
||||
TYPE * in = (TYPE *)data; \
|
||||
|
|
@ -534,7 +534,7 @@ static GstFlowReturn
|
|||
gst_level_transform_ip (GstBaseTransform * trans, GstBuffer * in)
|
||||
{
|
||||
GstLevel *filter;
|
||||
gpointer in_data;
|
||||
guint8 *in_data;
|
||||
double CS = 0.0;
|
||||
guint num_frames = 0;
|
||||
guint num_int_samples = 0; /* number of interleaved samples
|
||||
|
|
|
|||
|
|
@ -207,15 +207,15 @@ gst_rtp_h264_pay_handle_buffer (GstBaseRTPPayload * basepayload,
|
|||
ret = gst_basertppayload_push (basepayload, outbuf);
|
||||
return ret;
|
||||
} else {
|
||||
GST_DEBUG_OBJECT (basepayload,
|
||||
"NAL Unit DOES NOT fit in one packet datasize=%d mtu=%d", idxdata, mtu);
|
||||
|
||||
/* Fragmentation Units FU-A */
|
||||
guint8 nalHeader;
|
||||
guint limitedSize;
|
||||
|
||||
int ii = 0, start = 1, end = 0, first = 0;
|
||||
|
||||
GST_DEBUG_OBJECT (basepayload,
|
||||
"NAL Unit DOES NOT fit in one packet datasize=%d mtu=%d", idxdata, mtu);
|
||||
|
||||
nalHeader = *pdata;
|
||||
pdata++;
|
||||
idxdata--;
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ SOURCE="..\common\gstudp-enumtypes.c"
|
|||
!IF "$(CFG)" == "autogen - Win32 Release"
|
||||
|
||||
# Begin Custom Build
|
||||
InputPath=..\common\gstudp-enumtypes.c
|
||||
InputPath="..\common\gstudp-enumtypes.c"
|
||||
|
||||
BuildCmds= \
|
||||
copy /y ..\common\gstudp-enumtypes.c ..\..\gst\udp\gstudp-enumtypes.c \
|
||||
|
|
@ -134,7 +134,7 @@ BuildCmds= \
|
|||
!ELSEIF "$(CFG)" == "autogen - Win32 Debug"
|
||||
|
||||
# Begin Custom Build
|
||||
InputPath=..\common\gstudp-enumtypes.c
|
||||
InputPath="..\common\gstudp-enumtypes.c"
|
||||
|
||||
"..\..\gst\udp\gstudp-enumtypes.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy /y ..\common\gstudp-enumtypes.c ..\..\gst\udp\gstudp-enumtypes.c
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ RSC=rc.exe
|
|||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTRTP_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /O2 /I "./" /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTRTP_EXPORTS" /D "HAVE_CONFIG_H" /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /O2 /I "./" /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /I "../../gst/rtsp" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTRTP_EXPORTS" /D "HAVE_CONFIG_H" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
|
|
@ -75,7 +75,7 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\lib\gstreamer-0.10
|
|||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTRTP_EXPORTS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTRTP_EXPORTS" /D "HAVE_CONFIG_H" /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /I "../../gst/rtsp" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTRTP_EXPORTS" /D "HAVE_CONFIG_H" /FD /GZ /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
|
|
@ -104,6 +104,10 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10
|
|||
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\gst\rtp\fnv1hash.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\gst\rtp\gstasteriskh263.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
@ -152,6 +156,10 @@ SOURCE=..\..\gst\rtp\gstrtph264depay.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\gst\rtp\gstrtph264pay.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\gst\rtp\gstrtpilbcdepay.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
@ -176,6 +184,10 @@ SOURCE=..\..\gst\rtp\gstrtpmp2tpay.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\gst\rtp\gstrtpmp4adepay.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\gst\rtp\gstrtpmp4gdepay.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 ws2_32.lib libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"
|
||||
# ADD LINK32 ws2_32.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtp-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"
|
||||
# Begin Special Build Tool
|
||||
TargetPath=.\Release\libgstrtsp.dll
|
||||
SOURCE="$(InputPath)"
|
||||
|
|
@ -86,7 +86,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 ws2_32.lib libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"
|
||||
# ADD LINK32 ws2_32.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtp-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"
|
||||
# Begin Special Build Tool
|
||||
TargetPath=.\Debug\libgstrtsp.dll
|
||||
SOURCE="$(InputPath)"
|
||||
|
|
@ -136,6 +136,10 @@ SOURCE=..\..\gst\rtsp\rtspmessage.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\gst\rtsp\rtsprange.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\gst\rtsp\rtsptransport.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
|
|||
Loading…
Reference in a new issue