Skip to content

Commit 70c8fe1

Browse files
committed
for ossrs#250, support h264 video for push mpegts over udp. 2.0.110
1 parent 66fccdb commit 70c8fe1

15 files changed

+940
-268
lines changed

trunk/configure

+2-1
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,8 @@ MODULE_ID="RTMP"
375375
MODULE_DEPENDS=("CORE" "KERNEL")
376376
ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot})
377377
MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" "srs_rtmp_sdk"
378-
"srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_rtmp_buffer")
378+
"srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_rtmp_buffer"
379+
"srs_raw_avc")
379380
RTMP_INCS="src/protocol"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh
380381
RTMP_OBJS="${MODULE_OBJS[@]}"
381382
#

trunk/ide/srs_upp/srs_upp.upp

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ file
4545
../../src/kernel/srs_kernel_utility.hpp,
4646
../../src/kernel/srs_kernel_utility.cpp,
4747
protocol readonly separator,
48+
../../src/protocol/srs_raw_avc.hpp,
49+
../../src/protocol/srs_raw_avc.cpp,
4850
../../src/protocol/srs_rtmp_amf0.hpp,
4951
../../src/protocol/srs_rtmp_amf0.cpp,
5052
../../src/protocol/srs_rtmp_buffer.hpp,

trunk/ide/srs_vs2010/srs.vcxproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3737
</ImportGroup>
3838
<PropertyGroup Label="UserMacros" />
39-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
39+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
4040
<IncludePath>$(ProjectDir)/../../src/core;$(ProjectDir)/../../src/kernel;$(ProjectDir)/../../src/protocol;$(ProjectDir)/../../src/app;$(ProjectDir)/../../src/libs;$(ProjectDir)/../../objs;$(IncludePath)</IncludePath>
4141
</PropertyGroup>
4242
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -116,6 +116,7 @@
116116
<ClInclude Include="..\..\src\libs\srs_librtmp.hpp" />
117117
<ClInclude Include="..\..\src\libs\srs_lib_bandwidth.hpp" />
118118
<ClInclude Include="..\..\src\libs\srs_lib_simple_socket.hpp" />
119+
<ClInclude Include="..\..\src\protocol\srs_raw_avc.hpp" />
119120
<ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp" />
120121
<ClInclude Include="..\..\src\protocol\srs_rtmp_buffer.hpp" />
121122
<ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp" />
@@ -193,6 +194,7 @@
193194
<ClCompile Include="..\..\src\libs\srs_lib_bandwidth.cpp" />
194195
<ClCompile Include="..\..\src\libs\srs_lib_simple_socket.cpp" />
195196
<ClCompile Include="..\..\src\main\srs_main_server.cpp" />
197+
<ClCompile Include="..\..\src\protocol\srs_raw_avc.cpp" />
196198
<ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp" />
197199
<ClCompile Include="..\..\src\protocol\srs_rtmp_buffer.cpp" />
198200
<ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp" />

trunk/ide/srs_vs2010/srs.vcxproj.filters

+6
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,9 @@
226226
<ClCompile Include="..\..\src\app\srs_app_mpegts_udp.cpp">
227227
<Filter>srs</Filter>
228228
</ClCompile>
229+
<ClCompile Include="..\..\src\protocol\srs_raw_avc.cpp">
230+
<Filter>srs</Filter>
231+
</ClCompile>
229232
</ItemGroup>
230233
<ItemGroup>
231234
<ClInclude Include="..\..\src\app\srs_app_bandwidth.hpp">
@@ -414,6 +417,9 @@
414417
<ClInclude Include="..\..\src\app\srs_app_mpegts_udp.hpp">
415418
<Filter>srs</Filter>
416419
</ClInclude>
420+
<ClInclude Include="..\..\src\protocol\srs_raw_avc.hpp">
421+
<Filter>srs</Filter>
422+
</ClInclude>
417423
</ItemGroup>
418424
<ItemGroup>
419425
<Filter Include="research">

trunk/src/app/srs_app_edge.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ int SrsEdgeForwarder::start()
447447
}
448448

449449
if ((ret = client->publish(req->stream, stream_id)) != ERROR_SUCCESS) {
450-
srs_error("connect with server failed, stream=%s, stream_id=%d. ret=%d",
450+
srs_error("publish failed, stream=%s, stream_id=%d. ret=%d",
451451
req->stream.c_str(), stream_id, ret);
452452
return ret;
453453
}

0 commit comments

Comments
 (0)