Changeset baf568bd8ef0b334b89bfe8e5249f0ce4d420bb3
- Timestamp:
- 06/11/08 20:48:44
(3 months ago)
- Author:
- Rémi Denis-Courmont <rdenis@simphalempin.com>
- git-committer:
- Rémi Denis-Courmont <rdenis@simphalempin.com> 1213210124 +0300
- git-parent:
[c7a9cb6023cc1036e4e1762fd5c96956afc6216d]
- git-author:
- Rémi Denis-Courmont <rdenis@simphalempin.com> 1213210124 +0300
- Message:
RTP sout: use block_Alloc
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r832cb39 |
rbaf568b |
|
| 51 | 51 | { |
|---|
| 52 | 52 | int i_payload = __MIN( i_max, i_data ); |
|---|
| 53 | | block_t *out = block_New( p_stream, 16 + i_payload ); |
|---|
| | 53 | block_t *out = block_Alloc( 16 + i_payload ); |
|---|
| 54 | 54 | |
|---|
| 55 | 55 | /* rtp common header */ |
|---|
| … | … | |
| 146 | 146 | { |
|---|
| 147 | 147 | int i_payload = __MIN( i_max, i_data ); |
|---|
| 148 | | block_t *out = block_New( p_stream, |
|---|
| 149 | | 16 + i_payload ); |
|---|
| | 148 | block_t *out = block_Alloc( 16 + i_payload ); |
|---|
| 150 | 149 | uint32_t h = ( i_temporal_ref << 16 )| |
|---|
| 151 | 150 | ( b_sequence_start << 13 )| |
|---|
| … | … | |
| 193 | 192 | { |
|---|
| 194 | 193 | int i_payload = __MIN( i_max, i_data ); |
|---|
| 195 | | block_t *out = block_New( p_stream, 14 + i_payload ); |
|---|
| | 194 | block_t *out = block_Alloc( 14 + i_payload ); |
|---|
| 196 | 195 | |
|---|
| 197 | 196 | /* rtp common header */ |
|---|
| … | … | |
| 230 | 229 | { |
|---|
| 231 | 230 | int i_payload = __MIN( i_max, i_data ); |
|---|
| 232 | | block_t *out = block_New( p_stream, 12 + i_payload ); |
|---|
| | 231 | block_t *out = block_Alloc( 12 + i_payload ); |
|---|
| 233 | 232 | |
|---|
| 234 | 233 | /* rtp common header */ |
|---|
| … | … | |
| 269 | 268 | if( i != 0 ) |
|---|
| 270 | 269 | latmhdrsize = 0; |
|---|
| 271 | | out = block_New( p_stream, 12 + latmhdrsize + i_payload ); |
|---|
| | 270 | out = block_Alloc( 12 + latmhdrsize + i_payload ); |
|---|
| 272 | 271 | |
|---|
| 273 | 272 | /* rtp common header */ |
|---|
| … | … | |
| 317 | 316 | { |
|---|
| 318 | 317 | int i_payload = __MIN( i_max, i_data ); |
|---|
| 319 | | block_t *out = block_New( p_stream, 16 + i_payload ); |
|---|
| | 318 | block_t *out = block_Alloc( 16 + i_payload ); |
|---|
| 320 | 319 | |
|---|
| 321 | 320 | /* rtp common header */ |
|---|
| … | … | |
| 379 | 378 | { |
|---|
| 380 | 379 | int i_payload = __MIN( i_max, i_data ); |
|---|
| 381 | | block_t *out = block_New( p_stream, |
|---|
| 382 | | RTP_H263_PAYLOAD_START + i_payload ); |
|---|
| | 380 | block_t *out = block_Alloc( RTP_H263_PAYLOAD_START + i_payload ); |
|---|
| 383 | 381 | b_p_bit = (i == 0) ? 1 : 0; |
|---|
| 384 | 382 | h = ( b_p_bit << 10 )| |
|---|
| … | … | |
| 434 | 432 | { |
|---|
| 435 | 433 | /* Single NAL unit packet */ |
|---|
| 436 | | block_t *out = block_New( p_stream, 12 + i_data ); |
|---|
| | 434 | block_t *out = block_Alloc( 12 + i_data ); |
|---|
| 437 | 435 | out->i_dts = i_dts; |
|---|
| 438 | 436 | out->i_length = i_length; |
|---|
| … | … | |
| 458 | 456 | { |
|---|
| 459 | 457 | const int i_payload = __MIN( i_data, i_max-2 ); |
|---|
| 460 | | block_t *out = block_New( p_stream, 12 + 2 + i_payload ); |
|---|
| | 458 | block_t *out = block_Alloc( 12 + 2 + i_payload ); |
|---|
| 461 | 459 | out->i_dts = i_dts + i * i_length / i_count; |
|---|
| 462 | 460 | out->i_length = i_length / i_count; |
|---|
| … | … | |
| 536 | 534 | { |
|---|
| 537 | 535 | int i_payload = __MIN( i_max, i_data ); |
|---|
| 538 | | block_t *out = block_New( p_stream, 14 + i_payload ); |
|---|
| | 536 | block_t *out = block_Alloc( 14 + i_payload ); |
|---|
| 539 | 537 | |
|---|
| 540 | 538 | /* rtp common header */ |
|---|
| … | … | |
| 587 | 585 | } |
|---|
| 588 | 586 | |
|---|
| 589 | | block_t *out = block_New( p_stream, 12 + i_payload ); |
|---|
| | 587 | block_t *out = block_Alloc( 12 + i_payload ); |
|---|
| 590 | 588 | if( out == NULL ) |
|---|
| 591 | 589 | return VLC_SUCCESS; |
|---|
| … | … | |
| 642 | 640 | Allow for 12 extra bytes of RTP header. |
|---|
| 643 | 641 | */ |
|---|
| 644 | | p_out = block_New( p_stream, 12 + i_payload_size ); |
|---|
| | 642 | p_out = block_Alloc( 12 + i_payload_size ); |
|---|
| 645 | 643 | |
|---|
| 646 | 644 | if ( i_payload_padding ) |
|---|