diff options
| author | van <[email protected]> | 2008-05-31 17:00:42 +0000 |
|---|---|---|
| committer | van <[email protected]> | 2008-05-31 17:00:42 +0000 |
| commit | afbd06d8d6151b69bbb18adf83cfab8d680c3946 (patch) | |
| tree | 4e7be731854c8b8db8f87934c301c60a9155387c /libhb/internal.h | |
| parent | d0550da569b56a71857c34463c5b030172d47291 (diff) | |
- support blu-ray, avchd & dvb x264
- support video files handled by ffmpeg (avi, mkv, mp4, etc.)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1480 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/internal.h')
| -rw-r--r-- | libhb/internal.h | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/libhb/internal.h b/libhb/internal.h index 39364fcd3..95545acc2 100644 --- a/libhb/internal.h +++ b/libhb/internal.h @@ -97,22 +97,9 @@ hb_thread_t * hb_work_init( hb_list_t * jobs, int cpu_count, volatile int * die, int * error, hb_job_t ** job ); hb_thread_t * hb_reader_init( hb_job_t * ); hb_thread_t * hb_muxer_init( hb_job_t * ); - -/*********************************************************************** - * libmpeg2 wrapper - *********************************************************************** - * It is exported here because it is used at several places - **********************************************************************/ -typedef struct hb_libmpeg2_s hb_libmpeg2_t; - -hb_libmpeg2_t * hb_libmpeg2_init(); -int hb_libmpeg2_decode( hb_libmpeg2_t *, - hb_buffer_t * es_buf, - hb_list_t * raw_list ); -void hb_libmpeg2_info( hb_libmpeg2_t * m, int * width, - int * height, int * rate, int * aspect_ratio ); -void hb_libmpeg2_close( hb_libmpeg2_t ** ); -int hb_libmpeg2_clear_aspect_ratio( hb_libmpeg2_t * ); +hb_work_object_t * hb_get_work( int ); +hb_work_object_t * hb_codec_decoder( int ); +hb_work_object_t * hb_codec_encoder( int ); /*********************************************************************** * mpegdemux.c @@ -124,6 +111,7 @@ typedef struct { } hb_psdemux_t; int hb_demux_ps( hb_buffer_t * ps_buf, hb_list_t * es_list, hb_psdemux_t * ); +int hb_demux_null( hb_buffer_t * ps_buf, hb_list_t * es_list, hb_psdemux_t * ); /*********************************************************************** * dvd.c @@ -142,12 +130,15 @@ int hb_dvd_chapter( hb_dvd_t * ); int hb_dvd_is_break( hb_dvd_t * d ); void hb_dvd_close( hb_dvd_t ** ); -hb_stream_t * hb_stream_open( char * path, int opentype ); +hb_stream_t * hb_stream_open( char * path, hb_title_t *title ); void hb_stream_close( hb_stream_t ** ); hb_title_t * hb_stream_title_scan( hb_stream_t *); int hb_stream_read( hb_stream_t *, hb_buffer_t *); int hb_stream_seek( hb_stream_t *, float ); +void * hb_ffmpeg_context( int codec_param ); +void * hb_ffmpeg_avstream( int codec_param ); + /*********************************************************************** * Work objects **********************************************************************/ @@ -213,6 +204,9 @@ enum WORK_DECA52, WORK_DECDCA, WORK_DECAVCODEC, + WORK_DECAVCODECV, + WORK_DECAVCODECVI, + WORK_DECAVCODECAI, WORK_DECLPCM, WORK_ENCFAAC, WORK_ENCLAME, |