From 1b7948495fcf4d511e62d7f9c3a0c1a3ccb59f80 Mon Sep 17 00:00:00 2001 From: John Stebbins Date: Wed, 11 Sep 2019 09:56:06 -0700 Subject: [PATCH] libhb: resolve header conflicts with pango/harfbuzz Newest versions appear to have a "common.h" somewhere that is interfering with libhb/common.h. move headers into "handbrake" subdirectory --- gtk/src/audiohandler.c | 2 +- gtk/src/callbacks.c | 2 +- gtk/src/callbacks.h | 2 +- gtk/src/hb-backend.c | 4 +-- gtk/src/hb-backend.h | 4 +-- gtk/src/main.c | 2 +- gtk/src/presets.c | 4 +-- gtk/src/presets.h | 2 +- gtk/src/preview.c | 2 +- gtk/src/queuehandler.c | 2 +- gtk/src/subtitlehandler.c | 2 +- gtk/src/values.h | 2 +- libhb/audio_remap.c | 6 ++-- libhb/audio_resample.c | 6 ++-- libhb/avfilter.c | 6 ++-- libhb/batch.c | 4 +-- libhb/bd.c | 6 ++-- libhb/chroma_smooth.c | 2 +- libhb/colormap.c | 2 +- libhb/colorspace.c | 4 +-- libhb/comb_detect.c | 4 +-- libhb/common.c | 18 ++++++------ libhb/compat.c | 2 +- libhb/cropscale.c | 4 +-- libhb/deblock.c | 4 +-- libhb/decavcodec.c | 14 +++++----- libhb/deccc608sub.c | 4 +-- libhb/declpcm.c | 6 ++-- libhb/decomb.c | 10 +++---- libhb/decpgssub.c | 4 +-- libhb/decsrtsub.c | 6 ++-- libhb/decssasub.c | 6 ++-- libhb/dectx3gsub.c | 4 +-- libhb/decutf8sub.c | 4 +-- libhb/decvobsub.c | 2 +- libhb/deinterlace.c | 6 ++-- libhb/demuxmpeg.c | 2 +- libhb/denoise.c | 4 +-- libhb/detelecine.c | 4 +-- libhb/dvd.c | 6 ++-- libhb/dvdnav.c | 6 ++-- libhb/eedi2.c | 4 +-- libhb/enc_qsv.c | 14 +++++----- libhb/encavcodec.c | 12 ++++---- libhb/encavcodecaudio.c | 4 +-- libhb/enctheora.c | 2 +- libhb/encvobsub.c | 2 +- libhb/encvorbis.c | 4 +-- libhb/encx264.c | 6 ++-- libhb/encx265.c | 8 +++--- libhb/fifo.c | 4 +-- libhb/grayscale.c | 6 ++-- libhb/{ => handbrake}/audio_remap.h | 0 libhb/{ => handbrake}/audio_resample.h | 0 libhb/{ => handbrake}/avfilter_priv.h | 2 +- libhb/{ => handbrake}/bits.h | 0 libhb/{ => handbrake}/colormap.h | 0 libhb/{ => handbrake}/common.h | 6 ++-- libhb/{ => handbrake}/compat.h | 0 libhb/{ => handbrake}/deccc608sub.h | 2 +- libhb/{ => handbrake}/decomb.h | 0 libhb/{ => handbrake}/decsrtsub.h | 0 libhb/{ => handbrake}/decssasub.h | 0 libhb/{ => handbrake}/dvd.h | 0 libhb/{ => handbrake}/eedi2.h | 0 libhb/{ => handbrake}/encx264.h | 2 +- libhb/{ => handbrake}/h264_common.h | 0 libhb/{ => handbrake}/h265_common.h | 2 +- libhb/{ => handbrake}/handbrake.h | 16 +++++------ libhb/{ => handbrake}/hb_dict.h | 2 +- libhb/{ => handbrake}/hb_json.h | 2 +- libhb/{ => handbrake}/hbavfilter.h | 2 +- libhb/{ => handbrake}/hbffmpeg.h | 2 +- libhb/{ => handbrake}/hbtypes.h | 0 libhb/{ => handbrake}/internal.h | 6 ++-- libhb/{ => handbrake}/lang.h | 0 libhb/{ => handbrake}/nal_units.h | 2 +- libhb/{ => handbrake}/nlmeans.h | 0 libhb/{ => handbrake}/nvenc_common.h | 0 libhb/{ => handbrake}/param.h | 0 libhb/{ => handbrake}/plist.h | 2 +- libhb/{ => handbrake}/ports.h | 2 +- libhb/{ => handbrake}/preset.h | 4 +-- libhb/{ => handbrake}/preset_builtin.h | 0 libhb/{ => handbrake}/project.h.m4 | 0 libhb/{ => handbrake}/qsv_common.h | 4 +-- libhb/{ => handbrake}/qsv_filter.h | 2 +- libhb/{ => handbrake}/qsv_filter_pp.h | 2 +- libhb/{ => handbrake}/qsv_libav.h | 0 libhb/{ => handbrake}/qsv_memory.h | 4 +-- libhb/{ => handbrake}/ssautil.h | 0 libhb/{ => handbrake}/taskset.h | 2 +- libhb/{ => handbrake}/vce_common.h | 0 libhb/hb.c | 8 +++--- libhb/hb_dict.c | 4 +-- libhb/hb_json.c | 6 ++-- libhb/hbavfilter.c | 8 +++--- libhb/hbffmpeg.c | 4 +-- libhb/lang.c | 2 +- libhb/lapsharp.c | 2 +- libhb/module.defs | 4 +-- libhb/mt_frame_filter.c | 4 +-- libhb/muxavformat.c | 6 ++-- libhb/muxcommon.c | 4 +-- libhb/nal_units.c | 4 +-- libhb/nlmeans.c | 8 +++--- libhb/nlmeans_x86.c | 4 +-- libhb/nvenc_common.c | 4 +-- libhb/pad.c | 6 ++-- libhb/param.c | 12 ++++---- libhb/platform/macosx/encca_aac.c | 4 +-- libhb/platform/macosx/vt_common.c | 2 +- libhb/plist.c | 6 ++-- libhb/ports.c | 4 +-- libhb/preset.c | 12 ++++---- libhb/qsv_common.c | 32 ++++++++++------------ libhb/qsv_filter.c | 10 +++---- libhb/qsv_filter_pp.c | 14 +++++----- libhb/qsv_libav.c | 6 ++-- libhb/qsv_memory.c | 8 +++--- libhb/reader.c | 2 +- libhb/rendersub.c | 4 +-- libhb/rotate.c | 4 +-- libhb/scan.c | 4 +-- libhb/ssautil.c | 4 +-- libhb/stream.c | 6 ++-- libhb/sync.c | 6 ++-- libhb/taskset.c | 6 ++-- libhb/unsharp.c | 2 +- libhb/vce_common.c | 4 +-- libhb/vfr.c | 2 +- libhb/work.c | 10 +++---- macosx/HBAudio.m | 2 +- macosx/HBAudioDefaults.m | 4 +-- macosx/HBAudioTrack.m | 2 +- macosx/HBAudioTrackPreset.m | 2 +- macosx/HBAudioTransformers.m | 2 +- macosx/HBFilters+UIAdditions.m | 2 +- macosx/HBFilters.m | 2 +- macosx/HBImageUtilities.m | 2 +- macosx/HBJob+HBAdditions.m | 2 +- macosx/HBJob+HBJobConversion.h | 2 +- macosx/HBJob+UIAdditions.m | 2 +- macosx/HBJob.m | 2 +- macosx/HBLanguagesSelection.m | 2 +- macosx/HBPicture+UIAdditions.m | 2 +- macosx/HBPicture.m | 2 +- macosx/HBPreset.m | 2 +- macosx/HBPresetsManager.m | 2 +- macosx/HBStateFormatter+Private.h | 2 +- macosx/HBStateFormatter.m | 2 +- macosx/HBSubtitles.m | 2 +- macosx/HBSubtitlesTrack.m | 4 +-- macosx/HBTitle+Private.h | 2 +- macosx/HBTitle.m | 2 +- macosx/HBUtilities.m | 2 +- macosx/HBVideo+UIAdditions.m | 2 +- macosx/HBVideo.m | 2 +- macosx/HandBrake.xcodeproj/project.pbxproj | 4 +-- macosx/NSDictionary+HBAdditions.h | 2 +- test/parsecsv.c | 2 +- test/test.c | 6 ++-- 162 files changed, 314 insertions(+), 318 deletions(-) rename libhb/{ => handbrake}/audio_remap.h (100%) rename libhb/{ => handbrake}/audio_resample.h (100%) rename libhb/{ => handbrake}/avfilter_priv.h (96%) rename libhb/{ => handbrake}/bits.h (100%) rename libhb/{ => handbrake}/colormap.h (100%) rename libhb/{ => handbrake}/common.h (99%) rename libhb/{ => handbrake}/compat.h (100%) rename libhb/{ => handbrake}/deccc608sub.h (99%) rename libhb/{ => handbrake}/decomb.h (100%) rename libhb/{ => handbrake}/decsrtsub.h (100%) rename libhb/{ => handbrake}/decssasub.h (100%) rename libhb/{ => handbrake}/dvd.h (100%) rename libhb/{ => handbrake}/eedi2.h (100%) rename libhb/{ => handbrake}/encx264.h (98%) rename libhb/{ => handbrake}/h264_common.h (100%) rename libhb/{ => handbrake}/h265_common.h (98%) rename libhb/{ => handbrake}/handbrake.h (95%) rename libhb/{ => handbrake}/hb_dict.h (99%) rename libhb/{ => handbrake}/hb_json.h (98%) rename libhb/{ => handbrake}/hbavfilter.h (97%) rename libhb/{ => handbrake}/hbffmpeg.h (98%) rename libhb/{ => handbrake}/hbtypes.h (100%) rename libhb/{ => handbrake}/internal.h (99%) rename libhb/{ => handbrake}/lang.h (100%) rename libhb/{ => handbrake}/nal_units.h (98%) rename libhb/{ => handbrake}/nlmeans.h (100%) rename libhb/{ => handbrake}/nvenc_common.h (100%) rename libhb/{ => handbrake}/param.h (100%) rename libhb/{ => handbrake}/plist.h (95%) rename libhb/{ => handbrake}/ports.h (99%) rename libhb/{ => handbrake}/preset.h (99%) rename libhb/{ => handbrake}/preset_builtin.h (100%) rename libhb/{ => handbrake}/project.h.m4 (100%) rename libhb/{ => handbrake}/qsv_common.h (99%) rename libhb/{ => handbrake}/qsv_filter.h (98%) rename libhb/{ => handbrake}/qsv_filter_pp.h (99%) rename libhb/{ => handbrake}/qsv_libav.h (100%) rename libhb/{ => handbrake}/qsv_memory.h (97%) rename libhb/{ => handbrake}/ssautil.h (100%) rename libhb/{ => handbrake}/taskset.h (98%) rename libhb/{ => handbrake}/vce_common.h (100%) diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c index e922d40f740c..404c37659cfd 100644 --- a/gtk/src/audiohandler.c +++ b/gtk/src/audiohandler.c @@ -24,7 +24,7 @@ #include #include "ghbcompat.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "settings.h" #include "jobdict.h" #include "titledict.h" diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index b8c41321ece4..0a9442c9bc4c 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -74,7 +74,7 @@ #include #endif -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "callbacks.h" #include "chapters.h" #include "queuehandler.h" diff --git a/gtk/src/callbacks.h b/gtk/src/callbacks.h index 94f64bb742a3..d2390e0ff26b 100644 --- a/gtk/src/callbacks.h +++ b/gtk/src/callbacks.h @@ -30,7 +30,7 @@ #endif #include -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "values.h" #include "settings.h" diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 260f09034a22..535d60f93f8b 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -25,7 +25,7 @@ #include #include #include -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "ghbcompat.h" #include #include @@ -39,7 +39,7 @@ #include "preview.h" #include "presets.h" #include "values.h" -#include "lang.h" +#include "handbrake/lang.h" #include "jansson.h" typedef struct diff --git a/gtk/src/hb-backend.h b/gtk/src/hb-backend.h index 37d21c14a248..38b1545a8ed9 100644 --- a/gtk/src/hb-backend.h +++ b/gtk/src/hb-backend.h @@ -26,8 +26,8 @@ #include "values.h" #include "settings.h" -#include "handbrake.h" -#include "lang.h" +#include "handbrake/handbrake.h" +#include "handbrake/lang.h" enum { diff --git a/gtk/src/main.c b/gtk/src/main.c index 7b59bc4608d3..c7c422724309 100644 --- a/gtk/src/main.c +++ b/gtk/src/main.c @@ -47,7 +47,7 @@ #include #include #include -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "renderer_button.h" #include "hb-backend.h" #include "ghb-dvd.h" diff --git a/gtk/src/presets.c b/gtk/src/presets.c index f06f4552d96a..8e94cfb6c9e3 100644 --- a/gtk/src/presets.c +++ b/gtk/src/presets.c @@ -31,7 +31,7 @@ #include #include #include "ghbcompat.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "settings.h" #include "callbacks.h" #include "audiohandler.h" @@ -40,7 +40,7 @@ #include "resources.h" #include "presets.h" #include "values.h" -#include "lang.h" +#include "handbrake/lang.h" #include "videohandler.h" #define MAX_NESTED_PRESET 3 diff --git a/gtk/src/presets.h b/gtk/src/presets.h index 32011e4e2a12..aed1d5d56cc3 100644 --- a/gtk/src/presets.h +++ b/gtk/src/presets.h @@ -24,7 +24,7 @@ #if !defined(_GHB_PRESETS_H_) #define _GHB_PRESETS_H_ -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "values.h" void ghb_presets_load(signal_user_data_t *ud); diff --git a/gtk/src/preview.c b/gtk/src/preview.c index 7ae9563550d1..be97edbe8e59 100644 --- a/gtk/src/preview.c +++ b/gtk/src/preview.c @@ -43,7 +43,7 @@ #include "preview.h" #include "values.h" #include "queuehandler.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" #define PREVIEW_STATE_IMAGE 0 #define PREVIEW_STATE_LIVE 1 diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c index efc8292db77c..ace9064dd6c9 100644 --- a/gtk/src/queuehandler.c +++ b/gtk/src/queuehandler.c @@ -26,7 +26,7 @@ #include #include #include -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "settings.h" #include "jobdict.h" #include "titledict.h" diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c index 5e31f684f6c7..d7d0c7e9cf42 100644 --- a/gtk/src/subtitlehandler.c +++ b/gtk/src/subtitlehandler.c @@ -24,7 +24,7 @@ #include #include "ghbcompat.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "settings.h" #include "jobdict.h" #include "titledict.h" diff --git a/gtk/src/values.h b/gtk/src/values.h index fabc2021f09f..a6369a7a1baf 100644 --- a/gtk/src/values.h +++ b/gtk/src/values.h @@ -26,7 +26,7 @@ #include #include -#include "hb_dict.h" +#include "handbrake/hb_dict.h" #define GHB_DICT HB_VALUE_TYPE_DICT #define GHB_ARRAY HB_VALUE_TYPE_ARRAY diff --git a/libhb/audio_remap.c b/libhb/audio_remap.c index b480a69dd41a..e44a9572c597 100644 --- a/libhb/audio_remap.c +++ b/libhb/audio_remap.c @@ -7,9 +7,9 @@ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "common.h" -#include "hbffmpeg.h" -#include "audio_remap.h" +#include "handbrake/common.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/audio_remap.h" // source: libavutil/channel_layout.h hb_chan_map_t hb_libav_chan_map = diff --git a/libhb/audio_resample.c b/libhb/audio_resample.c index d415b574aa78..3c1bb6f006d0 100644 --- a/libhb/audio_resample.c +++ b/libhb/audio_resample.c @@ -7,9 +7,9 @@ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "common.h" -#include "hbffmpeg.h" -#include "audio_resample.h" +#include "handbrake/common.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/audio_resample.h" hb_audio_resample_t* hb_audio_resample_init(enum AVSampleFormat sample_fmt, int sample_rate, diff --git a/libhb/avfilter.c b/libhb/avfilter.c index d7fe4ea04ea6..64dab837165b 100644 --- a/libhb/avfilter.c +++ b/libhb/avfilter.c @@ -7,9 +7,9 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "common.h" -#include "hbavfilter.h" -#include "avfilter_priv.h" +#include "handbrake/common.h" +#include "handbrake/hbavfilter.h" +#include "handbrake/avfilter_priv.h" static int avfilter_init(hb_filter_object_t * filter, hb_filter_init_t * init); static int avfilter_post_init( hb_filter_object_t * filter, hb_job_t * job ); diff --git a/libhb/batch.c b/libhb/batch.c index ca61d39321e6..d633d83b85c2 100644 --- a/libhb/batch.c +++ b/libhb/batch.c @@ -7,8 +7,8 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "lang.h" +#include "handbrake/handbrake.h" +#include "handbrake/lang.h" struct hb_batch_s { diff --git a/libhb/bd.c b/libhb/bd.c index ba230d98fc5d..c5a41c7fc8cf 100644 --- a/libhb/bd.c +++ b/libhb/bd.c @@ -7,9 +7,9 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "lang.h" -#include "hbffmpeg.h" +#include "handbrake/handbrake.h" +#include "handbrake/lang.h" +#include "handbrake/hbffmpeg.h" #include "libbluray/bluray.h" diff --git a/libhb/chroma_smooth.c b/libhb/chroma_smooth.c index 0cbfbeea10d2..1b14dc8cbb43 100644 --- a/libhb/chroma_smooth.c +++ b/libhb/chroma_smooth.c @@ -8,7 +8,7 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" +#include "handbrake/handbrake.h" #define CHROMA_SMOOTH_STRENGTH_DEFAULT 0.25 #define CHROMA_SMOOTH_SIZE_DEFAULT 7 diff --git a/libhb/colormap.c b/libhb/colormap.c index 071af4d88649..862036254458 100644 --- a/libhb/colormap.c +++ b/libhb/colormap.c @@ -10,7 +10,7 @@ #include #include #include -#include "colormap.h" +#include "handbrake/colormap.h" typedef struct { diff --git a/libhb/colorspace.c b/libhb/colorspace.c index 581886561a53..2e94fc0450b4 100644 --- a/libhb/colorspace.c +++ b/libhb/colorspace.c @@ -7,8 +7,8 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "common.h" -#include "avfilter_priv.h" +#include "handbrake/common.h" +#include "handbrake/avfilter_priv.h" static int colorspace_init(hb_filter_object_t * filter, hb_filter_init_t * init); diff --git a/libhb/comb_detect.c b/libhb/comb_detect.c index 6bd9223982e2..b0917cb9c605 100644 --- a/libhb/comb_detect.c +++ b/libhb/comb_detect.c @@ -28,8 +28,8 @@ Original "Faster" settings: #define FILTER_CLASSIC 1 #define FILTER_ERODE_DILATE 2 -#include "handbrake.h" -#include "taskset.h" +#include "handbrake/handbrake.h" +#include "handbrake/taskset.h" typedef struct decomb_thread_arg_s { hb_filter_private_t *pv; diff --git a/libhb/common.c b/libhb/common.c index a3edef84a52b..f7fb9dbb542e 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -12,15 +12,15 @@ #include #include -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "x264.h" -#include "lang.h" -#include "common.h" -#include "h264_common.h" -#include "h265_common.h" -#include "encx264.h" +#include "handbrake/lang.h" +#include "handbrake/common.h" +#include "handbrake/h264_common.h" +#include "handbrake/h265_common.h" +#include "handbrake/encx264.h" #if HB_PROJECT_FEATURE_QSV -#include "qsv_common.h" +#include "handbrake/qsv_common.h" #endif #if HB_PROJECT_FEATURE_X265 @@ -32,10 +32,10 @@ #endif #if HB_PROJECT_FEATURE_NVENC -#include "nvenc_common.h" +#include "handbrake/nvenc_common.h" #endif #if HB_PROJECT_FEATURE_VCE -#include "vce_common.h" +#include "handbrake/vce_common.h" #endif #ifdef __APPLE__ diff --git a/libhb/compat.c b/libhb/compat.c index 67a5dba7eb6a..fd69dec8b9b3 100644 --- a/libhb/compat.c +++ b/libhb/compat.c @@ -7,7 +7,7 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "compat.h" +#include "handbrake/compat.h" #ifdef HB_NEED_STRTOK_R #include diff --git a/libhb/cropscale.c b/libhb/cropscale.c index 09af92e09e0d..10e7d01c9678 100644 --- a/libhb/cropscale.c +++ b/libhb/cropscale.c @@ -7,8 +7,8 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "common.h" -#include "avfilter_priv.h" +#include "handbrake/common.h" +#include "handbrake/avfilter_priv.h" static int crop_scale_init(hb_filter_object_t * filter, hb_filter_init_t * init); diff --git a/libhb/deblock.c b/libhb/deblock.c index 31efc1d15954..42627b48c899 100644 --- a/libhb/deblock.c +++ b/libhb/deblock.c @@ -7,8 +7,8 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "common.h" -#include "avfilter_priv.h" +#include "handbrake/common.h" +#include "handbrake/avfilter_priv.h" static int deblock_init(hb_filter_object_t * filter, hb_filter_init_t * init); diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c index f705d7035b81..4c4fb3446730 100644 --- a/libhb/decavcodec.c +++ b/libhb/decavcodec.c @@ -38,20 +38,20 @@ VC1 decoder) can't easily be used by the HB mpeg stream reader. */ -#include "handbrake.h" -#include "hbffmpeg.h" -#include "hbavfilter.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/hbavfilter.h" #include "libavfilter/avfilter.h" #include "libavfilter/buffersrc.h" #include "libavfilter/buffersink.h" #include "libavutil/hwcontext.h" -#include "lang.h" -#include "audio_resample.h" +#include "handbrake/lang.h" +#include "handbrake/audio_resample.h" #if HB_PROJECT_FEATURE_QSV #include "libavutil/hwcontext_qsv.h" -#include "qsv_common.h" -#include "qsv_libav.h" +#include "handbrake/qsv_common.h" +#include "handbrake/qsv_libav.h" #endif static void compute_frame_duration( hb_work_private_t *pv ); diff --git a/libhb/deccc608sub.c b/libhb/deccc608sub.c index e0defc7850e6..6a6a8494de8b 100644 --- a/libhb/deccc608sub.c +++ b/libhb/deccc608sub.c @@ -13,8 +13,8 @@ * * Note that the SRT sub generation from CC could be useful for mkv subs. */ -#include "handbrake.h" -#include "deccc608sub.h" +#include "handbrake/handbrake.h" +#include "handbrake/deccc608sub.h" #define SSA_PREAMBLE_LEN 24 /* diff --git a/libhb/declpcm.c b/libhb/declpcm.c index 1c322c568602..cf2f99de31f5 100644 --- a/libhb/declpcm.c +++ b/libhb/declpcm.c @@ -7,9 +7,9 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "hbffmpeg.h" -#include "audio_resample.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/audio_resample.h" struct hb_work_private_s { diff --git a/libhb/decomb.c b/libhb/decomb.c index 13adfd01c6da..3721f9a591b1 100644 --- a/libhb/decomb.c +++ b/libhb/decomb.c @@ -54,11 +54,11 @@ which will feed EEDI2 interpolations to yadif. 12-15: EEDI2 will override cubic interpolation *****/ -#include "handbrake.h" -#include "hbffmpeg.h" -#include "eedi2.h" -#include "taskset.h" -#include "decomb.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/eedi2.h" +#include "handbrake/taskset.h" +#include "handbrake/decomb.h" #define PARITY_DEFAULT -1 diff --git a/libhb/decpgssub.c b/libhb/decpgssub.c index cafc4cf5c091..c7120484ac75 100644 --- a/libhb/decpgssub.c +++ b/libhb/decpgssub.c @@ -7,8 +7,8 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "hbffmpeg.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" struct hb_work_private_s { diff --git a/libhb/decsrtsub.c b/libhb/decsrtsub.c index 303387c329a0..35aa9c1573eb 100644 --- a/libhb/decsrtsub.c +++ b/libhb/decsrtsub.c @@ -12,9 +12,9 @@ #include #include #include -#include "handbrake.h" -#include "colormap.h" -#include "decsrtsub.h" +#include "handbrake/handbrake.h" +#include "handbrake/colormap.h" +#include "handbrake/decsrtsub.h" struct start_and_end { unsigned long start, end; diff --git a/libhb/decssasub.c b/libhb/decssasub.c index 9729e686325c..b5d8339b97ed 100644 --- a/libhb/decssasub.c +++ b/libhb/decssasub.c @@ -26,11 +26,11 @@ #include #include #include -#include "handbrake.h" +#include "handbrake/handbrake.h" #include -#include "decssasub.h" -#include "colormap.h" +#include "handbrake/decssasub.h" +#include "handbrake/colormap.h" struct hb_work_private_s { diff --git a/libhb/dectx3gsub.c b/libhb/dectx3gsub.c index 49ea0e9b7cbb..f2f5d4eea1dc 100644 --- a/libhb/dectx3gsub.c +++ b/libhb/dectx3gsub.c @@ -19,8 +19,8 @@ #include #include -#include "handbrake.h" -#include "colormap.h" +#include "handbrake/handbrake.h" +#include "handbrake/colormap.h" struct hb_work_private_s { diff --git a/libhb/decutf8sub.c b/libhb/decutf8sub.c index 45f522c22a43..c3336d1aba13 100644 --- a/libhb/decutf8sub.c +++ b/libhb/decutf8sub.c @@ -18,8 +18,8 @@ #include #include -#include "handbrake.h" -#include "decsrtsub.h" +#include "handbrake/handbrake.h" +#include "handbrake/decsrtsub.h" struct hb_work_private_s { diff --git a/libhb/decvobsub.c b/libhb/decvobsub.c index 4a6a6ec94394..be64a901380f 100644 --- a/libhb/decvobsub.c +++ b/libhb/decvobsub.c @@ -27,7 +27,7 @@ * } */ -#include "handbrake.h" +#include "handbrake/handbrake.h" struct hb_work_private_s { diff --git a/libhb/deinterlace.c b/libhb/deinterlace.c index de91a82023fc..4ab1c1d16b74 100644 --- a/libhb/deinterlace.c +++ b/libhb/deinterlace.c @@ -7,9 +7,9 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "common.h" -#include "decomb.h" -#include "avfilter_priv.h" +#include "handbrake/common.h" +#include "handbrake/decomb.h" +#include "handbrake/avfilter_priv.h" static int deinterlace_init(hb_filter_object_t * filter, hb_filter_init_t * init); diff --git a/libhb/demuxmpeg.c b/libhb/demuxmpeg.c index 09a9325b074e..e765785861f4 100644 --- a/libhb/demuxmpeg.c +++ b/libhb/demuxmpeg.c @@ -7,7 +7,7 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" +#include "handbrake/handbrake.h" static inline int check_mpeg_scr( hb_psdemux_t *state, int64_t scr, int tol ) { diff --git a/libhb/denoise.c b/libhb/denoise.c index 0da2bf8af6cb..b43acaa84e75 100644 --- a/libhb/denoise.c +++ b/libhb/denoise.c @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "handbrake.h" -#include "hbffmpeg.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" #define HQDN3D_SPATIAL_LUMA_DEFAULT 4.0f #define HQDN3D_SPATIAL_CHROMA_DEFAULT 3.0f diff --git a/libhb/detelecine.c b/libhb/detelecine.c index 2d2026124e05..3d8283876542 100644 --- a/libhb/detelecine.c +++ b/libhb/detelecine.c @@ -7,8 +7,8 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "hbffmpeg.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" /* * diff --git a/libhb/dvd.c b/libhb/dvd.c index 9b1c6fca0ec7..2ae506c7d1ac 100644 --- a/libhb/dvd.c +++ b/libhb/dvd.c @@ -7,9 +7,9 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "lang.h" -#include "dvd.h" +#include "handbrake/handbrake.h" +#include "handbrake/lang.h" +#include "handbrake/dvd.h" #include "dvdread/ifo_read.h" #include "dvdread/ifo_print.h" diff --git a/libhb/dvdnav.c b/libhb/dvdnav.c index 72833fcd4927..52a48adfe79d 100644 --- a/libhb/dvdnav.c +++ b/libhb/dvdnav.c @@ -7,9 +7,9 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "lang.h" -#include "dvd.h" +#include "handbrake/handbrake.h" +#include "handbrake/lang.h" +#include "handbrake/dvd.h" #include "dvdnav/dvdnav.h" #include "dvdread/ifo_read.h" diff --git a/libhb/eedi2.c b/libhb/eedi2.c index e531ea96aab1..92606183f2f4 100644 --- a/libhb/eedi2.c +++ b/libhb/eedi2.c @@ -10,8 +10,8 @@ http://web.missouri.edu/~kes25c/ */ -#include "handbrake.h" -#include "eedi2.h" +#include "handbrake/handbrake.h" +#include "handbrake/eedi2.h" /** * EEDI2 directional limit lookup table diff --git a/libhb/enc_qsv.c b/libhb/enc_qsv.c index 0b4f78a68163..750bd35f2359 100644 --- a/libhb/enc_qsv.c +++ b/libhb/enc_qsv.c @@ -26,16 +26,16 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \* ********************************************************************* */ -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_QSV -#include "handbrake.h" -#include "nal_units.h" -#include "qsv_common.h" -#include "qsv_memory.h" -#include "h264_common.h" -#include "h265_common.h" +#include "handbrake/handbrake.h" +#include "handbrake/nal_units.h" +#include "handbrake/qsv_common.h" +#include "handbrake/qsv_memory.h" +#include "handbrake/h264_common.h" +#include "handbrake/h265_common.h" #include "libavutil/hwcontext_qsv.h" #include "libavutil/hwcontext.h" diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c index 99bf4010b493..1c949249c4e9 100644 --- a/libhb/encavcodec.c +++ b/libhb/encavcodec.c @@ -7,12 +7,12 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "hb_dict.h" -#include "hbffmpeg.h" -#include "h264_common.h" -#include "h265_common.h" -#include "nal_units.h" +#include "handbrake/handbrake.h" +#include "handbrake/hb_dict.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/h264_common.h" +#include "handbrake/h265_common.h" +#include "handbrake/nal_units.h" /* * The frame info struct remembers information about each frame across calls diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c index 29117ded61b0..7c81d1736b01 100644 --- a/libhb/encavcodecaudio.c +++ b/libhb/encavcodecaudio.c @@ -7,8 +7,8 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "hbffmpeg.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" struct hb_work_private_s { diff --git a/libhb/enctheora.c b/libhb/enctheora.c index 429f8e2fa8b9..7a3f969c8252 100644 --- a/libhb/enctheora.c +++ b/libhb/enctheora.c @@ -7,7 +7,7 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "theora/codec.h" #include "theora/theoraenc.h" diff --git a/libhb/encvobsub.c b/libhb/encvobsub.c index 0650f3501e68..33b611ed0d56 100644 --- a/libhb/encvobsub.c +++ b/libhb/encvobsub.c @@ -7,7 +7,7 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" +#include "handbrake/handbrake.h" struct hb_work_private_s { diff --git a/libhb/encvorbis.c b/libhb/encvorbis.c index 3d521e3eab22..92f24a13f3ec 100644 --- a/libhb/encvorbis.c +++ b/libhb/encvorbis.c @@ -7,8 +7,8 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "audio_remap.h" +#include "handbrake/handbrake.h" +#include "handbrake/audio_remap.h" #include "vorbis/vorbisenc.h" diff --git a/libhb/encx264.c b/libhb/encx264.c index b0f6781bc454..a94eb066e3e5 100644 --- a/libhb/encx264.c +++ b/libhb/encx264.c @@ -9,9 +9,9 @@ #include -#include "handbrake.h" -#include "hb_dict.h" -#include "encx264.h" +#include "handbrake/handbrake.h" +#include "handbrake/hb_dict.h" +#include "handbrake/encx264.h" int encx264Init( hb_work_object_t *, hb_job_t * ); int encx264Work( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** ); diff --git a/libhb/encx265.c b/libhb/encx265.c index 39e912737e5f..025f80120742 100644 --- a/libhb/encx265.c +++ b/libhb/encx265.c @@ -7,13 +7,13 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_X265 -#include "handbrake.h" -#include "hb_dict.h" -#include "h265_common.h" +#include "handbrake/handbrake.h" +#include "handbrake/hb_dict.h" +#include "handbrake/h265_common.h" #include "x265.h" int encx265Init (hb_work_object_t*, hb_job_t*); diff --git a/libhb/fifo.c b/libhb/fifo.c index 1bc89f82359b..1ded249fc782 100644 --- a/libhb/fifo.c +++ b/libhb/fifo.c @@ -7,9 +7,9 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" +#include "handbrake/handbrake.h" #if HB_PROJECT_FEATURE_QSV -#include "qsv_libav.h" +#include "handbrake/qsv_libav.h" #endif #ifndef SYS_DARWIN diff --git a/libhb/grayscale.c b/libhb/grayscale.c index 1608f8f45320..d8de86224d87 100644 --- a/libhb/grayscale.c +++ b/libhb/grayscale.c @@ -7,9 +7,9 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "hbffmpeg.h" -#include "taskset.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/taskset.h" // Settings: // This filter has no settings. diff --git a/libhb/audio_remap.h b/libhb/handbrake/audio_remap.h similarity index 100% rename from libhb/audio_remap.h rename to libhb/handbrake/audio_remap.h diff --git a/libhb/audio_resample.h b/libhb/handbrake/audio_resample.h similarity index 100% rename from libhb/audio_resample.h rename to libhb/handbrake/audio_resample.h diff --git a/libhb/avfilter_priv.h b/libhb/handbrake/avfilter_priv.h similarity index 96% rename from libhb/avfilter_priv.h rename to libhb/handbrake/avfilter_priv.h index 8c6b0a62734b..20e616cc236b 100644 --- a/libhb/avfilter_priv.h +++ b/libhb/handbrake/avfilter_priv.h @@ -11,7 +11,7 @@ #define HB_AVFILTER_PRIV_H #include "libavfilter/avfilter.h" -#include "hbavfilter.h" +#include "handbrake/hbavfilter.h" struct hb_filter_private_s { diff --git a/libhb/bits.h b/libhb/handbrake/bits.h similarity index 100% rename from libhb/bits.h rename to libhb/handbrake/bits.h diff --git a/libhb/colormap.h b/libhb/handbrake/colormap.h similarity index 100% rename from libhb/colormap.h rename to libhb/handbrake/colormap.h diff --git a/libhb/common.h b/libhb/handbrake/common.h similarity index 99% rename from libhb/common.h rename to libhb/handbrake/common.h index cd66d6f1604c..8ab21fa8abc6 100644 --- a/libhb/common.h +++ b/libhb/handbrake/common.h @@ -10,9 +10,9 @@ #ifndef HB_COMMON_H #define HB_COMMON_H -#include "project.h" -#include "hbtypes.h" -#include "hb_dict.h" +#include "handbrake/project.h" +#include "handbrake/hbtypes.h" +#include "handbrake/hb_dict.h" #include #include #include diff --git a/libhb/compat.h b/libhb/handbrake/compat.h similarity index 100% rename from libhb/compat.h rename to libhb/handbrake/compat.h diff --git a/libhb/deccc608sub.h b/libhb/handbrake/deccc608sub.h similarity index 99% rename from libhb/deccc608sub.h rename to libhb/handbrake/deccc608sub.h index 14f98c25d940..044fc78f763a 100644 --- a/libhb/deccc608sub.h +++ b/libhb/handbrake/deccc608sub.h @@ -13,7 +13,7 @@ #ifndef __DECCC608SUB_H__ #define __DECCC608SUB_H__ -#include "common.h" +#include "handbrake/common.h" struct s_write; diff --git a/libhb/decomb.h b/libhb/handbrake/decomb.h similarity index 100% rename from libhb/decomb.h rename to libhb/handbrake/decomb.h diff --git a/libhb/decsrtsub.h b/libhb/handbrake/decsrtsub.h similarity index 100% rename from libhb/decsrtsub.h rename to libhb/handbrake/decsrtsub.h diff --git a/libhb/decssasub.h b/libhb/handbrake/decssasub.h similarity index 100% rename from libhb/decssasub.h rename to libhb/handbrake/decssasub.h diff --git a/libhb/dvd.h b/libhb/handbrake/dvd.h similarity index 100% rename from libhb/dvd.h rename to libhb/handbrake/dvd.h diff --git a/libhb/eedi2.h b/libhb/handbrake/eedi2.h similarity index 100% rename from libhb/eedi2.h rename to libhb/handbrake/eedi2.h diff --git a/libhb/encx264.h b/libhb/handbrake/encx264.h similarity index 98% rename from libhb/encx264.h rename to libhb/handbrake/encx264.h index 75b98675bc2b..29085e50cf7f 100644 --- a/libhb/encx264.h +++ b/libhb/handbrake/encx264.h @@ -11,7 +11,7 @@ #define HB_ENCX264_H #include "x264.h" -#include "h264_common.h" +#include "handbrake/h264_common.h" /* x264 preferred option names (left) and synonyms (right). * The "preferred" names match names used in x264's param2string function more diff --git a/libhb/h264_common.h b/libhb/handbrake/h264_common.h similarity index 100% rename from libhb/h264_common.h rename to libhb/handbrake/h264_common.h diff --git a/libhb/h265_common.h b/libhb/handbrake/h265_common.h similarity index 98% rename from libhb/h265_common.h rename to libhb/handbrake/h265_common.h index 067b652e5c44..8b5c1072dece 100644 --- a/libhb/h265_common.h +++ b/libhb/handbrake/h265_common.h @@ -10,7 +10,7 @@ #ifndef HB_H265_COMMON_H #define HB_H265_COMMON_H -#include "project.h" +#include "handbrake/project.h" // inspired by libavcodec/hevc.h // in HEVC, all "random access point" NAL units are keyframes diff --git a/libhb/handbrake.h b/libhb/handbrake/handbrake.h similarity index 95% rename from libhb/handbrake.h rename to libhb/handbrake/handbrake.h index 9cf7444762d0..6143316d56ca 100644 --- a/libhb/handbrake.h +++ b/libhb/handbrake/handbrake.h @@ -14,14 +14,14 @@ extern "C" { #endif -#include "common.h" -#include "project.h" -#include "compat.h" -#include "hb_json.h" -#include "preset.h" -#include "plist.h" -#include "param.h" -#include "colormap.h" +#include "handbrake/common.h" +#include "handbrake/project.h" +#include "handbrake/compat.h" +#include "handbrake/hb_json.h" +#include "handbrake/preset.h" +#include "handbrake/plist.h" +#include "handbrake/param.h" +#include "handbrake/colormap.h" /* hb_init() Initializes a libhb session (launches his own thread, detects CPUs, diff --git a/libhb/hb_dict.h b/libhb/handbrake/hb_dict.h similarity index 99% rename from libhb/hb_dict.h rename to libhb/handbrake/hb_dict.h index 3984d1a0d8e6..5d8a188e02ee 100644 --- a/libhb/hb_dict.h +++ b/libhb/handbrake/hb_dict.h @@ -9,7 +9,7 @@ #if !defined(HB_DICT_H) #define HB_DICT_H -#include "hbtypes.h" +#include "handbrake/hbtypes.h" #include #define HB_VALUE_TYPE_DICT JSON_OBJECT diff --git a/libhb/hb_json.h b/libhb/handbrake/hb_json.h similarity index 98% rename from libhb/hb_json.h rename to libhb/handbrake/hb_json.h index 8f8a08cbcf3c..aac3223f75e5 100644 --- a/libhb/hb_json.h +++ b/libhb/handbrake/hb_json.h @@ -14,7 +14,7 @@ extern "C" { #endif -#include "common.h" +#include "handbrake/common.h" hb_dict_t * hb_state_to_dict( hb_state_t * state); hb_dict_t * hb_job_to_dict( const hb_job_t * job ); diff --git a/libhb/hbavfilter.h b/libhb/handbrake/hbavfilter.h similarity index 97% rename from libhb/hbavfilter.h rename to libhb/handbrake/hbavfilter.h index 1495d3b41b30..319b4887142a 100644 --- a/libhb/hbavfilter.h +++ b/libhb/handbrake/hbavfilter.h @@ -10,7 +10,7 @@ #ifndef HB_AVFILTER_H #define HB_AVFILTER_H -#include "common.h" +#include "handbrake/common.h" typedef struct hb_avfilter_graph_s hb_avfilter_graph_t; diff --git a/libhb/hbffmpeg.h b/libhb/handbrake/hbffmpeg.h similarity index 98% rename from libhb/hbffmpeg.h rename to libhb/handbrake/hbffmpeg.h index 119347153a30..6357dcd9c2c9 100644 --- a/libhb/hbffmpeg.h +++ b/libhb/handbrake/hbffmpeg.h @@ -21,7 +21,7 @@ #include "libavutil/display.h" #include "libswscale/swscale.h" #include "libswresample/swresample.h" -#include "common.h" +#include "handbrake/common.h" #define HB_FFMPEG_THREADS_AUTO (-1) // let hb_avcodec_open() decide thread_count diff --git a/libhb/hbtypes.h b/libhb/handbrake/hbtypes.h similarity index 100% rename from libhb/hbtypes.h rename to libhb/handbrake/hbtypes.h diff --git a/libhb/internal.h b/libhb/handbrake/internal.h similarity index 99% rename from libhb/internal.h rename to libhb/handbrake/internal.h index e642c2d2c255..93ae27dca74e 100644 --- a/libhb/internal.h +++ b/libhb/handbrake/internal.h @@ -10,10 +10,10 @@ #ifndef HB_INTERNAL_H #define HB_INTERNAL_H -#include "project.h" -#include "hbffmpeg.h" +#include "handbrake/project.h" +#include "handbrake/hbffmpeg.h" #if HB_PROJECT_FEATURE_QSV -#include "qsv_libav.h" +#include "handbrake/qsv_libav.h" #endif /*********************************************************************** diff --git a/libhb/lang.h b/libhb/handbrake/lang.h similarity index 100% rename from libhb/lang.h rename to libhb/handbrake/lang.h diff --git a/libhb/nal_units.h b/libhb/handbrake/nal_units.h similarity index 98% rename from libhb/nal_units.h rename to libhb/handbrake/nal_units.h index 21041904152f..0efccc4763cf 100644 --- a/libhb/nal_units.h +++ b/libhb/handbrake/nal_units.h @@ -12,7 +12,7 @@ #include -#include "common.h" +#include "handbrake/common.h" /* * Write a NAL unit of the specified size to the provided diff --git a/libhb/nlmeans.h b/libhb/handbrake/nlmeans.h similarity index 100% rename from libhb/nlmeans.h rename to libhb/handbrake/nlmeans.h diff --git a/libhb/nvenc_common.h b/libhb/handbrake/nvenc_common.h similarity index 100% rename from libhb/nvenc_common.h rename to libhb/handbrake/nvenc_common.h diff --git a/libhb/param.h b/libhb/handbrake/param.h similarity index 100% rename from libhb/param.h rename to libhb/handbrake/param.h diff --git a/libhb/plist.h b/libhb/handbrake/plist.h similarity index 95% rename from libhb/plist.h rename to libhb/handbrake/plist.h index e33d7fc3300c..12b51dd2e3bd 100644 --- a/libhb/plist.h +++ b/libhb/handbrake/plist.h @@ -11,7 +11,7 @@ #define _HB_PLIST_H_ #include -#include "hb_dict.h" +#include "handbrake/hb_dict.h" hb_value_t * hb_plist_parse(const char *buf, size_t len); hb_value_t * hb_plist_parse_file(const char *filename); diff --git a/libhb/ports.h b/libhb/handbrake/ports.h similarity index 99% rename from libhb/ports.h rename to libhb/handbrake/ports.h index e1eef623d3a5..6b793da28210 100644 --- a/libhb/ports.h +++ b/libhb/handbrake/ports.h @@ -24,7 +24,7 @@ #define IS_DIR_SEP(c) (c == '/') #endif -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_QSV #include "mfx/mfxstructures.h" diff --git a/libhb/preset.h b/libhb/handbrake/preset.h similarity index 99% rename from libhb/preset.h rename to libhb/handbrake/preset.h index fda7ebefdcee..abb188487b8f 100644 --- a/libhb/preset.h +++ b/libhb/handbrake/preset.h @@ -9,8 +9,8 @@ #if !defined(HB_PRESET_H) #define HB_PRESET_H -#include "common.h" -#include "hb_dict.h" +#include "handbrake/common.h" +#include "handbrake/hb_dict.h" #define HB_MAX_PRESET_FOLDER_DEPTH 8 diff --git a/libhb/preset_builtin.h b/libhb/handbrake/preset_builtin.h similarity index 100% rename from libhb/preset_builtin.h rename to libhb/handbrake/preset_builtin.h diff --git a/libhb/project.h.m4 b/libhb/handbrake/project.h.m4 similarity index 100% rename from libhb/project.h.m4 rename to libhb/handbrake/project.h.m4 diff --git a/libhb/qsv_common.h b/libhb/handbrake/qsv_common.h similarity index 99% rename from libhb/qsv_common.h rename to libhb/handbrake/qsv_common.h index 9522f7488107..ca844c5e9e98 100644 --- a/libhb/qsv_common.h +++ b/libhb/handbrake/qsv_common.h @@ -12,14 +12,14 @@ int hb_qsv_available(); -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_QSV #include "mfx/mfxvideo.h" #include "mfx/mfxplugin.h" #include "libavcodec/avcodec.h" -#include "hb_dict.h" +#include "handbrake/hb_dict.h" /* Minimum Intel Media SDK version (currently 1.3, for Sandy Bridge support) */ #define HB_QSV_MINVERSION_MAJOR HB_QSV_MSDK_VERSION_MAJOR diff --git a/libhb/qsv_filter.h b/libhb/handbrake/qsv_filter.h similarity index 98% rename from libhb/qsv_filter.h rename to libhb/handbrake/qsv_filter.h index fc3ba95f88cd..6d2650059b2e 100644 --- a/libhb/qsv_filter.h +++ b/libhb/handbrake/qsv_filter.h @@ -29,7 +29,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef QSV_FILTER_H #define QSV_FILTER_H -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_QSV void qsv_filter_close( hb_qsv_context* qsv, HB_QSV_STAGE_TYPE vpp_type ); diff --git a/libhb/qsv_filter_pp.h b/libhb/handbrake/qsv_filter_pp.h similarity index 99% rename from libhb/qsv_filter_pp.h rename to libhb/handbrake/qsv_filter_pp.h index bb2c3cc68afb..c0e7f605e562 100644 --- a/libhb/qsv_filter_pp.h +++ b/libhb/handbrake/qsv_filter_pp.h @@ -29,7 +29,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef QSV_FILTER_PP_H #define QSV_FILTER_PP_H -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_QSV diff --git a/libhb/qsv_libav.h b/libhb/handbrake/qsv_libav.h similarity index 100% rename from libhb/qsv_libav.h rename to libhb/handbrake/qsv_libav.h diff --git a/libhb/qsv_memory.h b/libhb/handbrake/qsv_memory.h similarity index 97% rename from libhb/qsv_memory.h rename to libhb/handbrake/qsv_memory.h index 9397306f069d..3434114e17e8 100644 --- a/libhb/qsv_memory.h +++ b/libhb/handbrake/qsv_memory.h @@ -29,12 +29,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef QSV_MEMORY_H #define QSV_MEMORY_H -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_QSV #include "mfx/mfxplugin.h" -#include "qsv_libav.h" +#include "handbrake/qsv_libav.h" typedef struct{ diff --git a/libhb/ssautil.h b/libhb/handbrake/ssautil.h similarity index 100% rename from libhb/ssautil.h rename to libhb/handbrake/ssautil.h diff --git a/libhb/taskset.h b/libhb/handbrake/taskset.h similarity index 98% rename from libhb/taskset.h rename to libhb/handbrake/taskset.h index 07a7e32bc2b7..35c21e1c000b 100644 --- a/libhb/taskset.h +++ b/libhb/handbrake/taskset.h @@ -12,7 +12,7 @@ #define TASKSET_POSIX_COMPLIANT 1 -#include "bits.h" +#include "handbrake/bits.h" typedef struct hb_taskset_s { int thread_count; diff --git a/libhb/vce_common.h b/libhb/handbrake/vce_common.h similarity index 100% rename from libhb/vce_common.h rename to libhb/handbrake/vce_common.h diff --git a/libhb/hb.c b/libhb/hb.c index b44c2679efa4..da65650a13ca 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -7,16 +7,16 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "hbffmpeg.h" -#include "encx264.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/encx264.h" #include "libavfilter/avfilter.h" #include #include #include #if HB_PROJECT_FEATURE_QSV -#include "qsv_common.h" +#include "handbrake/qsv_common.h" #endif #if defined( SYS_MINGW ) diff --git a/libhb/hb_dict.c b/libhb/hb_dict.c index b9bd5a8d3356..52f585a94da6 100644 --- a/libhb/hb_dict.c +++ b/libhb/hb_dict.c @@ -9,8 +9,8 @@ #include #include -#include "handbrake.h" -#include "hb_dict.h" +#include "handbrake/handbrake.h" +#include "handbrake/hb_dict.h" hb_value_type_t hb_value_type(const hb_value_t *value) { diff --git a/libhb/hb_json.c b/libhb/hb_json.c index 5fb92b8b8056..8ad0a720dd16 100644 --- a/libhb/hb_json.c +++ b/libhb/hb_json.c @@ -8,10 +8,10 @@ */ #include -#include "handbrake.h" -#include "hb_json.h" +#include "handbrake/handbrake.h" +#include "handbrake/hb_json.h" #include "libavutil/base64.h" -#include "qsv_common.h" +#include "handbrake/qsv_common.h" /** * Convert an hb_state_t to a jansson dict diff --git a/libhb/hbavfilter.c b/libhb/hbavfilter.c index 5e050e28f070..fa86ac5f8cec 100644 --- a/libhb/hbavfilter.c +++ b/libhb/hbavfilter.c @@ -7,13 +7,13 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "hbffmpeg.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" #include "libavfilter/avfilter.h" #include "libavfilter/buffersrc.h" #include "libavfilter/buffersink.h" -#include "hbavfilter.h" -#include "avfilter_priv.h" +#include "handbrake/hbavfilter.h" +#include "handbrake/avfilter_priv.h" struct hb_avfilter_graph_s { diff --git a/libhb/hbffmpeg.c b/libhb/hbffmpeg.c index af0707874bec..f5a140c754c0 100644 --- a/libhb/hbffmpeg.c +++ b/libhb/hbffmpeg.c @@ -1,5 +1,5 @@ -#include "handbrake.h" -#include "hbffmpeg.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" static int get_frame_type(int type) { diff --git a/libhb/lang.c b/libhb/lang.c index cd3c8887fbf2..0cf828a61a6a 100644 --- a/libhb/lang.c +++ b/libhb/lang.c @@ -7,7 +7,7 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "lang.h" +#include "handbrake/lang.h" #include #include diff --git a/libhb/lapsharp.c b/libhb/lapsharp.c index 192b26721f4e..9174ac39492d 100644 --- a/libhb/lapsharp.c +++ b/libhb/lapsharp.c @@ -7,7 +7,7 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" +#include "handbrake/handbrake.h" #define LAPSHARP_STRENGTH_LUMA_DEFAULT 0.2 #define LAPSHARP_STRENGTH_CHROMA_DEFAULT 0.2 diff --git a/libhb/module.defs b/libhb/module.defs index e76358f39686..a2d444447623 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -15,7 +15,7 @@ $(eval $(call import.GCC,LIBHB)) LIBHB.src/ = $(SRC/)libhb/ LIBHB.build/ = $(BUILD/)libhb/ -LIBHB.m4.in = $(wildcard $(LIBHB.src/)*.m4) +LIBHB.m4.in = $(wildcard $(LIBHB.src/)handbrake/*.m4) LIBHB.m4.out = $(patsubst $(LIBHB.src/)%.m4,$(LIBHB.build/)%,$(LIBHB.m4.in)) LIBHB.c = $(wildcard $(LIBHB.src/)*.c) @@ -24,7 +24,7 @@ LIBHB.m.o = $(patsubst $(SRC/)%.m,$(BUILD/)%.o,$(LIBHB.m)) LIBHB.d = $(LIBHB.m4.out) $(LIBHB.h.out) \ $(foreach n,$(LIBHB.prerequisites),$($n.INSTALL.target) ) -LIBHB.h.in = $(wildcard $(LIBHB.src/)*.h) +LIBHB.h.in = $(wildcard $(LIBHB.src/)handbrake/*.h) LIBHB.h.in += $(wildcard $(LIBHB.src/)extras/*.h) LIBHB.h.out = $(patsubst $(SRC/)%,$(BUILD/)%,$(LIBHB.h.in)) diff --git a/libhb/mt_frame_filter.c b/libhb/mt_frame_filter.c index fd6bf780e9ad..11f5ffc72946 100644 --- a/libhb/mt_frame_filter.c +++ b/libhb/mt_frame_filter.c @@ -12,8 +12,8 @@ * operate on each frame independently with no context carried over * from one frame to the next. */ -#include "handbrake.h" -#include "taskset.h" +#include "handbrake/handbrake.h" +#include "handbrake/taskset.h" typedef struct { diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c index 1d630ebd25c4..983c5d3489b6 100644 --- a/libhb/muxavformat.c +++ b/libhb/muxavformat.c @@ -12,9 +12,9 @@ #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" -#include "handbrake.h" -#include "ssautil.h" -#include "lang.h" +#include "handbrake/handbrake.h" +#include "handbrake/ssautil.h" +#include "handbrake/lang.h" struct hb_mux_data_s { diff --git a/libhb/muxcommon.c b/libhb/muxcommon.c index a16a27a5216a..842ed86e8dc0 100644 --- a/libhb/muxcommon.c +++ b/libhb/muxcommon.c @@ -6,8 +6,8 @@ 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 */ -#include "handbrake.h" -#include "decssasub.h" +#include "handbrake/handbrake.h" +#include "handbrake/decssasub.h" #define MIN_BUFFERING (1024*1024*10) #define MAX_BUFFERING (1024*1024*50) diff --git a/libhb/nal_units.c b/libhb/nal_units.c index 5fd332a37779..9c326b81a7a0 100644 --- a/libhb/nal_units.c +++ b/libhb/nal_units.c @@ -10,8 +10,8 @@ #include #include -#include "common.h" -#include "nal_units.h" +#include "handbrake/common.h" +#include "handbrake/nal_units.h" static const uint8_t hb_annexb_startcode[] = { 0x00, 0x00, 0x00, 0x01, }; diff --git a/libhb/nlmeans.c b/libhb/nlmeans.c index d838e057563c..2297d4f7be61 100644 --- a/libhb/nlmeans.c +++ b/libhb/nlmeans.c @@ -50,10 +50,10 @@ * etc... */ -#include "handbrake.h" -#include "hbffmpeg.h" -#include "taskset.h" -#include "nlmeans.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/taskset.h" +#include "handbrake/nlmeans.h" #define NLMEANS_STRENGTH_LUMA_DEFAULT 6 #define NLMEANS_STRENGTH_CHROMA_DEFAULT 6 diff --git a/libhb/nlmeans_x86.c b/libhb/nlmeans_x86.c index 131b8100793f..423fa50e43f5 100644 --- a/libhb/nlmeans_x86.c +++ b/libhb/nlmeans_x86.c @@ -8,14 +8,14 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" // needed for ARCH_X86 +#include "handbrake/handbrake.h" // needed for ARCH_X86 #if defined(ARCH_X86) #include #include "libavutil/cpu.h" -#include "nlmeans.h" +#include "handbrake/nlmeans.h" static void build_integral_sse2(uint32_t *integral, int integral_stride, diff --git a/libhb/nvenc_common.c b/libhb/nvenc_common.c index fb711b0ed540..c6897a84c886 100644 --- a/libhb/nvenc_common.c +++ b/libhb/nvenc_common.c @@ -7,8 +7,8 @@ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "hbffmpeg.h" -#include "handbrake.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/handbrake.h" #if HB_PROJECT_FEATURE_NVENC #include diff --git a/libhb/pad.c b/libhb/pad.c index 10631bffe777..eee3e1c79ff7 100644 --- a/libhb/pad.c +++ b/libhb/pad.c @@ -7,9 +7,9 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "common.h" -#include "colormap.h" -#include "avfilter_priv.h" +#include "handbrake/common.h" +#include "handbrake/colormap.h" +#include "handbrake/avfilter_priv.h" static int pad_init(hb_filter_object_t * filter, hb_filter_init_t * init); diff --git a/libhb/param.c b/libhb/param.c index 1f73de62243e..e5baa9d26a38 100644 --- a/libhb/param.c +++ b/libhb/param.c @@ -8,13 +8,13 @@ * http://www.gnu.org/licenses/gpl-2.0.html */ -#include "project.h" -#include "hb_dict.h" -#include "param.h" -#include "common.h" -#include "colormap.h" +#include "handbrake/project.h" +#include "handbrake/hb_dict.h" +#include "handbrake/param.h" +#include "handbrake/common.h" +#include "handbrake/colormap.h" #if HB_PROJECT_FEATURE_QSV -#include "qsv_common.h" +#include "handbrake/qsv_common.h" #endif #include diff --git a/libhb/platform/macosx/encca_aac.c b/libhb/platform/macosx/encca_aac.c index 8d770c2e9e4c..5c108cba436c 100644 --- a/libhb/platform/macosx/encca_aac.c +++ b/libhb/platform/macosx/encca_aac.c @@ -7,8 +7,8 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "audio_remap.h" +#include "handbrake/handbrake.h" +#include "handbrake/audio_remap.h" #include #include diff --git a/libhb/platform/macosx/vt_common.c b/libhb/platform/macosx/vt_common.c index 51c0ff97c6e5..3ea9ce15e854 100644 --- a/libhb/platform/macosx/vt_common.c +++ b/libhb/platform/macosx/vt_common.c @@ -7,7 +7,7 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "vt_common.h" #include diff --git a/libhb/plist.c b/libhb/plist.c index 6db6dd389de4..2bd5a02ec054 100644 --- a/libhb/plist.c +++ b/libhb/plist.c @@ -14,9 +14,9 @@ #include #include "libxml/parser.h" -#include "common.h" -#include "hb_dict.h" -#include "plist.h" +#include "handbrake/common.h" +#include "handbrake/hb_dict.h" +#include "handbrake/plist.h" #define BUF_SZ (128*1024) diff --git a/libhb/ports.c b/libhb/ports.c index 6086aa628d35..917da62b9807 100644 --- a/libhb/ports.c +++ b/libhb/ports.c @@ -7,7 +7,7 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "project.h" +#include "handbrake/project.h" #ifdef SYS_MINGW #define _WIN32_WINNT 0x600 @@ -88,7 +88,7 @@ #include #include -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "libavutil/cpu.h" /************************************************************************ diff --git a/libhb/preset.c b/libhb/preset.c index b592a2bbaa4b..b7a30013a124 100644 --- a/libhb/preset.c +++ b/libhb/preset.c @@ -7,14 +7,14 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "preset_builtin.h" -#include "handbrake.h" -#include "hb_dict.h" -#include "plist.h" -#include "lang.h" +#include "handbrake/preset_builtin.h" +#include "handbrake/handbrake.h" +#include "handbrake/hb_dict.h" +#include "handbrake/plist.h" +#include "handbrake/lang.h" #if HB_PROJECT_FEATURE_QSV -#include "qsv_common.h" +#include "handbrake/qsv_common.h" #endif #if defined(SYS_LINUX) diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c index 9f7762159520..08d4f030b6d0 100644 --- a/libhb/qsv_common.c +++ b/libhb/qsv_common.c @@ -7,20 +7,26 @@ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_QSV #include #include -#include "handbrake.h" -#include "ports.h" -#include "common.h" -#include "hb_dict.h" -#include "qsv_common.h" -#include "h264_common.h" -#include "h265_common.h" +#include "handbrake/handbrake.h" +#include "handbrake/ports.h" +#include "handbrake/common.h" +#include "handbrake/hb_dict.h" +#include "handbrake/qsv_common.h" +#include "handbrake/h264_common.h" +#include "handbrake/h265_common.h" +#include "handbrake/hbffmpeg.h" +#include "libavfilter/avfilter.h" +#include "libavfilter/buffersrc.h" +#include "libavfilter/buffersink.h" +#include "libavutil/hwcontext_qsv.h" +#include "libavutil/hwcontext.h" // QSV info for each codec static hb_qsv_info_t *hb_qsv_info_avc = NULL; @@ -2279,16 +2285,6 @@ void hb_qsv_force_workarounds() #undef FORCE_WORKAROUNDS } -#include "handbrake.h" -#include "hbffmpeg.h" -#include "libavfilter/avfilter.h" -#include "libavfilter/buffersrc.h" -#include "libavfilter/buffersink.h" -#include "libavutil/hwcontext_qsv.h" -#include "libavutil/hwcontext.h" -#include "lang.h" -#include "audio_resample.h" - AVBufferRef *enc_hw_frames_ctx = NULL; extern EncQSVFramesContext hb_enc_qsv_frames_ctx; AVBufferRef *hb_hw_device_ctx = NULL; diff --git a/libhb/qsv_filter.c b/libhb/qsv_filter.c index b330c78ad809..925e43a1e21c 100644 --- a/libhb/qsv_filter.c +++ b/libhb/qsv_filter.c @@ -26,14 +26,14 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \* ********************************************************************* */ -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_QSV -#include "handbrake.h" -#include "hbffmpeg.h" -#include "qsv_filter.h" -#include "qsv_libav.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/qsv_filter.h" +#include "handbrake/qsv_libav.h" struct hb_filter_private_s { diff --git a/libhb/qsv_filter_pp.c b/libhb/qsv_filter_pp.c index ddab314fd576..512b2bd9f15a 100644 --- a/libhb/qsv_filter_pp.c +++ b/libhb/qsv_filter_pp.c @@ -26,16 +26,16 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \* ********************************************************************* */ -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_QSV -#include "handbrake.h" -#include "hbffmpeg.h" -#include "qsv_filter_pp.h" -#include "qsv_filter.h" -#include "qsv_libav.h" -#include "qsv_memory.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/qsv_filter_pp.h" +#include "handbrake/qsv_filter.h" +#include "handbrake/qsv_libav.h" +#include "handbrake/qsv_memory.h" static int hb_qsv_filter_pre_init( hb_filter_object_t * filter, diff --git a/libhb/qsv_libav.c b/libhb/qsv_libav.c index 797aee184a99..0a6a1a6ce3b0 100644 --- a/libhb/qsv_libav.c +++ b/libhb/qsv_libav.c @@ -26,12 +26,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \* ********************************************************************* */ -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_QSV -#include "hbffmpeg.h" -#include "qsv_libav.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/qsv_libav.h" int hb_qsv_get_free_encode_task(hb_qsv_list * tasks) { diff --git a/libhb/qsv_memory.c b/libhb/qsv_memory.c index bb6c91a6c019..625674910662 100644 --- a/libhb/qsv_memory.c +++ b/libhb/qsv_memory.c @@ -26,13 +26,13 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \* ********************************************************************* */ -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_QSV -#include "handbrake.h" -#include "hbffmpeg.h" -#include "qsv_memory.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/qsv_memory.h" int qsv_nv12_to_yuv420(struct SwsContext* sws_context,hb_buffer_t* dst, mfxFrameSurface1* src, mfxCoreInterface *core){ int ret = 0; diff --git a/libhb/reader.c b/libhb/reader.c index a0496a8f5bac..2f9f722880e8 100644 --- a/libhb/reader.c +++ b/libhb/reader.c @@ -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 */ -#include "handbrake.h" +#include "handbrake/handbrake.h" static int reader_init( hb_work_object_t * w, hb_job_t * job ); static void reader_close( hb_work_object_t * w ); diff --git a/libhb/rendersub.c b/libhb/rendersub.c index a909ce4f2870..40613598efc7 100644 --- a/libhb/rendersub.c +++ b/libhb/rendersub.c @@ -7,8 +7,8 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "hbffmpeg.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" #include #define ABS(a) ((a) > 0 ? (a) : (-(a))) diff --git a/libhb/rotate.c b/libhb/rotate.c index 7ba1405141f3..c21c4d8029be 100644 --- a/libhb/rotate.c +++ b/libhb/rotate.c @@ -7,8 +7,8 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "common.h" -#include "avfilter_priv.h" +#include "handbrake/common.h" +#include "handbrake/avfilter_priv.h" static int rotate_init(hb_filter_object_t * filter, hb_filter_init_t * init); diff --git a/libhb/scan.c b/libhb/scan.c index 97567c8b38d5..9aed75d19592 100644 --- a/libhb/scan.c +++ b/libhb/scan.c @@ -7,8 +7,8 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "hbffmpeg.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" typedef struct { diff --git a/libhb/ssautil.c b/libhb/ssautil.c index 291620dfe6d1..8ff5ea50f72b 100644 --- a/libhb/ssautil.c +++ b/libhb/ssautil.c @@ -8,8 +8,8 @@ */ #include #include -#include "handbrake.h" -#include "ssautil.h" +#include "handbrake/handbrake.h" +#include "handbrake/ssautil.h" struct hb_subtitle_style_s { diff --git a/libhb/stream.c b/libhb/stream.c index aaeaf022e4e7..feb390c07f5d 100644 --- a/libhb/stream.c +++ b/libhb/stream.c @@ -11,9 +11,9 @@ #include #include -#include "handbrake.h" -#include "hbffmpeg.h" -#include "lang.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/lang.h" #include "libbluray/bluray.h" #define min(a, b) a < b ? a : b diff --git a/libhb/sync.c b/libhb/sync.c index 0af052471ebc..446129b090f9 100644 --- a/libhb/sync.c +++ b/libhb/sync.c @@ -7,10 +7,10 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "hbffmpeg.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" #include -#include "audio_resample.h" +#include "handbrake/audio_resample.h" #define SYNC_MAX_VIDEO_QUEUE_LEN 40 #define SYNC_MIN_VIDEO_QUEUE_LEN 20 diff --git a/libhb/taskset.c b/libhb/taskset.c index e829fd79bf3e..936ef4de57ab 100644 --- a/libhb/taskset.c +++ b/libhb/taskset.c @@ -7,9 +7,9 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" -#include "ports.h" -#include "taskset.h" +#include "handbrake/handbrake.h" +#include "handbrake/ports.h" +#include "handbrake/taskset.h" int taskset_init( taskset_t *ts, int thread_count, size_t arg_size ) diff --git a/libhb/unsharp.c b/libhb/unsharp.c index f47c6a1bdea5..bf5e8b99b240 100644 --- a/libhb/unsharp.c +++ b/libhb/unsharp.c @@ -8,7 +8,7 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" +#include "handbrake/handbrake.h" #define UNSHARP_STRENGTH_LUMA_DEFAULT 0.25 #define UNSHARP_SIZE_LUMA_DEFAULT 7 diff --git a/libhb/vce_common.c b/libhb/vce_common.c index da0476a64220..51d9c07ac277 100644 --- a/libhb/vce_common.c +++ b/libhb/vce_common.c @@ -7,13 +7,13 @@ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_VCE #include "AMF/core/Factory.h" #include "AMF/components/VideoEncoderVCE.h" #include "AMF/components/VideoEncoderHEVC.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" AMF_RESULT check_component_available(const wchar_t *componentID) { diff --git a/libhb/vfr.c b/libhb/vfr.c index a42a5342e7ab..728b32644220 100644 --- a/libhb/vfr.c +++ b/libhb/vfr.c @@ -7,7 +7,7 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" +#include "handbrake/handbrake.h" //#define HB_DEBUG_CFR_DROPS 1 #define MAX_FRAME_ANALYSIS_DEPTH 10 diff --git a/libhb/work.c b/libhb/work.c index 7d096aca540c..05bd0b04c066 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -7,14 +7,14 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "libavformat/avformat.h" -#include "decomb.h" -#include "hbavfilter.h" +#include "handbrake/decomb.h" +#include "handbrake/hbavfilter.h" #if HB_PROJECT_FEATURE_QSV -#include "qsv_common.h" -#include "qsv_filter_pp.h" +#include "handbrake/qsv_common.h" +#include "handbrake/qsv_filter_pp.h" #endif typedef struct diff --git a/macosx/HBAudio.m b/macosx/HBAudio.m index 0d825ddf6a18..046d9a8e7bf5 100644 --- a/macosx/HBAudio.m +++ b/macosx/HBAudio.m @@ -17,7 +17,7 @@ #import "HBLocalizationUtilities.h" #import "HBJob+Private.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" #define NONE_TRACK_INDEX 0 diff --git a/macosx/HBAudioDefaults.m b/macosx/HBAudioDefaults.m index ac05c2b25f9e..a59b55cefe0a 100644 --- a/macosx/HBAudioDefaults.m +++ b/macosx/HBAudioDefaults.m @@ -9,8 +9,8 @@ #import "HBCodingUtilities.h" #import "HBMutablePreset.h" -#import "handbrake.h" -#import "lang.h" +#import "handbrake/handbrake.h" +#import "handbrake/lang.h" @interface HBAudioDefaults () diff --git a/macosx/HBAudioTrack.m b/macosx/HBAudioTrack.m index 0ac7f619d403..1f4b8b034208 100644 --- a/macosx/HBAudioTrack.m +++ b/macosx/HBAudioTrack.m @@ -9,7 +9,7 @@ #import "HBJob.h" #import "HBCodingUtilities.h" #import "HBTitle.h" -#import "handbrake.h" +#import "handbrake/handbrake.h" #define DEFAULT_SAMPLERATE 48000 diff --git a/macosx/HBAudioTrackPreset.m b/macosx/HBAudioTrackPreset.m index ea286c3f4ef7..94542de7edc2 100644 --- a/macosx/HBAudioTrackPreset.m +++ b/macosx/HBAudioTrackPreset.m @@ -6,7 +6,7 @@ #import "HBAudioTrackPreset.h" #import "HBCodingUtilities.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" #define DEFAULT_SAMPLERATE 48000 diff --git a/macosx/HBAudioTransformers.m b/macosx/HBAudioTransformers.m index 95cd661161fb..07a95001b59f 100644 --- a/macosx/HBAudioTransformers.m +++ b/macosx/HBAudioTransformers.m @@ -6,7 +6,7 @@ #import "HBAudioTransformers.h" #import "HBLocalizationUtilities.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" #pragma mark - Value Transformers diff --git a/macosx/HBFilters+UIAdditions.m b/macosx/HBFilters+UIAdditions.m index d76f25febfb6..443d0f884035 100644 --- a/macosx/HBFilters+UIAdditions.m +++ b/macosx/HBFilters+UIAdditions.m @@ -7,7 +7,7 @@ #import "HBFilters+UIAdditions.h" #import "HBLocalizationUtilities.h" -#import "handbrake.h" +#import "handbrake/handbrake.h" /** * Converts a hb_filter_param_t * array to a NSArray of NSString. diff --git a/macosx/HBFilters.m b/macosx/HBFilters.m index d969d82ab215..077c85e8d452 100644 --- a/macosx/HBFilters.m +++ b/macosx/HBFilters.m @@ -10,7 +10,7 @@ #import "NSDictionary+HBAdditions.h" #import "HBMutablePreset.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" NSString * const HBFiltersChangedNotification = @"HBFiltersChangedNotification"; diff --git a/macosx/HBImageUtilities.m b/macosx/HBImageUtilities.m index 61d1fcfae8e3..f0c296a785e4 100644 --- a/macosx/HBImageUtilities.m +++ b/macosx/HBImageUtilities.m @@ -6,7 +6,7 @@ #import "HBImageUtilities.h" #import -#include "handbrake.h" +#include "handbrake/handbrake.h" CGImageRef CreateScaledCGImageFromCGImage(CGImageRef image, CGFloat thumbnailHeight) { diff --git a/macosx/HBJob+HBAdditions.m b/macosx/HBJob+HBAdditions.m index 552b8570eb42..3d8a211bc64e 100644 --- a/macosx/HBJob+HBAdditions.m +++ b/macosx/HBJob+HBAdditions.m @@ -6,7 +6,7 @@ #import "HBJob+HBAdditions.h" #import "HBPreferencesKeys.h" -#import "handbrake.h" +#import "handbrake/handbrake.h" static NSDateFormatter *_timeFormatter = nil; static NSDateFormatter *_dateFormatter = nil; diff --git a/macosx/HBJob+HBJobConversion.h b/macosx/HBJob+HBJobConversion.h index fdbca64e48ae..44fe60d600be 100644 --- a/macosx/HBJob+HBJobConversion.h +++ b/macosx/HBJob+HBJobConversion.h @@ -6,7 +6,7 @@ #import #import "HBJob.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" @interface HBJob (HBJobConversion) diff --git a/macosx/HBJob+UIAdditions.m b/macosx/HBJob+UIAdditions.m index 3ce379eed9c8..85118083edb5 100644 --- a/macosx/HBJob+UIAdditions.m +++ b/macosx/HBJob+UIAdditions.m @@ -20,7 +20,7 @@ #import "HBLocalizationUtilities.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" // Text Styles static NSDictionary *detailAttr; diff --git a/macosx/HBJob.m b/macosx/HBJob.m index 5960ee51b38a..8fe439212450 100644 --- a/macosx/HBJob.m +++ b/macosx/HBJob.m @@ -17,7 +17,7 @@ #import "HBUtilities.h" #import "HBSecurityAccessToken.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" NSString *HBContainerChangedNotification = @"HBContainerChangedNotification"; NSString *HBChaptersChangedNotification = @"HBChaptersChangedNotification"; diff --git a/macosx/HBLanguagesSelection.m b/macosx/HBLanguagesSelection.m index 3fedddd6d691..018c84875253 100644 --- a/macosx/HBLanguagesSelection.m +++ b/macosx/HBLanguagesSelection.m @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import "HBLanguagesSelection.h" -#include "lang.h" +#include "handbrake/lang.h" @implementation HBLang diff --git a/macosx/HBPicture+UIAdditions.m b/macosx/HBPicture+UIAdditions.m index 9250d0211d0f..41b40425e4c4 100644 --- a/macosx/HBPicture+UIAdditions.m +++ b/macosx/HBPicture+UIAdditions.m @@ -8,7 +8,7 @@ #import "HBTitle.h" #import "HBLocalizationUtilities.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" @implementation HBPicture (UIAdditions) diff --git a/macosx/HBPicture.m b/macosx/HBPicture.m index 6048714d1aab..a623d96001f1 100644 --- a/macosx/HBPicture.m +++ b/macosx/HBPicture.m @@ -10,7 +10,7 @@ #import "HBCodingUtilities.h" #import "HBMutablePreset.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" NSString * const HBPictureChangedNotification = @"HBPictureChangedNotification"; diff --git a/macosx/HBPreset.m b/macosx/HBPreset.m index 917657c7484e..81b0b51b2cc9 100644 --- a/macosx/HBPreset.m +++ b/macosx/HBPreset.m @@ -7,7 +7,7 @@ #import "HBPreset.h" #import "HBMutablePreset.h" -#include "preset.h" +#include "handbrake/preset.h" #import "NSJSONSerialization+HBAdditions.h" #import "HBLocalizationUtilities.h" diff --git a/macosx/HBPresetsManager.m b/macosx/HBPresetsManager.m index e5b3b3173dab..ac2ea95c12e6 100644 --- a/macosx/HBPresetsManager.m +++ b/macosx/HBPresetsManager.m @@ -10,7 +10,7 @@ #import "HBUtilities.h" #import "NSJSONSerialization+HBAdditions.h" -#include "preset.h" +#include "handbrake/preset.h" NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification"; diff --git a/macosx/HBStateFormatter+Private.h b/macosx/HBStateFormatter+Private.h index e7d2e3624461..2f4f261a802f 100644 --- a/macosx/HBStateFormatter+Private.h +++ b/macosx/HBStateFormatter+Private.h @@ -8,7 +8,7 @@ #import #import "HBStateFormatter.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" NS_ASSUME_NONNULL_BEGIN diff --git a/macosx/HBStateFormatter.m b/macosx/HBStateFormatter.m index 39b69a6b2baa..6d7ca5e16e34 100644 --- a/macosx/HBStateFormatter.m +++ b/macosx/HBStateFormatter.m @@ -6,7 +6,7 @@ #import "HBStateFormatter.h" #import "HBLocalizationUtilities.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" @implementation HBStateFormatter diff --git a/macosx/HBSubtitles.m b/macosx/HBSubtitles.m index 8119813eab67..9d2833df4461 100644 --- a/macosx/HBSubtitles.m +++ b/macosx/HBSubtitles.m @@ -18,7 +18,7 @@ #import "HBJob+Private.h" #import "HBSecurityAccessToken.h" -#include "common.h" +#include "handbrake/common.h" #define NONE_TRACK_INDEX 0 #define FOREIGN_TRACK_INDEX 1 diff --git a/macosx/HBSubtitlesTrack.m b/macosx/HBSubtitlesTrack.m index 019c89cf90f6..457410a270b7 100644 --- a/macosx/HBSubtitlesTrack.m +++ b/macosx/HBSubtitlesTrack.m @@ -8,8 +8,8 @@ #import "HBCodingUtilities.h" #import "HBTitle.h" -#include "common.h" -#include "lang.h" +#include "handbrake/common.h" +#include "handbrake/lang.h" #define CHAR_CODE_DEFAULT_INDEX 28 diff --git a/macosx/HBTitle+Private.h b/macosx/HBTitle+Private.h index 7afb7defc0d9..57e4cb9e661b 100644 --- a/macosx/HBTitle+Private.h +++ b/macosx/HBTitle+Private.h @@ -7,7 +7,7 @@ #import #import "HBTitle.h" #import "HBPreset.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" @interface HBTitle (Private) diff --git a/macosx/HBTitle.m b/macosx/HBTitle.m index dbb52a080f9e..895ef6fe8b04 100644 --- a/macosx/HBTitle.m +++ b/macosx/HBTitle.m @@ -14,7 +14,7 @@ #import "HBSecurityAccessToken.h" #import "HBUtilities.h" -#include "lang.h" +#include "handbrake/lang.h" @interface HBMetadata () diff --git a/macosx/HBUtilities.m b/macosx/HBUtilities.m index 1f2810a52207..4015dd916c8c 100644 --- a/macosx/HBUtilities.m +++ b/macosx/HBUtilities.m @@ -7,7 +7,7 @@ #import "HBUtilities.h" #import -#include "lang.h" +#include "handbrake/lang.h" static BOOL hb_resolveBookmarks = YES; diff --git a/macosx/HBVideo+UIAdditions.m b/macosx/HBVideo+UIAdditions.m index a2c1b4d3930f..cd9823698c68 100644 --- a/macosx/HBVideo+UIAdditions.m +++ b/macosx/HBVideo+UIAdditions.m @@ -8,7 +8,7 @@ #import "HBJob+Private.h" #import "HBLocalizationUtilities.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" @implementation HBVideo (UIAdditions) diff --git a/macosx/HBVideo.m b/macosx/HBVideo.m index 815292157e90..c062759e0c5a 100644 --- a/macosx/HBVideo.m +++ b/macosx/HBVideo.m @@ -9,7 +9,7 @@ #import "HBCodingUtilities.h" #import "HBMutablePreset.h" -#include "handbrake.h" +#include "handbrake/handbrake.h" NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification"; diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index f96e2958f0c2..2b30ed702e04 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -1860,8 +1860,8 @@ outputFileListPaths = ( ); outputPaths = ( - "$(EXTERNAL_BUILD)/libhb/hb_dict.h", - "$(EXTERNAL_BUILD)/libhb/handbrake.h", + "$(EXTERNAL_BUILD)/libhb/handbrake/hb_dict.h", + "$(EXTERNAL_BUILD)/libhb/handbrake/handbrake.h", "$(EXTERNAL_BUILD)/macosx/Info.plist", ); runOnlyForDeploymentPostprocessing = 0; diff --git a/macosx/NSDictionary+HBAdditions.h b/macosx/NSDictionary+HBAdditions.h index b653d1b59846..42fc79a54388 100644 --- a/macosx/NSDictionary+HBAdditions.h +++ b/macosx/NSDictionary+HBAdditions.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import -#include "hb_dict.h" +#include "handbrake/hb_dict.h" NS_ASSUME_NONNULL_BEGIN diff --git a/test/parsecsv.c b/test/parsecsv.c index b777d1dab7de..95a6f883ae83 100644 --- a/test/parsecsv.c +++ b/test/parsecsv.c @@ -8,7 +8,7 @@ */ #include -#include "handbrake.h" +#include "handbrake/handbrake.h" #include "parsecsv.h" /* Internal declarations */ diff --git a/test/test.c b/test/test.c index c4abe7687244..227340fb6114 100644 --- a/test/test.c +++ b/test/test.c @@ -30,12 +30,12 @@ #include #endif -#include "handbrake.h" -#include "lang.h" +#include "handbrake/handbrake.h" +#include "handbrake/lang.h" #include "parsecsv.h" #if HB_PROJECT_FEATURE_QSV -#include "qsv_common.h" +#include "handbrake/qsv_common.h" #endif #if defined( __APPLE_CC__ )