# include "config.h"
#endif
#include <assert.h>
+#include <ctype.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-static const int pi_index[] = {0,1,2};
+static const int pi_index[] = {0,1,2,3};
static const char *const ppsz_indexes[] = { N_("Ask for action"),
N_("Always fix"),
- N_("Never fix") };
+ N_("Never fix"),
+ N_("Fix when necessary")};
vlc_module_begin ()
set_shortname( "AVI" )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
- add_bool( "avi-interleaved", false, NULL,
+ add_bool( "avi-interleaved", false,
INTERLEAVE_TEXT, INTERLEAVE_LONGTEXT, true )
add_integer( "avi-index", 0,
INDEX_TEXT, INDEX_LONGTEXT, false )
#define __ABS( x ) ( (x) < 0 ? (-(x)) : (x) )
+static char *FromACP( const char *str )
+{
+ return FromCharset(vlc_pgettext("GetACP", "CP1252"), str, strlen(str));
+}
+
+#define IGNORE_ES NAV_ES
+
typedef struct
{
vlc_fourcc_t i_fourcc;
static void AVI_IndexLoad ( demux_t * );
static void AVI_IndexCreate ( demux_t * );
-static void AVI_ExtractSubtitle( demux_t *, int i_stream, avi_chunk_list_t *, avi_chunk_STRING_t * );
+static void AVI_ExtractSubtitle( demux_t *, unsigned int i_stream, avi_chunk_list_t *, avi_chunk_STRING_t * );
static mtime_t AVI_MovieGetLength( demux_t * );
{
case( AVIFOURCC_auds ):
tk->i_cat = AUDIO_ES;
- tk->i_codec = AVI_FourccGetCodec( AUDIO_ES,
- p_auds->p_wf->wFormatTag );
+ if( p_auds->p_wf->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&
+ p_auds->p_wf->cbSize >= sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX) )
+ {
+ WAVEFORMATEXTENSIBLE *p_wfe = (WAVEFORMATEXTENSIBLE *)p_auds->p_wf;
+ tk->i_codec = AVI_FourccGetCodec( AUDIO_ES,
+ p_wfe->SubFormat.Data1 );
+ }
+ else
+ tk->i_codec = AVI_FourccGetCodec( AUDIO_ES,
+ p_auds->p_wf->wFormatTag );
tk->i_blocksize = p_auds->p_wf->nBlockAlign;
if( tk->i_blocksize == 0 )
fmt.b_packetized = !tk->i_blocksize;
msg_Dbg( p_demux,
- "stream[%d] audio(0x%x) %d channels %dHz %dbits",
- i, p_auds->p_wf->wFormatTag, p_auds->p_wf->nChannels,
- p_auds->p_wf->nSamplesPerSec,
+ "stream[%d] audio(0x%x - %s) %d channels %dHz %dbits",
+ i, p_auds->p_wf->wFormatTag,vlc_fourcc_GetDescription(AUDIO_ES,tk->i_codec),
+ p_auds->p_wf->nChannels,
+ p_auds->p_wf->nSamplesPerSec,
p_auds->p_wf->wBitsPerSample );
fmt.i_extra = __MIN( p_auds->p_wf->cbSize,
{
/* The palette is not always included in biSize */
fmt.i_extra = p_vids->i_chunk_size - sizeof(BITMAPINFOHEADER);
- if( fmt.i_extra > 0 )
+ if( fmt.i_extra > 0 && fmt.p_extra )
{
const uint8_t *p_pal = fmt.p_extra;
continue;
}
if( p_strn )
- fmt.psz_description = FromLatin1( p_strn->p_str );
+ fmt.psz_description = FromACP( p_strn->p_str );
if( tk->p_out_muxed == NULL )
tk->p_es = es_out_Add( p_demux->out, &fmt );
TAB_APPEND( p_sys->i_track, p_sys->track, tk );
msg_Warn( p_demux, "broken or missing index, 'seek' will be "
"approximative or will exhibit strange behavior" );
- if( i_do_index == 0 && !b_index )
+ if( (i_do_index == 0 || i_do_index == 3) && !b_index )
{
if( !p_sys->b_seekable ) {
b_index = true;
goto aviindex;
}
- switch( dialog_Question( p_demux, _("Broken or missing AVI Index") ,
- _( "Because this AVI file index is broken or missing, "
- "seeking will not work correctly.\n"
- "VLC won't repair your file but can temporary fix this "
- "problem by building an index in memory.\n"
- "This step might take a long time on a large file.\n"
- "What do you want to do ?" ),
- _( "Build index then play" ), _( "Play as is" ), _( "Do not play") ) )
+ if( i_do_index == 0 )
{
- case 1:
- b_index = true;
- msg_Dbg( p_demux, "Fixing AVI index" );
- goto aviindex;
- case 3:
- /* Kill input */
- vlc_object_kill( p_demux->p_parent );
- goto error;
+ switch( dialog_Question( p_demux, _("Broken or missing AVI Index") ,
+ _( "Because this AVI file index is broken or missing, "
+ "seeking will not work correctly.\n"
+ "VLC won't repair your file but can temporary fix this "
+ "problem by building an index in memory.\n"
+ "This step might take a long time on a large file.\n"
+ "What do you want to do?" ),
+ _( "Build index then play" ), _( "Play as is" ), _( "Do not play") ) )
+ {
+ case 1:
+ b_index = true;
+ msg_Dbg( p_demux, "Fixing AVI index" );
+ goto aviindex;
+ case 3:
+ /* Kill input */
+ vlc_object_kill( p_demux->p_parent );
+ goto error;
+ }
+ }
+ else
+ {
+ b_index = true;
+ msg_Dbg( p_demux, "Fixing AVI index" );
+ goto aviindex;
}
}
}
{
demux_sys_t *p_sys = p_demux->p_sys;
- unsigned int i_stream;
msg_Dbg( p_demux, "seek requested: %"PRId64" seconds %d%%",
i_date / 1000000, i_percent );
if( p_sys->b_seekable )
{
+ unsigned i_stream;
+
if( !p_sys->i_length )
{
- avi_track_t *p_stream;
+ avi_track_t *p_stream = NULL;
int64_t i_pos;
/* use i_percent to create a true i_date */
/* try to find chunk that is at i_percent or the file */
i_pos = __MAX( i_percent * stream_Size( p_demux->s ) / 100,
p_sys->i_movi_begin );
- /* search first selected stream (and prefer non eof ones) */
- for( i_stream = 0, p_stream = NULL;
- i_stream < p_sys->i_track; i_stream++ )
+ /* search first selected stream (and prefer non-EOF ones) */
+ for( unsigned i = 0; i < p_sys->i_track; i++ )
{
- if( !p_stream || p_stream->b_eof )
- p_stream = p_sys->track[i_stream];
+ avi_track_t *p_track = p_sys->track[i];
+ if( !p_track->b_activated )
+ continue;
- if( p_stream->b_activated && !p_stream->b_eof )
+ p_stream = p_track;
+ i_stream = i;
+ if( !p_track->b_eof )
break;
}
- if( !p_stream || !p_stream->b_activated )
+ if( p_stream == NULL )
{
msg_Warn( p_demux, "cannot find any selected stream" );
return VLC_EGENERIC;
case AVITWOCC_sb:
SET_PTR( pi_type, SPU_ES );
break;
+ case AVITWOCC_pc:
+ SET_PTR( pi_type, IGNORE_ES );
+ break;
default:
SET_PTR( pi_type, UNKNOWN_ES );
break;
}
*pp_idx1 = p_idx1;
- /* *** calculate offset *** */
- /* Well, avi is __SHIT__ so test more than one entry
- * (needed for some avi files) */
+ /* The offset in the index should be from the start of the movi content,
+ * but some broken files use offset from the start of the file. Just
+ * checking the offset of the first packet is not enough as some files
+ * has unused chunk at the beginning of the movi content.
+ */
avi_chunk_list_t *p_movi = AVI_ChunkFind( p_riff, AVIFOURCC_movi, 0);
- *pi_offset = 0;
- for( unsigned i = 0; i < __MIN( p_idx1->i_entry_count, 10 ); i++ )
+ uint64_t i_first_pos = UINT64_MAX;
+ for( unsigned i = 0; i < __MIN( p_idx1->i_entry_count, 100 ); i++ )
+ i_first_pos = __MIN( i_first_pos, p_idx1->entry[i].i_pos );
+
+ const uint64_t i_movi_content = p_movi->i_chunk_pos + 8;
+ if( i_first_pos < i_movi_content )
{
- if( p_idx1->entry[i].i_pos < p_movi->i_chunk_pos )
- {
- *pi_offset = p_movi->i_chunk_pos + 8;
- break;
- }
+ *pi_offset = i_movi_content;
+ }
+ else if( p_sys->b_seekable && i_first_pos < UINT64_MAX )
+ {
+ const uint8_t *p_peek;
+ if( !stream_Seek( p_demux->s, i_movi_content + i_first_pos ) &&
+ stream_Peek( p_demux->s, &p_peek, 4 ) >= 4 &&
+ ( !isdigit( p_peek[0] ) || !isdigit( p_peek[1] ) ||
+ !isalpha( p_peek[2] ) || !isalpha( p_peek[3] ) ) )
+ *pi_offset = 0;
+ else
+ *pi_offset = i_movi_content;
+ }
+ else
+ {
+ *pi_offset = 0;
}
return VLC_SUCCESS;
}
&i_stream,
&i_cat );
if( i_stream < p_sys->i_track &&
- i_cat == p_sys->track[i_stream]->i_cat )
+ (i_cat == p_sys->track[i_stream]->i_cat || i_cat == UNKNOWN_ES ) )
{
avi_entry_t index;
index.i_id = p_idx1->entry[i_index].i_fourcc;
avi_chunk_STRING_t *p_strz = AVI_ChunkFind( p_info, p_dsc[i].i_id, 0 );
if( !p_strz )
continue;
- char *psz_value = FromLatin1( p_strz->p_str );
+ char *psz_value = FromACP( p_strz->p_str );
if( !psz_value )
continue;
* Subtitles
*****************************************************************************/
static void AVI_ExtractSubtitle( demux_t *p_demux,
- int i_stream,
+ unsigned int i_stream,
avi_chunk_list_t *p_strl,
avi_chunk_STRING_t *p_strn )
{
i_size -= 6;
if( !psz_description )
- psz_description = p_strn ? FromLatin1( p_strn->p_str ) : NULL;
+ psz_description = p_strn ? FromACP( p_strn->p_str ) : NULL;
char *psz_name;
if( asprintf( &psz_name, "subtitle%d.srt", p_sys->i_attachment ) <= 0 )
psz_name = NULL;
projects / vlc / blobdiff