diff options
author | Sébastien Moutte <sebastien@moutte.net> | 2007-05-09 21:30:53 +0000 |
---|---|---|
committer | Sébastien Moutte <sebastien@moutte.net> | 2007-05-09 21:30:53 +0000 |
commit | f636fb8b343fb64818c4cce80f9b32a1fa90804e (patch) | |
tree | e419c9db6cd64c7ae864265b0b073fab522b02f2 | |
parent | d29215b257667ccd56a5fa3157281cc386604921 (diff) |
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.
-rw-r--r-- | ChangeLog | 13 | ||||
m--------- | common | 0 | ||||
-rw-r--r-- | gst/level/gstlevel.c | 6 | ||||
-rw-r--r-- | gst/rtp/gstrtph264pay.c | 6 | ||||
-rw-r--r-- | win32/vs6/autogen.dsp | 4 | ||||
-rw-r--r-- | win32/vs6/libgstrtp.dsp | 16 | ||||
-rw-r--r-- | win32/vs6/libgstrtsp.dsp | 8 |
7 files changed, 41 insertions, 12 deletions
@@ -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: diff --git a/common b/common -Subproject 61edc2dc7b8eba179d85a6545e46e0d65239e94 +Subproject a6e41a42ec1b93fddbd14b2e5af87e2d456b896 diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c index 3edef456..91d787bf 100644 --- a/gst/level/gstlevel.c +++ b/gst/level/gstlevel.c @@ -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 diff --git a/gst/rtp/gstrtph264pay.c b/gst/rtp/gstrtph264pay.c index 5dd7f6fa..afb1e671 100644 --- a/gst/rtp/gstrtph264pay.c +++ b/gst/rtp/gstrtph264pay.c @@ -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--; diff --git a/win32/vs6/autogen.dsp b/win32/vs6/autogen.dsp index dcb28a57..ca421a61 100644 --- a/win32/vs6/autogen.dsp +++ b/win32/vs6/autogen.dsp @@ -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 diff --git a/win32/vs6/libgstrtp.dsp b/win32/vs6/libgstrtp.dsp index 2854bd94..571baac3 100644 --- a/win32/vs6/libgstrtp.dsp +++ b/win32/vs6/libgstrtp.dsp @@ -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 diff --git a/win32/vs6/libgstrtsp.dsp b/win32/vs6/libgstrtsp.dsp index 697314bd..f441933a 100644 --- a/win32/vs6/libgstrtsp.dsp +++ b/win32/vs6/libgstrtsp.dsp @@ -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 |