Skip to content

GitLab

Commit afb00c72 authored by Simon Morlat's avatar Simon Morlat
Browse files
Options

update vs build, export all api

parent fddd83c7
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 20 deletions
NEWS
View file @ afb00c72
mediastreamer-2.7.1:
* enhance build for visual studio
mediastreamer-2.7.0: February 7th, 2011
* add android video capture filter
* add android video display filters: one for 2.1 and one for 2.2+
......
build/win32native/mediastream/mediastream.vcproj
View file @ afb00c72
......@@ -90,7 +90,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="echo on&#x0D;&#x0A;mkdir &quot;$(TargetDir)\lib\mediastreamer\plugins&quot; &quot;$(TargetDir)\libexec&quot;&#x0D;&#x0A;copy ..\..\..\..\h264encserver\build\vs\h264encserver\$(IntDir)\*.exe &quot;$(TargetDir)\libexec&quot;&#x0D;&#x0A;copy ..\..\..\..\msremoteh264\build\vs\$(IntDir)\*.dll &quot;$(TargetDir)\lib\mediastreamer\plugins&quot;&#x0D;&#x0A;copy ..\..\..\..\ortp\build\win32native\ortp.dll &quot;$(TargetDir)&quot;&#x0D;&#x0A;copy ..\..\..\..\linphone-deps\bin\*.dll &quot;$(TargetDir)&quot;&#x0D;&#x0A;&#x0D;&#x0A;"
CommandLine="echo on&#x0D;&#x0A;mkdir &quot;$(TargetDir)\lib\mediastreamer\plugins&quot; &quot;$(TargetDir)\libexec&quot;&#x0D;&#x0A;copy ..\..\..\..\h264encserver\build\vs\h264encserver\$(IntDir)\*.exe &quot;$(TargetDir)\libexec&quot;&#x0D;&#x0A;copy ..\..\..\..\msremoteh264\build\vs\$(IntDir)\*.dll &quot;$(TargetDir)\lib\mediastreamer\plugins&quot;&#x0D;&#x0A;copy ..\..\..\..\ortp\build\win32native\ortp.dll &quot;$(TargetDir)&quot;&#x0D;&#x0A;copy ..\..\..\..\linphone-deps\bin\*.dll &quot;$(TargetDir)&quot;&#x0D;&#x0A;copy ..\..\..\..\msx264\build\vs\$(IntDir)\*.dll &quot;$(TargetDir)\lib\mediastreamer\plugins&quot;&#x0D;&#x0A;&#x0D;&#x0A;"
ExcludedFromBuild="false"
/>
</Configuration>
......@@ -167,6 +167,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="echo on&#x0D;&#x0A;mkdir &quot;$(TargetDir)\lib\mediastreamer\plugins&quot; &quot;$(TargetDir)\libexec&quot;&#x0D;&#x0A;copy ..\..\..\..\h264encserver\build\vs\h264encserver\$(IntDir)\*.exe &quot;$(TargetDir)\libexec&quot;&#x0D;&#x0A;copy ..\..\..\..\msremoteh264\build\vs\$(IntDir)\*.dll &quot;$(TargetDir)\lib\mediastreamer\plugins&quot;&#x0D;&#x0A;copy ..\..\..\..\ortp\build\win32native\ortp.dll &quot;$(TargetDir)&quot;&#x0D;&#x0A;copy ..\..\..\..\linphone-deps\bin\*.dll &quot;$(TargetDir)&quot;&#x0D;&#x0A;copy ..\..\..\..\msx264\build\vs\$(OutDir)\*.dll &quot;$(TargetDir)\lib\mediastreamer\plugins&quot;&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
......
build/win32native/mediastreamer2.sln
View file @ afb00c72
......@@ -13,6 +13,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediastream", "mediastream\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oRTP", "..\..\..\ortp\build\win32native\oRTP.vcproj", "{4A07BB2B-F56E-4F1B-A719-D28B782AC128}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msx264", "..\..\..\msx264\build\vs\msx264.vcproj", "{8A4A1340-5B83-4698-8F2A-B8DCCA0C3285}"
ProjectSection(ProjectDependencies) = postProject
{4A07BB2B-F56E-4F1B-A719-D28B782AC128} = {4A07BB2B-F56E-4F1B-A719-D28B782AC128}
{4A07BB2B-F56E-4F1B-A729-D28B782AC128} = {4A07BB2B-F56E-4F1B-A729-D28B782AC128}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
......@@ -31,6 +37,10 @@ Global
{4A07BB2B-F56E-4F1B-A719-D28B782AC128}.Debug|Win32.Build.0 = Debug|Win32
{4A07BB2B-F56E-4F1B-A719-D28B782AC128}.Release|Win32.ActiveCfg = Release|Win32
{4A07BB2B-F56E-4F1B-A719-D28B782AC128}.Release|Win32.Build.0 = Release|Win32
{8A4A1340-5B83-4698-8F2A-B8DCCA0C3285}.Debug|Win32.ActiveCfg = Debug|Win32
{8A4A1340-5B83-4698-8F2A-B8DCCA0C3285}.Debug|Win32.Build.0 = Debug|Win32
{8A4A1340-5B83-4698-8F2A-B8DCCA0C3285}.Release|Win32.ActiveCfg = Release|Win32
{8A4A1340-5B83-4698-8F2A-B8DCCA0C3285}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
build/win32native/mediastreamer2.vcproj
View file @ afb00c72
......@@ -150,12 +150,12 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libavcodec.dll.a swscale-0.lib libogg.lib libtheora.lib vfw32.lib Ws2_32.lib Winmm.lib ortp.lib libspeex.a libspeexdsp.a libgsm.a libgcc.a"
AdditionalDependencies="libavcodec.dll.a swscale-0.lib libavutil.dll.a libogg.lib libtheora.lib vfw32.lib Ws2_32.lib Winmm.lib ortp.lib libspeex.a libspeexdsp.a libgsm.a libgcc.a"
OutputFile="$(IntDir)/mediastreamer2.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\linphone-deps\lib&quot;;..\..\..\oRTP\build\win32native\debug"
AdditionalLibraryDirectories="&quot;..\..\..\linphone-deps\lib&quot;;&quot;..\..\..\oRTP\build\win32native\$(OutDir)&quot;"
IgnoreAllDefaultLibraries="false"
ModuleDefinitionFile="mediastreamer2.def"
ModuleDefinitionFile=""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mediastreamer2.pdb"
SubSystem="2"
......@@ -541,6 +541,10 @@
RelativePath="..\..\include\mediastreamer2\rfc2429.h"
>
</File>
<File
RelativePath="..\..\include\mediastreamer2\rfc3984.h"
>
</File>
<File
RelativePath="..\..\src\vfw-missing.h"
>
......
include/mediastreamer2/msqueue.h
View file @ afb00c72
......@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define MSQUEUE_H
#include "ortp/str_utils.h"
#include "mediastreamer2/mscommon.h"
/* for the moment these are stupid queues limited to one element*/
......@@ -64,12 +65,14 @@ extern "C"
{
#endif
/*yes these functions need to be public for plugins to work*/
/*init a queue on stack*/
void ms_queue_init(MSQueue *q);
MS2_PUBLIC void ms_queue_init(MSQueue *q);
void ms_queue_flush(MSQueue *q);
MS2_PUBLIC void ms_queue_flush(MSQueue *q);
void ms_queue_destroy(MSQueue *q);
MS2_PUBLIC void ms_queue_destroy(MSQueue *q);
......@@ -97,31 +100,31 @@ struct _MSBufferizer{
typedef struct _MSBufferizer MSBufferizer;
/*allocates and initialize */
MSBufferizer * ms_bufferizer_new(void);
MS2_PUBLIC MSBufferizer * ms_bufferizer_new(void);
/*initialize in memory */
void ms_bufferizer_init(MSBufferizer *obj);
void ms_bufferizer_put(MSBufferizer *obj, mblk_t *m);
MS2_PUBLIC void ms_bufferizer_put(MSBufferizer *obj, mblk_t *m);
/* put every mblk_t from q, into the bufferizer */
void ms_bufferizer_put_from_queue(MSBufferizer *obj, MSQueue *q);
MS2_PUBLIC void ms_bufferizer_put_from_queue(MSBufferizer *obj, MSQueue *q);
int ms_bufferizer_read(MSBufferizer *obj, uint8_t *data, int datalen);
MS2_PUBLIC int ms_bufferizer_read(MSBufferizer *obj, uint8_t *data, int datalen);
/* returns the number of bytes available in the bufferizer*/
static inline int ms_bufferizer_get_avail(MSBufferizer *obj){
return obj->size;
}
void ms_bufferizer_skip_bytes(MSBufferizer *obj, int bytes);
MS2_PUBLIC void ms_bufferizer_skip_bytes(MSBufferizer *obj, int bytes);
/* purge all data pending in the bufferizer */
void ms_bufferizer_flush(MSBufferizer *obj);
MS2_PUBLIC void ms_bufferizer_flush(MSBufferizer *obj);
void ms_bufferizer_uninit(MSBufferizer *obj);
void ms_bufferizer_destroy(MSBufferizer *obj);
MS2_PUBLIC void ms_bufferizer_destroy(MSBufferizer *obj);
#ifdef __cplusplus
}
......
include/mediastreamer2/rfc3984.h
View file @ afb00c72
......@@ -23,6 +23,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "mediastreamer2/mscommon.h"
#include "mediastreamer2/msqueue.h"
/*
This file declares an API useful to pack/unpack H264 nals as described in RFC3984
It is part of the public API to allow external H264 plugins use this api.
*/
#ifdef __cplusplus
extern "C"{
#endif
......@@ -37,21 +42,21 @@ typedef struct Rfc3984Context{
uint8_t reserved;
} Rfc3984Context;
Rfc3984Context *rfc3984_new(void);
void rfc3984_destroy(Rfc3984Context *ctx);
MS2_PUBLIC Rfc3984Context *rfc3984_new(void);
MS2_PUBLIC void rfc3984_destroy(Rfc3984Context *ctx);
void rfc3984_init(Rfc3984Context *ctx);
void rfc3984_set_mode(Rfc3984Context *ctx, int mode);
MS2_PUBLIC void rfc3984_set_mode(Rfc3984Context *ctx, int mode);
/* some stupid phones don't decode STAP-A packets ...*/
void rfc3984_enable_stap_a(Rfc3984Context *ctx, bool_t yesno);
MS2_PUBLIC void rfc3984_enable_stap_a(Rfc3984Context *ctx, bool_t yesno);
/*process NALUs and pack them into rtp payloads */
void rfc3984_pack(Rfc3984Context *ctx, MSQueue *naluq, MSQueue *rtpq, uint32_t ts);
MS2_PUBLIC void rfc3984_pack(Rfc3984Context *ctx, MSQueue *naluq, MSQueue *rtpq, uint32_t ts);
/*process incoming rtp data and output NALUs, whenever possible*/
void rfc3984_unpack(Rfc3984Context *ctx, mblk_t *im, MSQueue *naluq);
MS2_PUBLIC void rfc3984_unpack(Rfc3984Context *ctx, mblk_t *im, MSQueue *naluq);
void rfc3984_uninit(Rfc3984Context *ctx);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment