Changeset 5e7871bbf07538ef48cb6b12e3f13ac0a474a898
- Timestamp:
- 19/03/06 02:27:21
(3 years ago)
- Author:
- Christophe Mutricy <xtophe@videolan.org>
- git-committer:
- Christophe Mutricy <xtophe@videolan.org> 1142731641 +0000
- git-parent:
[878747abedefb916a70c3b346f7167cde1ab2bbb]
- git-author:
- Christophe Mutricy <xtophe@videolan.org> 1142731641 +0000
- Message:
stream_out/*: String review (refs #438)
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r2cb472d |
r5e7871b |
|
| 36 | 36 | #define ID_TEXT N_("ID") |
|---|
| 37 | 37 | #define ID_LONGTEXT N_( \ |
|---|
| 38 | | "Specify an identifier integer for this elementary stream" ) |
|---|
| | 38 | "Specify an identifier for this elementary stream." ) |
|---|
| 39 | 39 | |
|---|
| 40 | 40 | #define DELAY_TEXT N_("Delay") |
|---|
| 41 | 41 | #define DELAY_LONGTEXT N_("Pictures coming from the picture video outputs " \ |
|---|
| 42 | 42 | "will be delayed accordingly (in milliseconds, >= 100 ms). For high " \ |
|---|
| 43 | | "values you will need to raise file-caching and others.") |
|---|
| | 43 | "values, you will need to raise file-caching and others.") |
|---|
| 44 | 44 | |
|---|
| 45 | 45 | #define ID_OFFSET_TEXT N_("ID Offset") |
|---|
| r3db675f |
r5e7871b |
|
| 701 | 701 | if( p_sys->p_httpd_file ) |
|---|
| 702 | 702 | { |
|---|
| 703 | | msg_Err( p_stream, "You can use sdp=http:// only once" ); |
|---|
| | 703 | msg_Err( p_stream, "you can use sdp=http:// only once" ); |
|---|
| 704 | 704 | return; |
|---|
| 705 | 705 | } |
|---|
| … | … | |
| 714 | 714 | if( p_sys->p_rtsp_url ) |
|---|
| 715 | 715 | { |
|---|
| 716 | | msg_Err( p_stream, "You can use sdp=rtsp:// only once" ); |
|---|
| | 716 | msg_Err( p_stream, "you can use sdp=rtsp:// only once" ); |
|---|
| 717 | 717 | return; |
|---|
| 718 | 718 | } |
|---|
| … | … | |
| 734 | 734 | if( p_sys->b_export_sdp_file ) |
|---|
| 735 | 735 | { |
|---|
| 736 | | msg_Err( p_stream, "You can use sdp=file:// only once" ); |
|---|
| | 736 | msg_Err( p_stream, "you can use sdp=file:// only once" ); |
|---|
| 737 | 737 | return; |
|---|
| 738 | 738 | } |
|---|
| rd18bfd9 |
r5e7871b |
|
| 45 | 45 | "Allows you to specify the output muxer method used for the streaming " \ |
|---|
| 46 | 46 | "output." ) |
|---|
| 47 | | #define URL_TEXT N_("Output URL (deprecated)") |
|---|
| 48 | | #define URL_LONGTEXT N_( \ |
|---|
| 49 | | "Allows you to specify the output URL used for the streaming output." \ |
|---|
| 50 | | "Deprecated, use dst instead." ) |
|---|
| 51 | | |
|---|
| 52 | 47 | #define DST_TEXT N_("Output destination") |
|---|
| 53 | 48 | #define DST_LONGTEXT N_( \ |
|---|
| … | … | |
| 56 | 51 | #define NAME_TEXT N_("Session name") |
|---|
| 57 | 52 | #define NAME_LONGTEXT N_( \ |
|---|
| 58 | | "Name of the session that will be announced with SAP" ) |
|---|
| | 53 | "Name of the session that will be announced with SAP." ) |
|---|
| 59 | 54 | |
|---|
| 60 | 55 | #define GROUP_TEXT N_("Session groupname") |
|---|
| 61 | 56 | #define GROUP_LONGTEXT N_( \ |
|---|
| 62 | | "Name of the group that will be announced for the session" ) |
|---|
| | 57 | "Name of the group that will be announced for the session." ) |
|---|
| 63 | 58 | |
|---|
| 64 | 59 | #define SAP_TEXT N_("SAP announcing") |
|---|
| 65 | | #define SAP_LONGTEXT N_("Announce this session with SAP") |
|---|
| | 60 | #define SAP_LONGTEXT N_("Announce this session with SAP.") |
|---|
| 66 | 61 | |
|---|
| 67 | 62 | static int Open ( vlc_object_t * ); |
|---|
| rf318cec |
r5e7871b |
|
| 400 | 400 | if ( i == MAX_AUDIO ) |
|---|
| 401 | 401 | { |
|---|
| 402 | | msg_Err( p_stream, "too many audio streams !" ); |
|---|
| | 402 | msg_Err( p_stream, "too many audio streams!" ); |
|---|
| 403 | 403 | free( id ); |
|---|
| 404 | 404 | return NULL; |
|---|
| r32438ff |
r5e7871b |
|
| 113 | 113 | #define CANVAS_WIDTH_TEXT N_("Video canvas width") |
|---|
| 114 | 114 | #define CANVAS_WIDTH_LONGTEXT N_( \ |
|---|
| 115 | | "Allows to padd or crop the frame to a specified width" ) |
|---|
| | 115 | "Allows to padd or crop the frame to a specified width." ) |
|---|
| 116 | 116 | #define CANVAS_HEIGHT_TEXT N_("Video canvas height") |
|---|
| 117 | 117 | #define CANVAS_HEIGHT_LONGTEXT N_( \ |
|---|
| 118 | | "Allows to padd or crop the frame to a specified height" ) |
|---|
| | 118 | "Allows to padd or crop the frame to a specified height." ) |
|---|
| 119 | 119 | #define CANVAS_ASPECT_TEXT N_("Video canvas aspect ratio") |
|---|
| 120 | 120 | #define CANVAS_ASPECT_LONGTEXT N_( \ |
|---|
| 121 | | "Set aspect (like 4:3) of video canvas and letterbox accordingly" ) |
|---|
| | 121 | "Set aspect (like 4:3) of video canvas and letterbox accordingly." ) |
|---|
| 122 | 122 | |
|---|
| 123 | 123 | #define AENC_TEXT N_("Audio encoder") |
|---|
| … | … | |
| 159 | 159 | #define OSD_LONGTEXT N_(\ |
|---|
| 160 | 160 | "Enable streaming of the On Screen Display. It uses the osdmenu subfilter." ) |
|---|
| 161 | | |
|---|
| | 161 | |
|---|
| 162 | 162 | #define THREADS_TEXT N_("Number of threads") |
|---|
| 163 | 163 | #define THREADS_LONGTEXT N_( \ |
|---|
| … | … | |
| 513 | 513 | p_sys->i_channels ); |
|---|
| 514 | 514 | p_sys->i_channels = 2; |
|---|
| 515 | | } |
|---|
| | 515 | } |
|---|
| 516 | 516 | msg_Dbg( p_stream, "codec audio=%4.4s %dHz %d channels %dKb/s", |
|---|
| 517 | 517 | (char *)&p_sys->i_acodec, p_sys->i_sample_rate, |
|---|
| … | … | |
| 1125 | 1125 | if( p_sys->b_es_osd ) |
|---|
| 1126 | 1126 | { |
|---|
| 1127 | | transcode_osd_process( p_stream, id, p_buffer, &p_out ); |
|---|
| | 1127 | transcode_osd_process( p_stream, id, p_buffer, &p_out ); |
|---|
| 1128 | 1128 | } |
|---|
| 1129 | 1129 | return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer ); |
|---|
| … | … | |
| 1759 | 1759 | } |
|---|
| 1760 | 1760 | f_aspect = f_target_aspect; |
|---|
| 1761 | | msg_Dbg( p_stream, "Canvas scaled pixel aspect is %f:1", f_aspect ); |
|---|
| | 1761 | msg_Dbg( p_stream, "canvas scaled pixel aspect is %f:1", f_aspect ); |
|---|
| 1762 | 1762 | } |
|---|
| 1763 | 1763 | |
|---|
| … | … | |
| 1855 | 1855 | id->p_encoder->fmt_in.video.i_height = i_dst_height; |
|---|
| 1856 | 1856 | |
|---|
| 1857 | | msg_Dbg( p_stream, "Source %ix%i, crop %ix%i, " |
|---|
| | 1857 | msg_Dbg( p_stream, "source %ix%i, crop %ix%i, " |
|---|
| 1858 | 1858 | "destination %ix%i, padding %ix%i", |
|---|
| 1859 | 1859 | i_src_width, i_src_height, |
|---|