Changeset 738926876bda127f929463e9679317edba1dbfd8
- Timestamp:
- 07/11/05 10:52:14
(3 years ago)
- Author:
- Sam Hocevar <sam@videolan.org>
- git-committer:
- Sam Hocevar <sam@videolan.org> 1121071934 +0000
- git-parent:
[9ed8a0c1aa6182cb5f8be88d4a5a595a6f0ba711]
- git-author:
- Sam Hocevar <sam@videolan.org> 1121071934 +0000
- Message:
- Fixed a bunch of coding errors here and there.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rfe087a3 |
r7389268 |
|
| 124 | 124 | mediacontrol_RGBPicture* mediacontrol_RGBPicture__alloc (int datasize); |
|---|
| 125 | 125 | void mediacontrol_RGBPicture__free (mediacontrol_RGBPicture* pic); |
|---|
| | 126 | mediacontrol_RGBPicture* _mediacontrol_createRGBPicture (int, int, long, long long l_date, char*, int); |
|---|
| 126 | 127 | mediacontrol_PlaylistSeq* mediacontrol_PlaylistSeq__alloc (int size); |
|---|
| 127 | 128 | void mediacontrol_PlaylistSeq__free (mediacontrol_PlaylistSeq* ps); |
|---|
| r5585f98 |
r7389268 |
|
| 82 | 82 | byte_t *p_peek; |
|---|
| 83 | 83 | int i_peek = 0; |
|---|
| 84 | | vlc_bool_t b_big_endian; |
|---|
| | 84 | vlc_bool_t b_big_endian = 0; /* Arbitrary initialisation */ |
|---|
| 85 | 85 | |
|---|
| 86 | 86 | /* Check if we are dealing with a WAV file */ |
|---|
| rfe087a3 |
r7389268 |
|
| 28 | 28 | typedef struct ps_psm_t ps_psm_t; |
|---|
| 29 | 29 | static inline int ps_id_to_type( ps_psm_t *, int ); |
|---|
| 30 | | static inline char *ps_id_to_lang( ps_psm_t *, int ); |
|---|
| | 30 | static inline uint8_t *ps_id_to_lang( ps_psm_t *, int ); |
|---|
| 31 | 31 | |
|---|
| 32 | 32 | typedef struct |
|---|
| … | … | |
| 391 | 391 | } |
|---|
| 392 | 392 | |
|---|
| 393 | | static inline char *ps_id_to_lang( ps_psm_t *p_psm, int i_id ) |
|---|
| | 393 | static inline uint8_t *ps_id_to_lang( ps_psm_t *p_psm, int i_id ) |
|---|
| 394 | 394 | { |
|---|
| 395 | 395 | int i; |
|---|
| rfe087a3 |
r7389268 |
|
| 31 | 31 | { |
|---|
| 32 | 32 | public: |
|---|
| | 33 | virtual ~Box() {} |
|---|
| | 34 | |
|---|
| 33 | 35 | /// Get the size of the box |
|---|
| 34 | 36 | virtual int getWidth() const = 0; |
|---|
| rfe087a3 |
r7389268 |
|
| 1470 | 1470 | } |
|---|
| 1471 | 1471 | |
|---|
| 1472 | | void WizardDialog::SetTranscode( char *vcodec, int vb, char *acodec,int ab) |
|---|
| | 1472 | void WizardDialog::SetTranscode( char const *vcodec, int vb, |
|---|
| | 1473 | char const *acodec, int ab) |
|---|
| 1473 | 1474 | { |
|---|
| 1474 | 1475 | if( strcmp( vcodec, "dummy") ) |
|---|
| … | … | |
| 1484 | 1485 | } |
|---|
| 1485 | 1486 | |
|---|
| 1486 | | void WizardDialog::SetStream( char *method, char *address ) |
|---|
| | 1487 | void WizardDialog::SetStream( char const *method, char const *address ) |
|---|
| 1487 | 1488 | { |
|---|
| 1488 | 1489 | this->method = strdup( method ); |
|---|
| … | … | |
| 1490 | 1491 | } |
|---|
| 1491 | 1492 | |
|---|
| 1492 | | void WizardDialog::SetTranscodeOut( const char *address ) |
|---|
| | 1493 | void WizardDialog::SetTranscodeOut( char const *address ) |
|---|
| 1493 | 1494 | { |
|---|
| 1494 | 1495 | this->address = strdup( address ); |
|---|
| 1495 | 1496 | } |
|---|
| 1496 | 1497 | |
|---|
| 1497 | | void WizardDialog::SetMux( char *mux ) |
|---|
| | 1498 | void WizardDialog::SetMux( char const *mux ) |
|---|
| 1498 | 1499 | { |
|---|
| 1499 | 1500 | this->mux = strdup( mux ); |
|---|
| rfe087a3 |
r7389268 |
|
| 764 | 764 | public: |
|---|
| 765 | 765 | /* Constructor */ |
|---|
| 766 | | WizardDialog( intf_thread_t *p_intf, wxWindow *p_parent,char *, int, int ); |
|---|
| | 766 | WizardDialog( intf_thread_t *, wxWindow *p_parent, char *, int, int ); |
|---|
| 767 | 767 | virtual ~WizardDialog(); |
|---|
| 768 | | void SetTranscode( char *vcodec, int vb, char *acodec,int ab); |
|---|
| | 768 | void SetTranscode( char const *vcodec, int vb, char const *acodec, int ab); |
|---|
| 769 | 769 | void SetMrl( const char *mrl ); |
|---|
| 770 | 770 | void SetTTL( int i_ttl ); |
|---|
| 771 | 771 | void SetPartial( int, int ); |
|---|
| 772 | | void SetStream( char *method, char *address ); |
|---|
| 773 | | void SetTranscodeOut( const char *address ); |
|---|
| | 772 | void SetStream( char const *method, char const *address ); |
|---|
| | 773 | void SetTranscodeOut( char const *address ); |
|---|
| 774 | 774 | void SetAction( int i_action ); |
|---|
| 775 | 775 | int GetAction(); |
|---|
| 776 | 776 | void SetSAP( bool b_enabled, const char *psz_name ); |
|---|
| 777 | | void SetMux( char *mux ); |
|---|
| | 777 | void SetMux( char const *mux ); |
|---|
| 778 | 778 | void Run(); |
|---|
| 779 | 779 | int i_action; |
|---|
| rfe087a3 |
r7389268 |
|
| 527 | 527 | if( i_type == 0x01 ) |
|---|
| 528 | 528 | { |
|---|
| | 529 | #if 0 |
|---|
| 529 | 530 | static const int mpeg2_aspect[16][2] = |
|---|
| 530 | 531 | { |
|---|
| … | … | |
| 533 | 534 | {0,1}, {0,1} |
|---|
| 534 | 535 | }; |
|---|
| | 536 | #endif |
|---|
| 535 | 537 | |
|---|
| 536 | 538 | /* sequence extention */ |
|---|
| rfe087a3 |
r7389268 |
|
| 191 | 191 | |
|---|
| 192 | 192 | p_vout->p_sys->i_mode = DEINTERLACE_DISCARD; |
|---|
| 193 | | p_vout->p_sys->b_double_rate = 0; |
|---|
| | 193 | p_vout->p_sys->b_double_rate = VLC_FALSE; |
|---|
| 194 | 194 | p_vout->p_sys->last_date = 0; |
|---|
| 195 | 195 | p_vout->p_sys->p_vout = 0; |
|---|
| … | … | |
| 254 | 254 | { |
|---|
| 255 | 255 | p_vout->p_sys->i_mode = DEINTERLACE_DISCARD; |
|---|
| 256 | | p_vout->p_sys->b_double_rate = 0; |
|---|
| | 256 | p_vout->p_sys->b_double_rate = VLC_FALSE; |
|---|
| 257 | 257 | } |
|---|
| 258 | 258 | else if( !strcmp( psz_method, "mean" ) ) |
|---|
| 259 | 259 | { |
|---|
| 260 | 260 | p_vout->p_sys->i_mode = DEINTERLACE_MEAN; |
|---|
| 261 | | p_vout->p_sys->b_double_rate = 0; |
|---|
| | 261 | p_vout->p_sys->b_double_rate = VLC_FALSE; |
|---|
| 262 | 262 | } |
|---|
| 263 | 263 | else if( !strcmp( psz_method, "blend" ) |
|---|
| … | … | |
| 266 | 266 | { |
|---|
| 267 | 267 | p_vout->p_sys->i_mode = DEINTERLACE_BLEND; |
|---|
| 268 | | p_vout->p_sys->b_double_rate = 0; |
|---|
| | 268 | p_vout->p_sys->b_double_rate = VLC_FALSE; |
|---|
| 269 | 269 | } |
|---|
| 270 | 270 | else if( !strcmp( psz_method, "bob" ) |
|---|
| … | … | |
| 272 | 272 | { |
|---|
| 273 | 273 | p_vout->p_sys->i_mode = DEINTERLACE_BOB; |
|---|
| 274 | | p_vout->p_sys->b_double_rate = 1; |
|---|
| | 274 | p_vout->p_sys->b_double_rate = VLC_TRUE; |
|---|
| 275 | 275 | } |
|---|
| 276 | 276 | else if( !strcmp( psz_method, "linear" ) ) |
|---|
| 277 | 277 | { |
|---|
| 278 | 278 | p_vout->p_sys->i_mode = DEINTERLACE_LINEAR; |
|---|
| 279 | | p_vout->p_sys->b_double_rate = 1; |
|---|
| | 279 | p_vout->p_sys->b_double_rate = VLC_TRUE; |
|---|
| 280 | 280 | } |
|---|
| 281 | 281 | else if( !strcmp( psz_method, "x" ) ) |
|---|
| 282 | 282 | { |
|---|
| 283 | 283 | p_vout->p_sys->i_mode = DEINTERLACE_X; |
|---|
| 284 | | p_vout->p_sys->b_double_rate = 0; |
|---|
| | 284 | p_vout->p_sys->b_double_rate = VLC_FALSE; |
|---|
| 285 | 285 | } |
|---|
| 286 | 286 | else |
|---|
| … | … | |
| 443 | 443 | picture_t *pp_outpic[2]; |
|---|
| 444 | 444 | |
|---|
| | 445 | pp_outpic[0] = pp_outpic[1] = NULL; |
|---|
| | 446 | |
|---|
| 445 | 447 | vlc_mutex_lock( &p_vout->p_sys->filter_lock ); |
|---|
| 446 | 448 | |
|---|
| 447 | 449 | /* Get a new picture */ |
|---|
| 448 | 450 | while( ( pp_outpic[0] = vout_CreatePicture( p_vout->p_sys->p_vout, |
|---|
| 449 | | 0, 0, 0 ) ) |
|---|
| | 451 | 0, 0, 0 ) ) |
|---|
| 450 | 452 | == NULL ) |
|---|
| 451 | 453 | { |
|---|
| … | … | |
| 456 | 458 | } |
|---|
| 457 | 459 | msleep( VOUT_OUTMEM_SLEEP ); |
|---|
| 458 | | } |
|---|
| | 460 | } |
|---|
| 459 | 461 | |
|---|
| 460 | 462 | vout_DatePicture( p_vout->p_sys->p_vout, pp_outpic[0], p_pic->date ); |
|---|
| … | … | |
| 1873 | 1875 | picture_t *p_outpic, picture_t *p_pic ) |
|---|
| 1874 | 1876 | { |
|---|
| 1875 | | vout_sys_t *p_sys = p_vout->p_sys; |
|---|
| 1876 | 1877 | int i_plane; |
|---|
| 1877 | 1878 | |
|---|
| rfe087a3 |
r7389268 |
|
| 106 | 106 | static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) |
|---|
| 107 | 107 | { |
|---|
| 108 | | filter_sys_t *p_sys = p_filter->p_sys; |
|---|
| 109 | 108 | picture_t *p_pic_dst; |
|---|
| 110 | 109 | int i_plane, i, j, k, l; |
|---|
| re6db2c3 |
r7389268 |
|
| 33 | 33 | MSGFMT = @MSGFMT@ |
|---|
| 34 | 34 | XGETTEXT = @XGETTEXT@ |
|---|
| 35 | | MSGMERGE = @MSGMERGE@ |
|---|
| | 35 | MSGMERGE = msgmerge |
|---|
| 36 | 36 | MSGMERGE_UPDATE = @MSGMERGE@ --update |
|---|
| 37 | | MSGINIT = @MSGINIT@ |
|---|
| 38 | | MSGCONV = @MSGCONV@ |
|---|
| 39 | | MSGFILTER = @MSGFILTER@ |
|---|
| | 37 | MSGINIT = msginit |
|---|
| | 38 | MSGCONV = msgconv |
|---|
| | 39 | MSGFILTER = msgfilter |
|---|
| 40 | 40 | |
|---|
| 41 | 41 | POFILES = @POFILES@ |
|---|
| rfe087a3 |
r7389268 |
|
| 396 | 396 | }; |
|---|
| 397 | 397 | |
|---|
| | 398 | #if 0 /* Unused */ |
|---|
| 398 | 399 | static struct { char *psz_search; int i_type; } exts_array[] = |
|---|
| 399 | 400 | { |
|---|
| … | … | |
| 401 | 402 | { NULL, 0 } |
|---|
| 402 | 403 | }; |
|---|
| | 404 | #endif |
|---|
| 403 | 405 | |
|---|
| 404 | 406 | for( i = 0; types_array[i].psz_search != NULL; i++ ) |
|---|
| r8329bd8 |
r7389268 |
|
| 731 | 731 | picture_t * p_directbuffer; /* direct buffer to display */ |
|---|
| 732 | 732 | |
|---|
| 733 | | subpicture_t * p_subpic; /* subpicture pointer */ |
|---|
| | 733 | subpicture_t * p_subpic = NULL; /* subpicture pointer */ |
|---|
| 734 | 734 | |
|---|
| 735 | 735 | /* |
|---|