Changeset bf706caf1da81b3e0821fb93f13a7cf6ea85e32c
- Timestamp:
- 03/25/06 13:54:27
(2 years ago)
- Author:
- Felix Paul Kühne <fkuehne@videolan.org>
- git-committer:
- Felix Paul Kühne <fkuehne@videolan.org> 1143291267 +0000
- git-parent:
[df188ac24c0b15bad6c22b7a91ebb209aeffa27d]
- git-author:
- Felix Paul Kühne <fkuehne@videolan.org> 1143291267 +0000
- Message:
* another 1st string review, refs #438
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r2cb472d |
rbf706ca |
|
| 2 | 2 | * asf.c: asf muxer module for vlc |
|---|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | | * Copyright (C) 2003-2004 the VideoLAN team |
|---|
| | 4 | * Copyright (C) 2003-2004, 2006 the VideoLAN team |
|---|
| 5 | 5 | * $Id$ |
|---|
| 6 | 6 | * |
|---|
| … | … | |
| 187 | 187 | int i; |
|---|
| 188 | 188 | |
|---|
| 189 | | msg_Dbg( p_mux, "Asf muxer opened" ); |
|---|
| | 189 | msg_Dbg( p_mux, "asf muxer opened" ); |
|---|
| 190 | 190 | sout_CfgParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg ); |
|---|
| 191 | 191 | |
|---|
| … | … | |
| 242 | 242 | p_sys->psz_rating = val.psz_string; |
|---|
| 243 | 243 | |
|---|
| 244 | | msg_Dbg( p_mux, "meta data: title='%s' author='%s' copyright='%s' " |
|---|
| 245 | | "comment='%s' rating='%s'", |
|---|
| | 244 | msg_Dbg( p_mux, "meta data: title='%s', author='%s', copyright='%s', " |
|---|
| | 245 | "comment='%s', rating='%s'", |
|---|
| 246 | 246 | p_sys->psz_title, p_sys->psz_author, p_sys->psz_copyright, |
|---|
| 247 | 247 | p_sys->psz_comment, p_sys->psz_rating ); |
|---|
| … | … | |
| 335 | 335 | if( p_sys->i_track >= MAX_ASF_TRACKS ) |
|---|
| 336 | 336 | { |
|---|
| 337 | | msg_Dbg( p_mux, "cannot add this track (too much track)" ); |
|---|
| | 337 | msg_Dbg( p_mux, "cannot add this track (too much tracks)" ); |
|---|
| 338 | 338 | return VLC_EGENERIC; |
|---|
| 339 | 339 | } |
|---|
| r2cb472d |
rbf706ca |
|
| 2 | 2 | * mp4.c: mp4/mov muxer |
|---|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | | * Copyright (C) 2001, 2002, 2003 the VideoLAN team |
|---|
| | 4 | * Copyright (C) 2001, 2002, 2003, 2006 the VideoLAN team |
|---|
| 5 | 5 | * $Id$ |
|---|
| 6 | 6 | * |
|---|
| … | … | |
| 43 | 43 | * Module descriptor |
|---|
| 44 | 44 | *****************************************************************************/ |
|---|
| 45 | | #define FASTSTART_TEXT N_("Create \"Fast start\" files") |
|---|
| | 45 | #define FASTSTART_TEXT N_("Create \"Fast Start\" files") |
|---|
| 46 | 46 | #define FASTSTART_LONGTEXT N_( \ |
|---|
| 47 | | "When this option is turned on, \"Fast start\" files will be created. " \ |
|---|
| 48 | | "(\"Fast start\" files are optimized for download, allowing the user " \ |
|---|
| | 47 | "When this option is turned on, \"Fast Start\" files will be created. " \ |
|---|
| | 48 | "(\"Fast Start\" files are optimized for downloads and allow the user " \ |
|---|
| 49 | 49 | "to start previewing the file while it is downloading).") |
|---|
| 50 | 50 | static int Open ( vlc_object_t * ); |
|---|
| … | … | |
| 303 | 303 | if( sout_AccessOutRead( p_mux->p_access, p_buf ) < i_chunk ) |
|---|
| 304 | 304 | { |
|---|
| 305 | | msg_Warn( p_this, "read() not supported by acces output, " |
|---|
| | 305 | msg_Warn( p_this, "read() not supported by access output, " |
|---|
| 306 | 306 | "won't create a fast start file" ); |
|---|
| 307 | 307 | p_sys->b_fast_start = VLC_FALSE; |
|---|
| … | … | |
| 628 | 628 | { |
|---|
| 629 | 629 | /* TODO */ |
|---|
| 630 | | msg_Dbg( p_mux, "writing a empty subs" ) ; |
|---|
| | 630 | msg_Dbg( p_mux, "writing an empty sub" ) ; |
|---|
| 631 | 631 | |
|---|
| 632 | 632 | /* Append a idx entry */ |
|---|
| … | … | |
| 687 | 687 | |
|---|
| 688 | 688 | /* Replace the 4 bytes start code with 4 bytes size, |
|---|
| 689 | | * FIXME are all startcode 4 bytes ? (I don't think :( */ |
|---|
| | 689 | * FIXME are all startcodes 4 bytes ? (I don't think :( */ |
|---|
| 690 | 690 | while( dat < end ) |
|---|
| 691 | 691 | { |
|---|
| r2cb472d |
rbf706ca |
|
| 2 | 2 | * mpjpeg.c: mime multipart jpeg muxer module for vlc |
|---|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | | * Copyright (C) 2001, 2002 the VideoLAN team |
|---|
| | 4 | * Copyright (C) 2001, 2002, 2006 the VideoLAN team |
|---|
| 5 | 5 | * $Id$ |
|---|
| 6 | 6 | * |
|---|
| … | … | |
| 32 | 32 | #define SEPARATOR_TEXT N_( "Multipart separator string" ) |
|---|
| 33 | 33 | #define SEPARATOR_LONGTEXT N_( "Multipart strings like MPJPEG use a " \ |
|---|
| 34 | | "separator string between content pieces. "\ |
|---|
| 35 | | "You can select this string. Default is "\ |
|---|
| 36 | | "--myboundary" ) |
|---|
| | 34 | "specific string to separate its content " \ |
|---|
| | 35 | "pieces. You can select this string. " \ |
|---|
| | 36 | "Default is --myboundary" ) |
|---|
| 37 | 37 | |
|---|
| 38 | 38 | |
|---|
| … | … | |
| 48 | 48 | vlc_module_begin(); |
|---|
| 49 | 49 | set_shortname( "MPJPEG" ); |
|---|
| 50 | | set_description( _("Multipart jpeg muxer") ); |
|---|
| | 50 | set_description( _("Multipart JPEG muxer") ); |
|---|
| 51 | 51 | set_capability( "sout mux", 5 ); |
|---|
| 52 | 52 | add_string( SOUT_CFG_PREFIX "separator", "--myboundary", NULL, |
|---|
| r2cb472d |
rbf706ca |
|
| 2 | 2 | * ogg.c: ogg muxer module for vlc |
|---|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | | * Copyright (C) 2001, 2002 the VideoLAN team |
|---|
| | 4 | * Copyright (C) 2001, 2002, 2006 the VideoLAN team |
|---|
| 5 | 5 | * $Id$ |
|---|
| 6 | 6 | * |
|---|
| … | … | |
| 48 | 48 | |
|---|
| 49 | 49 | vlc_module_begin(); |
|---|
| 50 | | set_description( _("Ogg/ogm muxer") ); |
|---|
| | 50 | set_description( _("Ogg/OGM muxer") ); |
|---|
| 51 | 51 | set_capability( "sout mux", 10 ); |
|---|
| 52 | 52 | set_category( CAT_SOUT ); |
|---|
| … | … | |
| 518 | 518 | else |
|---|
| 519 | 519 | { |
|---|
| 520 | | /* Wasn't already added so get rid of it */ |
|---|
| | 520 | /* wasn't already added so get rid of it */ |
|---|
| 521 | 521 | FREE( p_stream->p_oggds_header ); |
|---|
| 522 | 522 | FREE( p_stream ); |
|---|
| r2cb472d |
rbf706ca |
|
| 2 | 2 | * wav.c: wav muxer module for vlc |
|---|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | | * Copyright (C) 2004 the VideoLAN team |
|---|
| | 4 | * Copyright (C) 2004, 2006 the VideoLAN team |
|---|
| 5 | 5 | * $Id$ |
|---|
| 6 | 6 | * |
|---|
| … | … | |
| 172 | 172 | } |
|---|
| 173 | 173 | |
|---|
| 174 | | msg_Dbg( p_mux, "adding input %i channels, %iHz", |
|---|
| | 174 | msg_Dbg( p_mux, "adding %i input channels, %iHz", |
|---|
| 175 | 175 | p_input->p_fmt->audio.i_channels, |
|---|
| 176 | 176 | p_input->p_fmt->audio.i_rate ); |
|---|
| r2cb472d |
rbf706ca |
|
| 2 | 2 | * copy.c |
|---|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | | * Copyright (C) 2001, 2002 the VideoLAN team |
|---|
| | 4 | * Copyright (C) 2001, 2002, 2006 the VideoLAN team |
|---|
| 5 | 5 | * $Id$ |
|---|
| 6 | 6 | * |
|---|
| r2cb472d |
rbf706ca |
|
| 2 | 2 | * h264.c: h264/avc video packetizer |
|---|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | | * Copyright (C) 2001, 2002 the VideoLAN team |
|---|
| | 4 | * Copyright (C) 2001, 2002, 2006 the VideoLAN team |
|---|
| 5 | 5 | * $Id$ |
|---|
| 6 | 6 | * |
|---|
| … | … | |
| 45 | 45 | set_category( CAT_SOUT ); |
|---|
| 46 | 46 | set_subcategory( SUBCAT_SOUT_PACKETIZER ); |
|---|
| 47 | | set_description( _("H264 video packetizer") ); |
|---|
| | 47 | set_description( _("H.264 video packetizer") ); |
|---|
| 48 | 48 | set_capability( "packetizer", 50 ); |
|---|
| 49 | 49 | set_callbacks( Open, Close ); |
|---|
| … | … | |
| 204 | 204 | p += 2 + i_length; |
|---|
| 205 | 205 | } |
|---|
| 206 | | msg_Dbg( p_dec, "avcC length size=%d sps=%d pps=%d", |
|---|
| | 206 | msg_Dbg( p_dec, "avcC length size=%d, sps=%d, pps=%d", |
|---|
| 207 | 207 | p_sys->i_avcC_length_size, i_sps, i_pps ); |
|---|
| 208 | 208 | |
|---|
| r2cb472d |
rbf706ca |
|
| 2 | 2 | * mpeg4audio.c: parse and packetize an MPEG 4 audio stream |
|---|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | | * Copyright (C) 2001, 2002 the VideoLAN team |
|---|
| | 4 | * Copyright (C) 2001, 2002, 2006 the VideoLAN team |
|---|
| 5 | 5 | * $Id$ |
|---|
| 6 | 6 | * |
|---|
| r2cb472d |
rbf706ca |
|
| 2 | 2 | * mpeg4video.c: mpeg 4 video packetizer |
|---|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | | * Copyright (C) 2001, 2002 the VideoLAN team |
|---|
| | 4 | * Copyright (C) 2001, 2002, 2006 the VideoLAN team |
|---|
| 5 | 5 | * $Id$ |
|---|
| 6 | 6 | * |
|---|
| … | … | |
| 160 | 160 | p_dec->fmt_in.i_extra ); |
|---|
| 161 | 161 | |
|---|
| 162 | | msg_Dbg( p_dec, "opening with vol size:%d", p_dec->fmt_in.i_extra ); |
|---|
| | 162 | msg_Dbg( p_dec, "opening with vol size: %d", p_dec->fmt_in.i_extra ); |
|---|
| 163 | 163 | m4v_VOLParse( p_dec, &p_dec->fmt_out, |
|---|
| 164 | 164 | p_dec->fmt_out.p_extra, p_dec->fmt_out.i_extra ); |
|---|
| rbd68029 |
rbf706ca |
|
| 2 | 2 | * mpegvideo.c: parse and packetize an MPEG1/2 video stream |
|---|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | | * Copyright (C) 2001-2005 VideoLAN (Centrale Réseaux) and its contributors |
|---|
| | 4 | * Copyright (C) 2001-2006 the VideoLAN team |
|---|
| 5 | 5 | * $Id$ |
|---|
| 6 | 6 | * |
|---|
| … | … | |
| 50 | 50 | #include "vlc_block_helper.h" |
|---|
| 51 | 51 | |
|---|
| 52 | | #define SYNC_INTRAFRAME_TEXT N_("Sync on intraframe") |
|---|
| | 52 | #define SYNC_INTRAFRAME_TEXT N_("Sync on Intra Frame") |
|---|
| 53 | 53 | #define SYNC_INTRAFRAME_LONGTEXT N_("Normally the packetizer would " \ |
|---|
| 54 | 54 | "sync on the next full frame. This flags instructs the packetizer " \ |
|---|
| 55 | | "to sync on the first intraframe found.") |
|---|
| | 55 | "to sync on the first Intra Frame found.") |
|---|
| 56 | 56 | |
|---|
| 57 | 57 | /***************************************************************************** |
|---|
| … | … | |
| 190 | 190 | p_sys->b_sync_on_intra_frame = var_CreateGetBool( p_dec, "packetizer-mpegvideo-sync-iframe" ); |
|---|
| 191 | 191 | if( p_sys->b_sync_on_intra_frame ) |
|---|
| 192 | | msg_Dbg( p_dec, "syncing happens on intraframe now." ); |
|---|
| | 192 | msg_Dbg( p_dec, "syncing on intra frame now" ); |
|---|
| 193 | 193 | |
|---|
| 194 | 194 | return VLC_SUCCESS; |
|---|
| … | … | |
| 323 | 323 | if( p_pic->i_flags & BLOCK_FLAG_TYPE_I ) |
|---|
| 324 | 324 | { |
|---|
| 325 | | msg_Dbg( p_dec, "synced on Intra frame" ); |
|---|
| | 325 | msg_Dbg( p_dec, "synced on intra frame" ); |
|---|
| 326 | 326 | p_sys->b_discontinuity = VLC_FALSE; |
|---|
| 327 | 327 | p_pic->i_flags |= BLOCK_FLAG_DISCONTINUITY; |
|---|
| … | … | |
| 329 | 329 | else |
|---|
| 330 | 330 | { |
|---|
| 331 | | msg_Dbg( p_dec, "waiting on Intra frame" ); |
|---|
| | 331 | msg_Dbg( p_dec, "waiting on intra frame" ); |
|---|
| 332 | 332 | p_sys->i_state = STATE_NOSYNC; |
|---|
| 333 | 333 | block_Release( p_pic ); |
|---|
| … | … | |
| 555 | 555 | if ( !p_sys->b_inited ) |
|---|
| 556 | 556 | { |
|---|
| 557 | | msg_Dbg( p_dec, "Size %dx%d fps=%.3f", |
|---|
| | 557 | msg_Dbg( p_dec, "size %dx%d fps=%.3f", |
|---|
| 558 | 558 | p_dec->fmt_out.video.i_width, p_dec->fmt_out.video.i_height, |
|---|
| 559 | 559 | p_sys->i_frame_rate / (float)p_sys->i_frame_rate_base ); |
|---|