diff options
Diffstat (limited to 'libhb/handbrake')
| -rw-r--r-- | libhb/handbrake/common.h | 20 | ||||
| -rw-r--r-- | libhb/handbrake/decomb.h | 2 | ||||
| -rw-r--r-- | libhb/handbrake/eedi2.h | 8 | ||||
| -rw-r--r-- | libhb/handbrake/handbrake.h | 8 | ||||
| -rw-r--r-- | libhb/handbrake/internal.h | 12 | ||||
| -rw-r--r-- | libhb/handbrake/vce_common.h | 2 |
6 files changed, 26 insertions, 26 deletions
diff --git a/libhb/handbrake/common.h b/libhb/handbrake/common.h index 64289554f..ab0e60545 100644 --- a/libhb/handbrake/common.h +++ b/libhb/handbrake/common.h @@ -6,7 +6,7 @@ It may be used under the terms of the GNU General Public License v2. For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ - + #ifndef HANDBRAKE_COMMON_H #define HANDBRAKE_COMMON_H @@ -170,7 +170,7 @@ int hb_subtitle_add(const hb_job_t * job, const hb_subtitle_config_t * subtitlec int hb_import_subtitle_add( const hb_job_t * job, const hb_subtitle_config_t * subtitlecfg, const char *lang_code, int source ); -int hb_srt_add(const hb_job_t * job, const hb_subtitle_config_t * subtitlecfg, +int hb_srt_add(const hb_job_t * job, const hb_subtitle_config_t * subtitlecfg, const char *lang); int hb_subtitle_can_force( int source ); int hb_subtitle_can_burn( int source ); @@ -684,7 +684,7 @@ struct hb_job_s int angle; // dvd angle to encode int frame_to_start; // declare eof when we hit this frame - int64_t pts_to_start; // drop frames until we pass this pts + int64_t pts_to_start; // drop frames until we pass this pts // in the time-linearized input stream int frame_to_stop; // declare eof when we hit this frame int64_t pts_to_stop; // declare eof when we pass this pts in @@ -912,7 +912,7 @@ struct hb_chapter_s /* * A subtitle track. - * + * * Required fields when a demuxer creates a subtitle track are: * > id * - ID of this track @@ -927,7 +927,7 @@ struct hb_chapter_s * > source * - used to create the appropriate subtitle decoder work-object in do_job() * > config.dest - * - whether to render the subtitle on the video track (RENDERSUB) or + * - whether to render the subtitle on the video track (RENDERSUB) or * to pass it through its own subtitle track in the output container (PASSTHRUSUB) * - all newly created non-VOBSUB tracks should default to PASSTHRUSUB * - all newly created VOBSUB tracks should default to RENDERSUB, for legacy compatibility @@ -973,14 +973,14 @@ struct hb_subtitle_s char lang[1024]; char iso639_2[4]; uint32_t attributes; /* Closed Caption, Childrens, Directors etc */ - + // Color lookup table for VOB subtitle tracks. Each entry is in YCbCr format. // Must be filled out by the demuxer for VOB subtitle tracks. uint32_t palette[16]; uint8_t palette_set; int width; int height; - + // Codec private data for subtitles originating from FFMPEG sources uint8_t * extradata; int extradata_size; @@ -1005,7 +1005,7 @@ struct hb_subtitle_s /* * An attachment. - * + * * These are usually used for attaching embedded fonts to movies containing SSA subtitles. */ struct hb_attachment_s @@ -1029,7 +1029,7 @@ struct hb_coverart_s } type; }; -struct hb_metadata_s +struct hb_metadata_s { char *name; char *artist; // Actors @@ -1217,7 +1217,7 @@ struct hb_work_object_s * decode (it can be called even if init & work haven't been). * currently it's only called for audio streams & can be null for * other work objects. */ - int (* bsinfo) ( hb_work_object_t *, const hb_buffer_t *, + int (* bsinfo) ( hb_work_object_t *, const hb_buffer_t *, hb_work_info_t * ); void (* flush) ( hb_work_object_t * ); diff --git a/libhb/handbrake/decomb.h b/libhb/handbrake/decomb.h index bec6ee12e..b0c8f9f37 100644 --- a/libhb/handbrake/decomb.h +++ b/libhb/handbrake/decomb.h @@ -6,7 +6,7 @@ It may be used under the terms of the GNU General Public License v2. For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ - + #ifndef HANDBRAKE_DECOMB_H #define HANDBRAKE_DECOMB_H diff --git a/libhb/handbrake/eedi2.h b/libhb/handbrake/eedi2.h index 734bad8e8..a67de103b 100644 --- a/libhb/handbrake/eedi2.h +++ b/libhb/handbrake/eedi2.h @@ -6,7 +6,7 @@ It may be used under the terms of the GNU General Public License v2. For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ - + #ifndef HANDBRAKE_EEDI2_H #define HANDBRAKE_EEDI2_H @@ -46,7 +46,7 @@ void eedi2_erode_edge_mask( uint8_t *mskp, int msk_pitch, uint8_t *dstp, int dst // If none of the 6 horizontally adjacent pixels are masked, // don't consider the current pixel masked. If there are any // masked on both sides, consider the current pixel masked. -void eedi2_remove_small_gaps( uint8_t * mskp, int msk_pitch, uint8_t * dstp, int dst_pitch, +void eedi2_remove_small_gaps( uint8_t * mskp, int msk_pitch, uint8_t * dstp, int dst_pitch, int height, int width ); // Spatial vectors. Looks at maximum_search_distance surrounding pixels @@ -85,10 +85,10 @@ void eedi2_post_process( uint8_t * nmskp, int nmsk_pitch, uint8_t * omskp, int o void eedi2_gaussian_blur1( uint8_t * src, int src_pitch, uint8_t * tmp, int tmp_pitch, uint8_t * dst, int dst_pitch, int height, int width ); - + void eedi2_gaussian_blur_sqrt2( int *src, int *tmp, int *dst, const int pitch, const int height, const int width ); - + void eedi2_calc_derivatives( uint8_t *srcp, int src_pitch, int height, int width, int *x2, int *y2, int *xy); diff --git a/libhb/handbrake/handbrake.h b/libhb/handbrake/handbrake.h index 53d5fadd0..94c79a492 100644 --- a/libhb/handbrake/handbrake.h +++ b/libhb/handbrake/handbrake.h @@ -6,7 +6,7 @@ It may be used under the terms of the GNU General Public License v2. For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ - + #ifndef HANDBRAKE_HANDBRAKE_H #define HANDBRAKE_HANDBRAKE_H @@ -67,7 +67,7 @@ hb_title_set_t * hb_get_title_set( hb_handle_t * ); int hb_detect_comb( hb_buffer_t * buf, int color_equal, int color_diff, int threshold, int prog_equal, int prog_diff, int prog_threshold ); // JJJ: title->job? -int hb_save_preview( hb_handle_t * h, int title, int preview, +int hb_save_preview( hb_handle_t * h, int title, int preview, hb_buffer_t *buf ); hb_buffer_t * hb_read_preview( hb_handle_t * h, hb_title_t *title, int preview ); @@ -80,7 +80,7 @@ void hb_set_anamorphic_size2(hb_geometry_t *src_geo, hb_geometry_t *result); void hb_add_filter_dict( hb_job_t * job, hb_filter_object_t * filter, const hb_dict_t * settings_in ); -void hb_add_filter( hb_job_t * job, hb_filter_object_t * filter, +void hb_add_filter( hb_job_t * job, hb_filter_object_t * filter, const char * settings ); void hb_add_filter2( hb_value_array_t * list, hb_dict_t * filter ); @@ -115,7 +115,7 @@ typedef struct hb_interjob_s hb_subtitle_t *select_subtitle; /* foreign language scan subtitle */ } hb_interjob_t; -hb_interjob_t * hb_interjob_get( hb_handle_t * ); +hb_interjob_t * hb_interjob_get( hb_handle_t * ); /* hb_get_state() Should be regularly called by the UI (like 5 or 10 times a second). diff --git a/libhb/handbrake/internal.h b/libhb/handbrake/internal.h index ad860379f..98111017b 100644 --- a/libhb/handbrake/internal.h +++ b/libhb/handbrake/internal.h @@ -27,7 +27,7 @@ extern int global_verbosity_level; // Global variable for hb_deep_log typedef enum hb_debug_level_s { HB_SUPPORT_LOG = 1, // helpful in tech support - HB_HOUSEKEEPING_LOG = 2, // stuff we hate scrolling through + HB_HOUSEKEEPING_LOG = 2, // stuff we hate scrolling through HB_GRANULAR_LOG = 3 // sample-by-sample } hb_debug_level_t; void hb_valog( hb_debug_level_t level, const char * prefix, const char * log, va_list args) HB_WPRINTF(3,0); @@ -58,7 +58,7 @@ void hb_job_setup_passes(hb_handle_t *h, hb_job_t *job, hb_list_t *list_pass); /* * Holds a packet of data that is moving through the transcoding process. - * + * * May have metadata associated with it via extra fields * that are conditionally used depending on the type of packet. */ @@ -74,7 +74,7 @@ struct hb_buffer_settings_s int64_t stop; // stop time of frame int64_t renderOffset; // DTS used by b-frame offsets in muxmp4 int64_t pcr; - int scr_sequence; // The SCR sequence that this buffer's + int scr_sequence; // The SCR sequence that this buffer's // timestamps are referenced to int split; uint8_t discontinuity; @@ -271,9 +271,9 @@ static inline hb_buffer_t * hb_video_buffer_init( int width, int height ) /*********************************************************************** * Threads: scan.c, work.c, reader.c, muxcommon.c **********************************************************************/ -hb_thread_t * hb_scan_init( hb_handle_t *, volatile int * die, - const char * path, int title_index, - hb_title_set_t * title_set, int preview_count, +hb_thread_t * hb_scan_init( hb_handle_t *, volatile int * die, + const char * path, int title_index, + hb_title_set_t * title_set, int preview_count, int store_previews, uint64_t min_duration ); hb_thread_t * hb_work_init( hb_list_t * jobs, volatile int * die, hb_error_code * error, hb_job_t ** job ); diff --git a/libhb/handbrake/vce_common.h b/libhb/handbrake/vce_common.h index 3fa8a31df..b8e8166f4 100644 --- a/libhb/handbrake/vce_common.h +++ b/libhb/handbrake/vce_common.h @@ -16,7 +16,7 @@ int hb_vce_h265_available(); static const char * const hb_vce_h264_profile_names[] = { "baseline", "main", "high", NULL, }; static const char * const hb_vce_h265_profile_names[] = { "main", NULL, }; -static const char * const hb_vce_h264_level_names[] = +static const char * const hb_vce_h264_level_names[] = { "auto", "1.0", "1.1", "1.2", "1.3", "2.0", "2.1", "2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "5.0", "5.1", "5.2", NULL, |