/*****************************************************************************
- * libavi.c :
+ * libavi.c : LibAVI
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: libavi.c,v 1.23 2003/08/22 20:31:47 fenrir Exp $
+ * Copyright (C) 2001 VLC authors and VideoLAN
+ * $Id$
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "ninput.h"
-#include "codecs.h" /* BITMAPINFOHEADER */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include "libavi.h"
+#include <vlc_common.h>
+#include <vlc_demux.h> /* stream_*, *_ES */
+#include <vlc_codecs.h> /* VLC_BITMAPINFOHEADER */
-#define AVI_DEBUG 1
+#include "libavi.h"
-#define FREE( p ) \
- if( p ) {free( p ); p = NULL; }
+#ifndef NDEBUG
+# define AVI_DEBUG 1
+#endif
-#define __EVEN( x ) ( (x)&0x01 ? (x)+1 : (x) )
+#define __EVEN( x ) (((x) + 1) & ~1)
-static vlc_fourcc_t GetFOURCC( byte_t *p_buff )
+static vlc_fourcc_t GetFOURCC( const uint8_t *p_buff )
{
return VLC_FOURCC( p_buff[0], p_buff[1], p_buff[2], p_buff[3] );
}
-#define AVI_ChunkFree( a, b ) _AVI_ChunkFree( (a), (avi_chunk_t*)(b) )
-void _AVI_ChunkFree( stream_t *, avi_chunk_t *p_chk );
-
-
-
/****************************************************************************
*
* Basics functions to manipulates chunks
****************************************************************************/
static int AVI_ChunkReadCommon( stream_t *s, avi_chunk_t *p_chk )
{
- uint8_t *p_peek;
- int i_peek;
+ const uint8_t *p_peek;
memset( p_chk, 0, sizeof( avi_chunk_t ) );
- if( ( i_peek = stream_Peek( s, &p_peek, 8 ) ) < 8 )
- {
+ if( stream_Peek( s, &p_peek, 8 ) < 8 )
return VLC_EGENERIC;
- }
p_chk->common.i_chunk_fourcc = GetFOURCC( p_peek );
p_chk->common.i_chunk_size = GetDWLE( p_peek + 4 );
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s,
- "Found Chunk fourcc:%8.8x (%4.4s) size:"I64Fd" pos:"I64Fd,
- p_chk->common.i_chunk_fourcc,
+ "found chunk, fourcc: %4.4s size:%"PRId64" pos:%"PRId64,
(char*)&p_chk->common.i_chunk_fourcc,
p_chk->common.i_chunk_size,
p_chk->common.i_chunk_pos );
static int AVI_ChunkRead_list( stream_t *s, avi_chunk_t *p_container )
{
avi_chunk_t *p_chk;
- uint8_t *p_peek;
- vlc_bool_t b_seekable;
+ const uint8_t *p_peek;
+ bool b_seekable;
+ int i_ret = VLC_SUCCESS;
- if( p_container->common.i_chunk_size < 8 )
+ if( p_container->common.i_chunk_size > 0 && p_container->common.i_chunk_size < 4 )
{
/* empty box */
msg_Warn( (vlc_object_t*)s, "empty list chunk" );
p_container->list.i_type = GetFOURCC( p_peek + 8 );
+ /* XXX fixed for on2 hack */
+ if( p_container->common.i_chunk_fourcc == AVIFOURCC_ON2 && p_container->list.i_type == AVIFOURCC_ON2f )
+ {
+ p_container->common.i_chunk_fourcc = AVIFOURCC_RIFF;
+ p_container->list.i_type = AVIFOURCC_AVI;
+ }
+
if( p_container->common.i_chunk_fourcc == AVIFOURCC_LIST &&
p_container->list.i_type == AVIFOURCC_movi )
{
- msg_Dbg( (vlc_object_t*)s, "Skipping movi chunk" );
+ msg_Dbg( (vlc_object_t*)s, "skipping movi chunk" );
if( b_seekable )
- {
return AVI_NextChunk( s, p_container );
- }
- return VLC_SUCCESS; // point at begining of LIST-movi
+ else
+ return VLC_EGENERIC; /* point at begining of LIST-movi */
}
if( stream_Read( s, NULL, 12 ) != 12 )
msg_Dbg( (vlc_object_t*)s, "<list \'%4.4s\'>", (char*)&p_container->list.i_type );
for( ; ; )
{
- p_chk = malloc( sizeof( avi_chunk_t ) );
+ p_chk = xmalloc( sizeof( avi_chunk_t ) );
memset( p_chk, 0, sizeof( avi_chunk_t ) );
if( !p_container->common.p_first )
{
}
p_container->common.p_last = p_chk;
- if( AVI_ChunkRead( s, p_chk, p_container ) ||
- ( stream_Tell( s ) >=
+ i_ret = AVI_ChunkRead( s, p_chk, p_container );
+ if( i_ret )
+ {
+ break;
+ }
+ if( p_chk->common.p_father->common.i_chunk_size > 0 &&
+ ( stream_Tell( s ) >
(off_t)p_chk->common.p_father->common.i_chunk_pos +
(off_t)__EVEN( p_chk->common.p_father->common.i_chunk_size ) ) )
{
break;
}
+
/* If we can't seek then stop when we 've found LIST-movi */
if( p_chk->common.i_chunk_fourcc == AVIFOURCC_LIST &&
- p_chk->list.i_type == AVIFOURCC_movi && !b_seekable )
+ p_chk->list.i_type == AVIFOURCC_movi &&
+ ( !b_seekable || p_chk->common.i_chunk_size == 0 ) )
{
break;
}
}
msg_Dbg( (vlc_object_t*)s, "</list \'%4.4s\'>", (char*)&p_container->list.i_type );
+ if ( i_ret == AVI_ZERO_FOURCC ) return i_ret;
return VLC_SUCCESS;
}
+/* Allow to append indexes after starting playback */
+int AVI_ChunkFetchIndexes( stream_t *s, avi_chunk_t *p_riff )
+{
+ avi_chunk_t *p_movi = AVI_ChunkFind( p_riff, AVIFOURCC_movi, 0 );
+ if ( !p_movi )
+ return VLC_EGENERIC;
+
+ avi_chunk_t *p_chk;
+ uint64_t i_indexpos = 8 + p_movi->common.i_chunk_pos + p_movi->common.i_chunk_size;
+ bool b_seekable = false;
+ int i_ret = VLC_SUCCESS;
+
+ stream_Control( s, STREAM_CAN_SEEK, &b_seekable );
+ if ( !b_seekable || stream_Seek( s, i_indexpos ) )
+ return VLC_EGENERIC;
+
+ for( ; ; )
+ {
+ p_chk = xmalloc( sizeof( avi_chunk_t ) );
+ memset( p_chk, 0, sizeof( avi_chunk_t ) );
+ if (unlikely( !p_riff->common.p_first ))
+ p_riff->common.p_first = p_chk;
+ else
+ p_riff->common.p_last->common.p_next = p_chk;
+ p_riff->common.p_last = p_chk;
+
+ i_ret = AVI_ChunkRead( s, p_chk, p_riff );
+ if( i_ret )
+ break;
+
+ if( p_chk->common.p_father->common.i_chunk_size > 0 &&
+ ( stream_Tell( s ) >
+ (off_t)p_chk->common.p_father->common.i_chunk_pos +
+ (off_t)__EVEN( p_chk->common.p_father->common.i_chunk_size ) ) )
+ {
+ break;
+ }
+
+ /* If we can't seek then stop when we 've found any index */
+ if( p_chk->common.i_chunk_fourcc == AVIFOURCC_indx ||
+ p_chk->common.i_chunk_fourcc == AVIFOURCC_idx1 )
+ {
+ break;
+ }
+
+ }
+
+ return i_ret;
+}
+
#define AVI_READCHUNK_ENTER \
int64_t i_read = __EVEN(p_chk->common.i_chunk_size ) + 8; \
+ if( i_read > 100000000 ) \
+ { \
+ msg_Err( s, "Big chunk ignored" ); \
+ return VLC_EGENERIC; \
+ } \
uint8_t *p_read, *p_buff; \
if( !( p_read = p_buff = malloc(i_read ) ) ) \
{ \
- return 0; \
+ return VLC_EGENERIC; \
} \
i_read = stream_Read( s, p_read, i_read ); \
+ if( i_read < (int64_t)__EVEN(p_chk->common.i_chunk_size ) + 8 ) \
+ { \
+ free( p_buff ); \
+ return VLC_EGENERIC; \
+ }\
p_read += 8; \
i_read -= 8
+#define AVI_READ( res, func, size ) \
+ if( i_read < size ) { \
+ free( p_buff); \
+ return VLC_EGENERIC; \
+ } \
+ i_read -= size; \
+ res = func( p_read ); \
+ p_read += size \
+
#define AVI_READCHUNK_EXIT( code ) \
free( p_buff ); \
- if( i_read < 0 ) \
- { \
- msg_Warn( (vlc_object_t*)s, "not enough data" ); \
- } \
return code
+static inline uint8_t GetB( uint8_t *ptr )
+{
+ return *ptr;
+}
+
#define AVI_READ1BYTE( i_byte ) \
- i_byte = *p_read; \
- p_read++; \
- i_read--
+ AVI_READ( i_byte, GetB, 1 )
#define AVI_READ2BYTES( i_word ) \
- i_word = GetWLE( p_read ); \
- p_read += 2; \
- i_read -= 2
+ AVI_READ( i_word, GetWLE, 2 )
#define AVI_READ4BYTES( i_dword ) \
- i_dword = GetDWLE( p_read ); \
- p_read += 4; \
- i_read -= 4
+ AVI_READ( i_dword, GetDWLE, 4 )
-#define AVI_READ8BYTES( i_dword ) \
- i_dword = GetQWLE( p_read ); \
- p_read += 8; \
- i_read -= 8
+#define AVI_READ8BYTES( i_qword ) \
+ AVI_READ( i_qword, GetQWLE, 8 )
#define AVI_READFOURCC( i_dword ) \
- i_dword = GetFOURCC( p_read ); \
- p_read += 4; \
- i_read -= 4
+ AVI_READ( i_dword, GetFOURCC, 4 )
static int AVI_ChunkRead_avih( stream_t *s, avi_chunk_t *p_chk )
{
AVI_READCHUNK_ENTER;
+ p_chk->common.i_chunk_fourcc = AVIFOURCC_avih;
AVI_READ4BYTES( p_chk->avih.i_microsecperframe);
AVI_READ4BYTES( p_chk->avih.i_maxbytespersec );
AVI_READ4BYTES( p_chk->avih.i_reserved1 );
{
case( AVIFOURCC_auds ):
p_chk->strf.auds.i_cat = AUDIO_ES;
- p_chk->strf.auds.p_wf = malloc( __MAX( p_chk->common.i_chunk_size, sizeof( WAVEFORMATEX ) ) );
+ p_chk->strf.auds.p_wf = xmalloc( __MAX( p_chk->common.i_chunk_size, sizeof( WAVEFORMATEX ) ) );
+ if ( !p_chk->strf.auds.p_wf )
+ {
+ AVI_READCHUNK_EXIT( VLC_ENOMEM );
+ }
AVI_READ2BYTES( p_chk->strf.auds.p_wf->wFormatTag );
AVI_READ2BYTES( p_chk->strf.auds.p_wf->nChannels );
AVI_READ4BYTES( p_chk->strf.auds.p_wf->nSamplesPerSec );
AVI_READ4BYTES( p_chk->strf.auds.p_wf->nAvgBytesPerSec );
AVI_READ2BYTES( p_chk->strf.auds.p_wf->nBlockAlign );
AVI_READ2BYTES( p_chk->strf.auds.p_wf->wBitsPerSample );
+
if( p_chk->strf.auds.p_wf->wFormatTag != WAVE_FORMAT_PCM
&& p_chk->common.i_chunk_size > sizeof( WAVEFORMATEX ) )
{
AVI_READ2BYTES( p_chk->strf.auds.p_wf->cbSize );
+
/* prevent segfault */
if( p_chk->strf.auds.p_wf->cbSize >
p_chk->common.i_chunk_size - sizeof( WAVEFORMATEX ) )
p_chk->strf.auds.p_wf->cbSize =
p_chk->common.i_chunk_size - sizeof( WAVEFORMATEX );
}
+
+ if( p_chk->strf.auds.p_wf->wFormatTag == WAVE_FORMAT_EXTENSIBLE )
+ {
+ msg_Dbg( s, "Extended header found" );
+ }
}
else
{
if( p_chk->strf.auds.p_wf->cbSize > 0 )
{
memcpy( &p_chk->strf.auds.p_wf[1] ,
- p_buff + 8 + sizeof( WAVEFORMATEX ), // 8=fourrc+size
+ p_buff + 8 + sizeof( WAVEFORMATEX ), /* 8=fourcc+size */
p_chk->strf.auds.p_wf->cbSize );
}
#ifdef AVI_DEBUG
#endif
break;
case( AVIFOURCC_vids ):
- p_strh->strh.i_samplesize = 0; // XXX for ffmpeg avi file
+ p_strh->strh.i_samplesize = 0; /* XXX for ffmpeg avi file */
p_chk->strf.vids.i_cat = VIDEO_ES;
- p_chk->strf.vids.p_bih = malloc( p_chk->common.i_chunk_size );
+ p_chk->strf.vids.p_bih = xmalloc( __MAX( p_chk->common.i_chunk_size,
+ sizeof( *p_chk->strf.vids.p_bih ) ) );
+ if ( !p_chk->strf.vids.p_bih )
+ {
+ AVI_READCHUNK_EXIT( VLC_ENOMEM );
+ }
AVI_READ4BYTES( p_chk->strf.vids.p_bih->biSize );
AVI_READ4BYTES( p_chk->strf.vids.p_bih->biWidth );
AVI_READ4BYTES( p_chk->strf.vids.p_bih->biHeight );
AVI_READ4BYTES( p_chk->strf.vids.p_bih->biYPelsPerMeter );
AVI_READ4BYTES( p_chk->strf.vids.p_bih->biClrUsed );
AVI_READ4BYTES( p_chk->strf.vids.p_bih->biClrImportant );
- if( p_chk->strf.vids.p_bih->biSize >
- p_chk->common.i_chunk_size )
+ if( p_chk->strf.vids.p_bih->biSize > p_chk->common.i_chunk_size )
{
p_chk->strf.vids.p_bih->biSize = p_chk->common.i_chunk_size;
}
- if( p_chk->strf.vids.p_bih->biSize - sizeof(BITMAPINFOHEADER) > 0 )
+ if ( p_chk->common.i_chunk_size > sizeof(VLC_BITMAPINFOHEADER) )
{
+ uint64_t i_extrasize = p_chk->common.i_chunk_size - sizeof(VLC_BITMAPINFOHEADER);
+
+ /* There's a color palette appended, set up VLC_BITMAPINFO */
memcpy( &p_chk->strf.vids.p_bih[1],
- p_buff + 8 + sizeof(BITMAPINFOHEADER), // 8=fourrc+size
- p_chk->strf.vids.p_bih->biSize -
- sizeof(BITMAPINFOHEADER) );
+ p_buff + 8 + sizeof(VLC_BITMAPINFOHEADER), /* 8=fourrc+size */
+ i_extrasize );
+
+ if ( !p_chk->strf.vids.p_bih->biClrUsed )
+ p_chk->strf.vids.p_bih->biClrUsed = (1 << p_chk->strf.vids.p_bih->biBitCount);
+
+ if( i_extrasize / sizeof(uint32_t) > UINT32_MAX )
+ p_chk->strf.vids.p_bih->biClrUsed = UINT32_MAX;
+ else
+ {
+ p_chk->strf.vids.p_bih->biClrUsed =
+ __MIN( i_extrasize / sizeof(uint32_t),
+ p_chk->strf.vids.p_bih->biClrUsed );
+ }
+
+ /* stay within VLC's limits */
+ p_chk->strf.vids.p_bih->biClrUsed =
+ __MIN( VIDEO_PALETTE_COLORS_MAX, p_chk->strf.vids.p_bih->biClrUsed );
}
+ else p_chk->strf.vids.p_bih->biClrUsed = 0;
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s,
- "strf: video:%4.4s %dx%d planes:%d %dbpp",
+ "strf: video:%4.4s %"PRIu32"x%"PRIu32" planes:%d %dbpp",
(char*)&p_chk->strf.vids.p_bih->biCompression,
- p_chk->strf.vids.p_bih->biWidth,
- p_chk->strf.vids.p_bih->biHeight,
+ (uint32_t)p_chk->strf.vids.p_bih->biWidth,
+ (uint32_t)p_chk->strf.vids.p_bih->biHeight,
p_chk->strf.vids.p_bih->biPlanes,
p_chk->strf.vids.p_bih->biBitCount );
#endif
break;
+ case AVIFOURCC_iavs:
+ case AVIFOURCC_ivas:
+ p_chk->strf.common.i_cat = UNKNOWN_ES;
+ break;
+ case( AVIFOURCC_txts ):
+ p_chk->strf.common.i_cat = SPU_ES;
+ break;
default:
- msg_Warn( (vlc_object_t*)s, "unknown stream type" );
+ msg_Warn( (vlc_object_t*)s, "unknown stream type: %4.4s",
+ (char*)&p_strh->strh.i_type );
p_chk->strf.common.i_cat = UNKNOWN_ES;
break;
}
avi_chunk_strf_t *p_strf = (avi_chunk_strf_t*)p_chk;
if( p_strf->common.i_cat == AUDIO_ES )
{
- FREE( p_strf->auds.p_wf );
+ FREENULL( p_strf->auds.p_wf );
}
else if( p_strf->common.i_cat == VIDEO_ES )
{
- FREE( p_strf->vids.p_bih );
+ FREENULL( p_strf->vids.p_bih );
}
}
static int AVI_ChunkRead_strd( stream_t *s, avi_chunk_t *p_chk )
{
+ if ( p_chk->common.i_chunk_size == 0 )
+ {
+ msg_Dbg( (vlc_object_t*)s, "Zero sized pre-JUNK section met" );
+ return AVI_STRD_ZERO_CHUNK;
+ }
+
AVI_READCHUNK_ENTER;
- p_chk->strd.p_data = malloc( p_chk->common.i_chunk_size );
- memcpy( p_chk->strd.p_data,
- p_buff + 8,
- p_chk->common.i_chunk_size );
+ p_chk->strd.p_data = xmalloc( p_chk->common.i_chunk_size );
+ memcpy( p_chk->strd.p_data, p_buff + 8, p_chk->common.i_chunk_size );
AVI_READCHUNK_EXIT( VLC_SUCCESS );
}
+static void AVI_ChunkFree_strd( avi_chunk_t *p_chk )
+{
+ free( p_chk->strd.p_data );
+}
+
static int AVI_ChunkRead_idx1( stream_t *s, avi_chunk_t *p_chk )
{
unsigned int i_count, i_index;
p_chk->idx1.i_entry_max = i_count;
if( i_count > 0 )
{
- p_chk->idx1.entry = calloc( i_count, sizeof( idx1_entry_t ) );
+ p_chk->idx1.entry = xcalloc( i_count, sizeof( idx1_entry_t ) );
for( i_index = 0; i_index < i_count ; i_index++ )
{
{
p_chk->idx1.i_entry_count = 0;
p_chk->idx1.i_entry_max = 0;
- FREE( p_chk->idx1.entry )
+ FREENULL( p_chk->idx1.entry );
}
i_count = __MIN( p_indx->i_entriesinuse, i_read / 8 );
p_indx->i_entriesinuse = i_count;
- p_indx->idx.std = calloc( sizeof( indx_std_entry_t ), i_count );
+ p_indx->idx.std = xcalloc( i_count, sizeof( indx_std_entry_t ) );
for( i = 0; i < i_count; i++ )
{
i_count = __MIN( p_indx->i_entriesinuse, i_read / 12 );
p_indx->i_entriesinuse = i_count;
- p_indx->idx.field = calloc( sizeof( indx_field_entry_t ), i_count );
+ p_indx->idx.field = xcalloc( i_count, sizeof( indx_field_entry_t ) );
for( i = 0; i < i_count; i++ )
{
AVI_READ4BYTES( p_indx->idx.field[i].i_offset );
i_count = __MIN( p_indx->i_entriesinuse, i_read / 16 );
p_indx->i_entriesinuse = i_count;
- p_indx->idx.super = calloc( sizeof( indx_super_entry_t ), i_count );
+ p_indx->idx.super = xcalloc( i_count, sizeof( indx_super_entry_t ) );
for( i = 0; i < i_count; i++ )
{
{
avi_chunk_indx_t *p_indx = (avi_chunk_indx_t*)p_chk;
- FREE( p_indx->idx.std );
- FREE( p_indx->idx.field );
- FREE( p_indx->idx.super );
+ FREENULL( p_indx->idx.std );
+ FREENULL( p_indx->idx.field );
+ FREENULL( p_indx->idx.super );
+}
+
+static int AVI_ChunkRead_vprp( stream_t *s, avi_chunk_t *p_chk )
+{
+ avi_chunk_vprp_t *p_vprp = (avi_chunk_vprp_t*)p_chk;
+
+ AVI_READCHUNK_ENTER;
+
+ AVI_READ4BYTES( p_vprp->i_video_format_token );
+ AVI_READ4BYTES( p_vprp->i_video_standard );
+ AVI_READ4BYTES( p_vprp->i_vertical_refresh );
+ AVI_READ4BYTES( p_vprp->i_h_total_in_t );
+ AVI_READ4BYTES( p_vprp->i_v_total_in_lines );
+ AVI_READ4BYTES( p_vprp->i_frame_aspect_ratio );
+ AVI_READ4BYTES( p_vprp->i_frame_width_in_pixels );
+ AVI_READ4BYTES( p_vprp->i_frame_height_in_pixels );
+ AVI_READ4BYTES( p_vprp->i_nb_fields_per_frame );
+ for( unsigned i = 0; i < __MIN( p_vprp->i_nb_fields_per_frame, 2 ); i++ )
+ {
+ AVI_READ4BYTES( p_vprp->field_info[i].i_compressed_bm_height );
+ AVI_READ4BYTES( p_vprp->field_info[i].i_compressed_bm_width );
+ AVI_READ4BYTES( p_vprp->field_info[i].i_valid_bm_height );
+ AVI_READ4BYTES( p_vprp->field_info[i].i_valid_bm_width );
+ AVI_READ4BYTES( p_vprp->field_info[i].i_valid_bm_x_offset );
+ AVI_READ4BYTES( p_vprp->field_info[i].i_valid_bm_y_offset );
+ AVI_READ4BYTES( p_vprp->field_info[i].i_video_x_offset_in_t );
+ AVI_READ4BYTES( p_vprp->field_info[i].i_video_y_valid_start_line );
+ }
+
+#ifdef AVI_DEBUG
+ msg_Dbg( (vlc_object_t*)s, "vprp: format:%d standard:%d",
+ p_vprp->i_video_format_token, p_vprp->i_video_standard );
+#endif
+ AVI_READCHUNK_EXIT( VLC_SUCCESS );
}
+static int AVI_ChunkRead_dmlh( stream_t *s, avi_chunk_t *p_chk )
+{
+ avi_chunk_dmlh_t *p_dmlh = (avi_chunk_dmlh_t*)p_chk;
+
+ AVI_READCHUNK_ENTER;
+ AVI_READ4BYTES( p_dmlh->dwTotalFrames );
-static struct
+#ifdef AVI_DEBUG
+ msg_Dbg( (vlc_object_t*)s, "dmlh: dwTotalFrames %d",
+ p_dmlh->dwTotalFrames );
+#endif
+ AVI_READCHUNK_EXIT( VLC_SUCCESS );
+}
+
+static const struct
{
vlc_fourcc_t i_fourcc;
- char *psz_type;
+ const char *psz_type;
} AVI_strz_type[] =
{
- { AVIFOURCC_IARL, "archive location" },
- { AVIFOURCC_IART, "artist" },
- { AVIFOURCC_ICMS, "commisioned" },
- { AVIFOURCC_ICMT, "comments" },
- { AVIFOURCC_ICOP, "copyright" },
- { AVIFOURCC_ICRD, "creation date" },
- { AVIFOURCC_ICRP, "cropped" },
- { AVIFOURCC_IDIM, "dimensions" },
- { AVIFOURCC_IDPI, "dots per inch" },
- { AVIFOURCC_IENG, "enginner" },
- { AVIFOURCC_IGNR, "genre" },
- { AVIFOURCC_IKEY, "keywords" },
- { AVIFOURCC_ILGT, "lightness" },
- { AVIFOURCC_IMED, "medium" },
- { AVIFOURCC_INAM, "name" },
- { AVIFOURCC_IPLT, "palette setting" },
- { AVIFOURCC_IPRD, "product" },
- { AVIFOURCC_ISBJ, "subject" },
- { AVIFOURCC_ISFT, "software" },
- { AVIFOURCC_ISHP, "sharpness" },
- { AVIFOURCC_ISRC, "source" },
- { AVIFOURCC_ISRF, "source form" },
- { AVIFOURCC_ITCH, "technician" },
- { AVIFOURCC_ISMP, "time code" },
- { AVIFOURCC_IDIT, "digitalization time" },
- { AVIFOURCC_strn, "stream name" },
+ { AVIFOURCC_IARL, "Archive location" },
+ { AVIFOURCC_IART, "Artist" },
+ { AVIFOURCC_ICMS, "Commisioned" },
+ { AVIFOURCC_ICMT, "Comments" },
+ { AVIFOURCC_ICOP, "Copyright" },
+ { AVIFOURCC_ICRD, "Creation date" },
+ { AVIFOURCC_ICRP, "Cropped" },
+ { AVIFOURCC_IDIM, "Dimensions" },
+ { AVIFOURCC_IDPI, "Dots per inch" },
+ { AVIFOURCC_IENG, "Engineer" },
+ { AVIFOURCC_IGNR, "Genre" },
+ { AVIFOURCC_ISGN, "Secondary Genre" },
+ { AVIFOURCC_IKEY, "Keywords" },
+ { AVIFOURCC_ILGT, "Lightness" },
+ { AVIFOURCC_IMED, "Medium" },
+ { AVIFOURCC_INAM, "Name" },
+ { AVIFOURCC_IPLT, "Palette setting" },
+ { AVIFOURCC_IPRD, "Product" },
+ { AVIFOURCC_ISBJ, "Subject" },
+ { AVIFOURCC_ISFT, "Software" },
+ { AVIFOURCC_ISHP, "Sharpness" },
+ { AVIFOURCC_ISRC, "Source" },
+ { AVIFOURCC_ISRF, "Source form" },
+ { AVIFOURCC_ITCH, "Technician" },
+ { AVIFOURCC_ISMP, "Time code" },
+ { AVIFOURCC_IDIT, "Digitalization time" },
+ { AVIFOURCC_IWRI, "Writer" },
+ { AVIFOURCC_IPRO, "Producer" },
+ { AVIFOURCC_ICNM, "Cinematographer" },
+ { AVIFOURCC_IPDS, "Production designer" },
+ { AVIFOURCC_IEDT, "Editor" },
+ { AVIFOURCC_ICDS, "Costume designer" },
+ { AVIFOURCC_IMUS, "Music" },
+ { AVIFOURCC_ISTD, "Production studio" },
+ { AVIFOURCC_IDST, "Distributor" },
+ { AVIFOURCC_ICNT, "Country" },
+ { AVIFOURCC_ISTR, "Starring" },
+ { AVIFOURCC_IFRM, "Total number of parts" },
+ { AVIFOURCC_strn, "Stream name" },
+ { AVIFOURCC_IAS1, "First Language" },
+ { AVIFOURCC_IAS2, "Second Language" },
+ { AVIFOURCC_IAS3, "Third Language" },
+ { AVIFOURCC_IAS4, "Fourth Language" },
+ { AVIFOURCC_IAS5, "Fifth Language" },
+ { AVIFOURCC_IAS6, "Sixth Language" },
+ { AVIFOURCC_IAS7, "Seventh Language" },
+ { AVIFOURCC_IAS8, "Eighth Language" },
+ { AVIFOURCC_IAS9, "Ninth Language" },
+
{ 0, "???" }
};
+
static int AVI_ChunkRead_strz( stream_t *s, avi_chunk_t *p_chk )
{
int i_index;
}
}
p_strz->p_type = strdup( AVI_strz_type[i_index].psz_type );
- p_strz->p_str = malloc( i_read + 1);
+ p_strz->p_str = xmalloc( p_strz->i_chunk_size + 1);
if( p_strz->i_chunk_size )
{
- memcpy( p_strz->p_str, p_read, i_read );
+ memcpy( p_strz->p_str, p_read, p_strz->i_chunk_size );
}
- p_strz->p_str[i_read] = 0;
+ p_strz->p_str[p_strz->i_chunk_size] = 0;
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s, "%4.4s: %s : %s",
static void AVI_ChunkFree_strz( avi_chunk_t *p_chk )
{
avi_chunk_STRING_t *p_strz = (avi_chunk_STRING_t*)p_chk;
- FREE( p_strz->p_type );
- FREE( p_strz->p_str );
+ FREENULL( p_strz->p_type );
+ FREENULL( p_strz->p_str );
}
static int AVI_ChunkRead_nothing( stream_t *s, avi_chunk_t *p_chk )
}
static void AVI_ChunkFree_nothing( avi_chunk_t *p_chk )
{
-
+ VLC_UNUSED( p_chk );
}
-static struct
+static const struct
{
vlc_fourcc_t i_fourcc;
int (*AVI_ChunkRead_function)( stream_t *s, avi_chunk_t *p_chk );
} AVI_Chunk_Function [] =
{
{ AVIFOURCC_RIFF, AVI_ChunkRead_list, AVI_ChunkFree_nothing },
+ { AVIFOURCC_ON2, AVI_ChunkRead_list, AVI_ChunkFree_nothing },
{ AVIFOURCC_LIST, AVI_ChunkRead_list, AVI_ChunkFree_nothing },
{ AVIFOURCC_avih, AVI_ChunkRead_avih, AVI_ChunkFree_nothing },
+ { AVIFOURCC_ON2h, AVI_ChunkRead_avih, AVI_ChunkFree_nothing },
{ AVIFOURCC_strh, AVI_ChunkRead_strh, AVI_ChunkFree_nothing },
{ AVIFOURCC_strf, AVI_ChunkRead_strf, AVI_ChunkFree_strf },
- { AVIFOURCC_strd, AVI_ChunkRead_strd, AVI_ChunkFree_nothing },
+ { AVIFOURCC_strd, AVI_ChunkRead_strd, AVI_ChunkFree_strd },
{ AVIFOURCC_idx1, AVI_ChunkRead_idx1, AVI_ChunkFree_idx1 },
{ AVIFOURCC_indx, AVI_ChunkRead_indx, AVI_ChunkFree_indx },
+ { AVIFOURCC_vprp, AVI_ChunkRead_vprp, AVI_ChunkFree_nothing },
{ AVIFOURCC_JUNK, AVI_ChunkRead_nothing, AVI_ChunkFree_nothing },
+ { AVIFOURCC_dmlh, AVI_ChunkRead_dmlh, AVI_ChunkFree_nothing },
- { AVIFOURCC_IARL, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
{ AVIFOURCC_IARL, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
{ AVIFOURCC_IART, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
{ AVIFOURCC_ICMS, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
{ AVIFOURCC_IDPI, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
{ AVIFOURCC_IENG, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
{ AVIFOURCC_IGNR, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_ISGN, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
{ AVIFOURCC_IKEY, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
{ AVIFOURCC_ILGT, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
{ AVIFOURCC_IMED, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
{ AVIFOURCC_ITCH, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
{ AVIFOURCC_ISMP, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
{ AVIFOURCC_IDIT, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_ILNG, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IRTD, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IWEB, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IPRT, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IWRI, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IPRO, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_ICNM, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IPDS, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IEDT, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_ICDS, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IMUS, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_ISTD, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IDST, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_ICNT, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_ISTR, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IFRM, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IAS1, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IAS2, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IAS3, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IAS4, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IAS5, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IAS6, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IAS7, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IAS8, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+ { AVIFOURCC_IAS9, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+
+
{ AVIFOURCC_strn, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
{ 0, NULL, NULL }
};
}
}
-int _AVI_ChunkRead( stream_t *s, avi_chunk_t *p_chk, avi_chunk_t *p_father )
+int AVI_ChunkRead( stream_t *s, avi_chunk_t *p_chk, avi_chunk_t *p_father )
{
int i_index;
if( !p_chk )
{
+ msg_Warn( (vlc_object_t*)s, "cannot read null chunk" );
return VLC_EGENERIC;
}
msg_Warn( (vlc_object_t*)s, "cannot read one chunk" );
return VLC_EGENERIC;
}
+
if( p_chk->common.i_chunk_fourcc == VLC_FOURCC( 0, 0, 0, 0 ) )
{
msg_Warn( (vlc_object_t*)s, "found null fourcc chunk (corrupted file?)" );
- return VLC_EGENERIC;
+ return AVI_ZERO_FOURCC;
}
p_chk->common.p_father = p_father;
i_index = AVI_ChunkFunctionFind( p_chk->common.i_chunk_fourcc );
if( AVI_Chunk_Function[i_index].AVI_ChunkRead_function )
{
- return AVI_Chunk_Function[i_index].AVI_ChunkRead_function( s, p_chk );
+ int i_return = AVI_Chunk_Function[i_index].AVI_ChunkRead_function( s, p_chk );
+ if ( i_return == AVI_STRD_ZERO_CHUNK || i_return == AVI_ZERO_FOURCC )
+ {
+ if ( !p_father ) return VLC_EGENERIC;
+ return AVI_NextChunk( s, p_father );
+ }
+ return i_return;
}
- else if( ((char*)&p_chk->common.i_chunk_fourcc)[0] == 'i' &&
- ((char*)&p_chk->common.i_chunk_fourcc)[1] == 'x' )
+ else if( ( ((char*)&p_chk->common.i_chunk_fourcc)[0] == 'i' &&
+ ((char*)&p_chk->common.i_chunk_fourcc)[1] == 'x' ) ||
+ ( ((char*)&p_chk->common.i_chunk_fourcc)[2] == 'i' &&
+ ((char*)&p_chk->common.i_chunk_fourcc)[3] == 'x' ) )
{
p_chk->common.i_chunk_fourcc = AVIFOURCC_indx;
return AVI_ChunkRead_indx( s, p_chk );
}
- msg_Warn( (vlc_object_t*)s, "unknown chunk (not loaded)" );
+
+ msg_Warn( (vlc_object_t*)s, "unknown chunk: %4.4s (not loaded)",
+ (char*)&p_chk->common.i_chunk_fourcc );
return AVI_NextChunk( s, p_chk );
}
-void _AVI_ChunkFree( stream_t *s,
+void AVI_ChunkFree( stream_t *s,
avi_chunk_t *p_chk )
{
int i_index;
}
else
{
- msg_Warn( (vlc_object_t*)s, "unknown chunk (not unloaded)" );
+ msg_Warn( (vlc_object_t*)s, "unknown chunk: %4.4s (not unloaded)",
+ (char*)&p_chk->common.i_chunk_fourcc );
}
p_chk->common.p_first = NULL;
p_chk->common.p_last = NULL;
return;
}
-static void AVI_ChunkDumpDebug( stream_t *, avi_chunk_t *);
+static void AVI_ChunkDumpDebug_level( vlc_object_t *p_obj,
+ avi_chunk_t *p_chk, unsigned i_level )
+{
+ avi_chunk_t *p_child;
+
+ char str[512];
+ if( i_level >= (sizeof(str) - 1)/4 )
+ return;
+
+ memset( str, ' ', sizeof( str ) );
+ for( unsigned i = 1; i < i_level; i++ )
+ {
+ str[i * 4] = '|';
+ }
+ if( p_chk->common.i_chunk_fourcc == AVIFOURCC_RIFF ||
+ p_chk->common.i_chunk_fourcc == AVIFOURCC_ON2 ||
+ p_chk->common.i_chunk_fourcc == AVIFOURCC_LIST )
+ {
+ snprintf( &str[i_level * 4], sizeof(str) - 4*i_level,
+ "%c %4.4s-%4.4s size:%"PRIu64" pos:%"PRIu64,
+ i_level ? '+' : '*',
+ (char*)&p_chk->common.i_chunk_fourcc,
+ (char*)&p_chk->list.i_type,
+ p_chk->common.i_chunk_size,
+ p_chk->common.i_chunk_pos );
+ }
+ else
+ {
+ snprintf( &str[i_level * 4], sizeof(str) - 4*i_level,
+ "+ %4.4s size:%"PRIu64" pos:%"PRIu64,
+ (char*)&p_chk->common.i_chunk_fourcc,
+ p_chk->common.i_chunk_size,
+ p_chk->common.i_chunk_pos );
+ }
+ msg_Dbg( p_obj, "%s", str );
+
+ p_child = p_chk->common.p_first;
+ while( p_child )
+ {
+ AVI_ChunkDumpDebug_level( p_obj, p_child, i_level + 1 );
+ p_child = p_child->common.p_next;
+ }
+}
int AVI_ChunkReadRoot( stream_t *s, avi_chunk_t *p_root )
{
avi_chunk_list_t *p_list = (avi_chunk_list_t*)p_root;
avi_chunk_t *p_chk;
- vlc_bool_t b_seekable;
+ bool b_seekable;
stream_Control( s, STREAM_CAN_FASTSEEK, &b_seekable );
for( ; ; )
{
- p_chk = malloc( sizeof( avi_chunk_t ) );
+ p_chk = xmalloc( sizeof( avi_chunk_t ) );
memset( p_chk, 0, sizeof( avi_chunk_t ) );
if( !p_root->common.p_first )
{
}
}
- AVI_ChunkDumpDebug( s, p_root );
+ AVI_ChunkDumpDebug_level( (vlc_object_t*)s, p_root, 0 );
return VLC_SUCCESS;
}
return NULL;
}
-static void AVI_ChunkDumpDebug_level( vlc_object_t *p_obj,
- avi_chunk_t *p_chk, int i_level )
-{
- char str[1024];
- int i;
- avi_chunk_t *p_child;
-
- memset( str, ' ', sizeof( str ) );
- for( i = 1; i < i_level; i++ )
- {
- str[i * 5] = '|';
- }
- if( p_chk->common.i_chunk_fourcc == AVIFOURCC_RIFF||
- p_chk->common.i_chunk_fourcc == AVIFOURCC_LIST )
- {
- sprintf( str + i_level * 5,
- "%c %4.4s-%4.4s size:"I64Fu" pos:"I64Fu,
- i_level ? '+' : '*',
- (char*)&p_chk->common.i_chunk_fourcc,
- (char*)&p_chk->list.i_type,
- p_chk->common.i_chunk_size,
- p_chk->common.i_chunk_pos );
- }
- else
- {
- sprintf( str + i_level * 5,
- "+ %4.4s size:"I64Fu" pos:"I64Fu,
- (char*)&p_chk->common.i_chunk_fourcc,
- p_chk->common.i_chunk_size,
- p_chk->common.i_chunk_pos );
- }
- msg_Dbg( p_obj, "%s", str );
-
- p_child = p_chk->common.p_first;
- while( p_child )
- {
- AVI_ChunkDumpDebug_level( p_obj, p_child, i_level + 1 );
- p_child = p_child->common.p_next;
- }
-}
-
-static void AVI_ChunkDumpDebug( stream_t *s, avi_chunk_t *p_chk )
-{
- AVI_ChunkDumpDebug_level( (vlc_object_t*)s, p_chk, 0 );
-}
-
-
projects / vlc / blobdiff