hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed HTTP Dynamic, for now.

Browse source
This commit is contained in:
Thulinma 2011-10-07 03:52:20 +02:00
parent 63a7100cc3
commit 40dabbbc33
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Connector_HTTP/main.cpp
View file

@ -246,16 +246,18 @@ namespace Connector_HTTP{
tag.tagTime(tag.tagTime() - Flash_StartTime); tag.tagTime(tag.tagTime() - Flash_StartTime);
} }
if (tag.data[0] != 0x12 ) { if (tag.data[0] != 0x12 ) {
if ((tag.isKeyframe) && (Video_Init.len == 0)){ if ( (tag.data[0] == 0x09) && tag.isInitData()){
if (((tag.data[11] & 0x0f) == 7) && (tag.data[12] == 0)){ if (((tag.data[11] & 0x0f) == 7) && (tag.data[12] == 0)){
tag.tagTime(0);//timestamp to zero tag.tagTime(0);//timestamp to zero
Video_Init = tag; Video_Init = tag;
break;
} }
} }
if ((tag.data[0] == 0x08) && (Audio_Init.len == 0)){ if ((tag.data[0] == 0x08) && tag.isInitData()){
if (((tag.data[11] & 0xf0) >> 4) == 10){//aac packet if (((tag.data[11] & 0xf0) >> 4) == 10){//aac packet
tag.tagTime(0);//timestamp to zero tag.tagTime(0);//timestamp to zero
Audio_Init = tag; Audio_Init = tag;
break;
} }
} }
if (tag.isKeyframe){ if (tag.isKeyframe){
@ -269,15 +271,13 @@ namespace Connector_HTTP{
FlashFirstVideo = true; FlashFirstVideo = true;
FlashFirstAudio = true; FlashFirstAudio = true;
} }
if (FlashFirstVideo && (tag.data[0] == 0x09) && (!tag.needsInitData() || (Video_Init.len > 0))){ if (FlashFirstVideo){
if (tag.needsInitData()){ if (Video_Init.len > 0){
Video_Init.tagTime(tag.tagTime()); Video_Init.tagTime(tag.tagTime());
FlashBuf.append(Video_Init.data, Video_Init.len); FlashBuf.append(Video_Init.data, Video_Init.len);
} }
FlashFirstVideo = false; FlashFirstVideo = false;
} if (Audio_Init.len > 0){
if (FlashFirstAudio && (tag.data[0] == 0x08) && (!tag.needsInitData() || (Audio_Init.len > 0))){
if (tag.needsInitData()){
Audio_Init.tagTime(tag.tagTime()); Audio_Init.tagTime(tag.tagTime());
FlashBuf.append(Audio_Init.data, Audio_Init.len); FlashBuf.append(Audio_Init.data, Audio_Init.len);
} }
@ -286,7 +286,7 @@ namespace Connector_HTTP{
#if DEBUG >= 5 #if DEBUG >= 5
fprintf(stderr, "Received a tag of type %2hhu and length %i\n", tag.data[0], tag.len); fprintf(stderr, "Received a tag of type %2hhu and length %i\n", tag.data[0], tag.len);
#endif #endif
if ((Video_Init.len > 0) && (Audio_Init.len > 0)){ if (!FlashFirstVideo && !FlashFirstAudio){
FlashBuf.append(tag.data,tag.len); FlashBuf.append(tag.data,tag.len);
} }
} else { } else {