summaryrefslogtreecommitdiffstats
path: root/libhb/internal.h
diff options
context:
space:
mode:
authorsr55 <[email protected]>2013-09-06 17:11:27 +0000
committersr55 <[email protected]>2013-09-06 17:11:27 +0000
commit10f5aec2de68e0f60a13c7696832e1a02dff187b (patch)
treea987ad5db3e0da36eb9757711764a3b59e7f7de7 /libhb/internal.h
parentf35cf60ca4a4b94f352afc22cc2252ffe7ff67d1 (diff)
OpenCL: Merging Trunk to OpenCL Branch.
git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/opencl@5770 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/internal.h')
-rw-r--r--libhb/internal.h36
1 files changed, 26 insertions, 10 deletions
diff --git a/libhb/internal.h b/libhb/internal.h
index adddbe58b..e4d5ed71c 100644
--- a/libhb/internal.h
+++ b/libhb/internal.h
@@ -83,14 +83,15 @@ struct hb_buffer_s
uint8_t discontinuity;
int new_chap; // Video packets: if non-zero, is the index of the chapter whose boundary was crossed
- #define HB_FRAME_IDR 0x01
- #define HB_FRAME_I 0x02
- #define HB_FRAME_AUDIO 0x04
- #define HB_FRAME_P 0x10
- #define HB_FRAME_B 0x20
- #define HB_FRAME_BREF 0x40
- #define HB_FRAME_KEY 0x0F
- #define HB_FRAME_REF 0xF0
+ #define HB_FRAME_IDR 0x01
+ #define HB_FRAME_I 0x02
+ #define HB_FRAME_AUDIO 0x04
+ #define HB_FRAME_SUBTITLE 0x08
+ #define HB_FRAME_P 0x10
+ #define HB_FRAME_B 0x20
+ #define HB_FRAME_BREF 0x40
+ #define HB_FRAME_KEY 0x0F
+ #define HB_FRAME_REF 0xF0
uint8_t frametype;
uint16_t flags;
} s;
@@ -114,6 +115,12 @@ struct hb_buffer_s
int size;
} plane[4]; // 3 Color components + alpha
+ struct qsv
+ {
+ void *qsv_atom;
+ void *filter_details;
+ } qsv_details;
+
#ifdef USE_OPENCL
struct cl_data
{
@@ -412,6 +419,7 @@ enum
WORK_ENCVOBSUB,
WORK_RENDER,
WORK_ENCAVCODEC,
+ WORK_ENCQSV,
WORK_ENCX264,
WORK_ENCTHEORA,
WORK_DECA52,
@@ -439,6 +447,12 @@ extern hb_filter_object_t hb_filter_crop_scale;
extern hb_filter_object_t hb_filter_render_sub;
extern hb_filter_object_t hb_filter_vfr;
+#ifdef USE_QSV
+extern hb_filter_object_t hb_filter_qsv;
+extern hb_filter_object_t hb_filter_qsv_pre;
+extern hb_filter_object_t hb_filter_qsv_post;
+#endif
+
// Picture flags used by filters
#ifndef PIC_FLAG_REPEAT_FIRST_FIELD
#define PIC_FLAG_REPEAT_FIRST_FIELD 256
@@ -475,7 +489,9 @@ typedef struct hb_mux_data_s hb_mux_data_t;
hb_mux_object_t * hb_mux_##a##_init( hb_job_t * );
DECLARE_MUX( mp4 );
-DECLARE_MUX( avi );
-DECLARE_MUX( ogm );
DECLARE_MUX( mkv );
+DECLARE_MUX( avformat );
+void hb_muxmp4_process_subtitle_style( uint8_t *input,
+ uint8_t *output,
+ uint8_t *style, uint16_t *stylesize );