Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dvblast
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
dvblast
Commits
64ff46a1
Commit
64ff46a1
authored
Aug 22, 2011
by
Christophe Massiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* ALL: Take into account biTStream's API change (rename rtp_cc in seqnum).
parent
5d795dc7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
dvblast.h
dvblast.h
+1
-1
output.c
output.c
+2
-2
udp.c
udp.c
+3
-3
No files found.
dvblast.h
View file @
64ff46a1
...
@@ -111,7 +111,7 @@ typedef struct output_t
...
@@ -111,7 +111,7 @@ typedef struct output_t
/* output */
/* output */
int
i_handle
;
int
i_handle
;
packet_t
*
p_packets
,
*
p_last_packet
;
packet_t
*
p_packets
,
*
p_last_packet
;
uint16_t
i_
cc
;
uint16_t
i_
seqnum
;
mtime_t
i_ref_timestamp
;
mtime_t
i_ref_timestamp
;
mtime_t
i_ref_wallclock
;
mtime_t
i_ref_wallclock
;
...
...
output.c
View file @
64ff46a1
...
@@ -118,7 +118,7 @@ int output_Init( output_t *p_output, const output_config_t *p_config )
...
@@ -118,7 +118,7 @@ int output_Init( output_t *p_output, const output_config_t *p_config )
/* Init run-time values */
/* Init run-time values */
p_output
->
p_packets
=
p_output
->
p_last_packet
=
NULL
;
p_output
->
p_packets
=
p_output
->
p_last_packet
=
NULL
;
p_output
->
i_
cc
=
rand
()
&
0xffff
;
p_output
->
i_
seqnum
=
rand
()
&
0xffff
;
p_output
->
i_pat_cc
=
rand
()
&
0xf
;
p_output
->
i_pat_cc
=
rand
()
&
0xf
;
p_output
->
i_pmt_cc
=
rand
()
&
0xf
;
p_output
->
i_pmt_cc
=
rand
()
&
0xf
;
p_output
->
i_nit_cc
=
rand
()
&
0xf
;
p_output
->
i_nit_cc
=
rand
()
&
0xf
;
...
@@ -260,7 +260,7 @@ static void output_Flush( output_t *p_output )
...
@@ -260,7 +260,7 @@ static void output_Flush( output_t *p_output )
rtp_set_hdr
(
p_rtp_hdr
);
rtp_set_hdr
(
p_rtp_hdr
);
rtp_set_type
(
p_rtp_hdr
,
RTP_TYPE_TS
);
rtp_set_type
(
p_rtp_hdr
,
RTP_TYPE_TS
);
rtp_set_
cc
(
p_rtp_hdr
,
p_output
->
i_cc
++
);
rtp_set_
seqnum
(
p_rtp_hdr
,
p_output
->
i_seqnum
++
);
rtp_set_timestamp
(
p_rtp_hdr
,
rtp_set_timestamp
(
p_rtp_hdr
,
p_output
->
i_ref_timestamp
p_output
->
i_ref_timestamp
+
(
p_packet
->
i_dts
-
p_output
->
i_ref_wallclock
)
+
(
p_packet
->
i_dts
-
p_output
->
i_ref_wallclock
)
...
...
udp.c
View file @
64ff46a1
...
@@ -52,7 +52,7 @@ static int i_handle;
...
@@ -52,7 +52,7 @@ static int i_handle;
static
bool
b_udp
=
false
;
static
bool
b_udp
=
false
;
static
int
i_block_cnt
;
static
int
i_block_cnt
;
static
uint8_t
pi_ssrc
[
4
]
=
{
0
,
0
,
0
,
0
};
static
uint8_t
pi_ssrc
[
4
]
=
{
0
,
0
,
0
,
0
};
static
uint16_t
i_
cc
=
0
;
static
uint16_t
i_
seqnum
=
0
;
static
mtime_t
i_last_packet
=
0
;
static
mtime_t
i_last_packet
=
0
;
/*****************************************************************************
/*****************************************************************************
...
@@ -316,7 +316,7 @@ block_t *udp_Read( mtime_t i_poll_timeout )
...
@@ -316,7 +316,7 @@ block_t *udp_Read( mtime_t i_poll_timeout )
rtp_get_ssrc
(
p_rtp_hdr
,
pi_new_ssrc
);
rtp_get_ssrc
(
p_rtp_hdr
,
pi_new_ssrc
);
if
(
!
memcmp
(
pi_ssrc
,
pi_new_ssrc
,
4
*
sizeof
(
uint8_t
)
)
)
if
(
!
memcmp
(
pi_ssrc
,
pi_new_ssrc
,
4
*
sizeof
(
uint8_t
)
)
)
{
{
if
(
rtp_get_
cc
(
p_rtp_hdr
)
!=
i_cc
)
if
(
rtp_get_
seqnum
(
p_rtp_hdr
)
!=
i_seqnum
)
msg_Warn
(
NULL
,
"RTP discontinuity"
);
msg_Warn
(
NULL
,
"RTP discontinuity"
);
}
}
else
else
...
@@ -334,7 +334,7 @@ block_t *udp_Read( mtime_t i_poll_timeout )
...
@@ -334,7 +334,7 @@ block_t *udp_Read( mtime_t i_poll_timeout )
printf
(
"new RTP source: %s
\n
"
,
inet_ntoa
(
addr
)
);
printf
(
"new RTP source: %s
\n
"
,
inet_ntoa
(
addr
)
);
}
}
}
}
i_
cc
=
rtp_get_cc
(
p_rtp_hdr
)
+
1
;
i_
seqnum
=
rtp_get_seqnum
(
p_rtp_hdr
)
+
1
;
i_len
-=
RTP_HEADER_SIZE
;
i_len
-=
RTP_HEADER_SIZE
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment