firmware: image_encode: Fix that works for both buffers and tunnelling.

See: http://forum.xbmc.org/showthread.php?tid=176043&pid=1673527#pid1673527 firmware: video_decode: Allow ts fifo to be forced off with avoid_fix_ts=2 See: http://forum.xbmc.org/showthread.php?tid=148646&pid=1674875#pid1674875 userland: tvservice: Enhance callback mechanism See: raspberrypi/userland#162
raspberrypi · Apr 7, 2014 · 3ade415 · 3ade415
1 parent 408bebd
commit 3ade415
Show file tree

Hide file tree

Showing 35 changed files with 27 additions and 3 deletions.
diff --git a/boot/fixup.dat b/boot/fixup.dat
diff --git a/boot/fixup_x.dat b/boot/fixup_x.dat
diff --git a/boot/kernel.img b/boot/kernel.img
diff --git a/boot/start.elf b/boot/start.elf
diff --git a/boot/start_cd.elf b/boot/start_cd.elf
diff --git a/boot/start_x.elf b/boot/start_x.elf
diff --git a/extra/uname_string b/extra/uname_string
@@ -1 +1 @@
-Linux version 3.10.36+ (dc4@dc4-arm-01) (gcc version 4.7.2 20120731 (prerelease) (crosstool-NG linaro-1.13.1+bzr2458 - Linaro GCC 2012.08) ) #662 PREEMPT Fri Apr 4 18:31:16 BST 2014
+Linux version 3.10.36+ (dc4@dc4-arm-01) (gcc version 4.7.2 20120731 (prerelease) (crosstool-NG linaro-1.13.1+bzr2458 - Linaro GCC 2012.08) ) #664 PREEMPT Mon Apr 7 14:01:14 BST 2014
diff --git a/hardfp/opt/vc/bin/raspistill b/hardfp/opt/vc/bin/raspistill
diff --git a/hardfp/opt/vc/bin/raspivid b/hardfp/opt/vc/bin/raspivid
diff --git a/hardfp/opt/vc/bin/raspiyuv b/hardfp/opt/vc/bin/raspiyuv
diff --git a/hardfp/opt/vc/bin/tvservice b/hardfp/opt/vc/bin/tvservice
diff --git a/hardfp/opt/vc/include/interface/vmcs_host/vc_tvservice.h b/hardfp/opt/vc/include/interface/vmcs_host/vc_tvservice.h
@@ -119,6 +119,18 @@ VCHPRE_ void vc_tv_register_callback(TVSERVICE_CALLBACK_T callback, void *callba
  */
 VCHPRE_ void vc_tv_unregister_callback(TVSERVICE_CALLBACK_T callback);
 
+/**
+ * <DFN>vc_tv_unregister_callback</DNF> removes a function registered with
+ * <DFN>vc_tv_register_callback</DNF> from the list of callbacks.
+ * In contrast to vc_tv_unregister_callback this one matches not only the
+ * function pointer but also the data pointer before removal.
+ *
+ * @param callback function
+ *
+ * @return void
+ */
+VCHPRE_ void vc_tv_unregister_callback_full(TVSERVICE_CALLBACK_T callback, void *callback_data);
+
 /**
  * In the following API any functions applying to HDMI only will have hdmi_
  * in the name, ditto for SDTV only will have sdtv_ in the name,

diff --git a/hardfp/opt/vc/include/interface/vmcs_host/vc_tvservice_defs.h b/hardfp/opt/vc/include/interface/vmcs_host/vc_tvservice_defs.h
@@ -42,7 +42,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define TVSERVICE_CLIENT_NAME MAKE_FOURCC("TVSV")
 #define TVSERVICE_NOTIFY_NAME MAKE_FOURCC("TVNT")
 
-#define TVSERVICE_MAX_CALLBACKS  2
+#define TVSERVICE_MAX_CALLBACKS  5
 
 //TV service commands
 typedef enum {

diff --git a/hardfp/opt/vc/lib/libEGL_static.a b/hardfp/opt/vc/lib/libEGL_static.a
diff --git a/hardfp/opt/vc/lib/libGLESv2_static.a b/hardfp/opt/vc/lib/libGLESv2_static.a
diff --git a/hardfp/opt/vc/lib/libbcm_host.so b/hardfp/opt/vc/lib/libbcm_host.so
diff --git a/hardfp/opt/vc/lib/libkhrn_client.a b/hardfp/opt/vc/lib/libkhrn_client.a
diff --git a/hardfp/opt/vc/lib/libkhrn_static.a b/hardfp/opt/vc/lib/libkhrn_static.a
diff --git a/hardfp/opt/vc/lib/libvcfiled_check.a b/hardfp/opt/vc/lib/libvcfiled_check.a
diff --git a/hardfp/opt/vc/lib/libvchostif.a b/hardfp/opt/vc/lib/libvchostif.a
diff --git a/hardfp/opt/vc/lib/libvmcs_rpc_client.a b/hardfp/opt/vc/lib/libvmcs_rpc_client.a
diff --git a/opt/vc/bin/raspistill b/opt/vc/bin/raspistill
diff --git a/opt/vc/bin/raspivid b/opt/vc/bin/raspivid
diff --git a/opt/vc/bin/raspiyuv b/opt/vc/bin/raspiyuv
diff --git a/opt/vc/bin/tvservice b/opt/vc/bin/tvservice
diff --git a/opt/vc/include/interface/vmcs_host/vc_tvservice.h b/opt/vc/include/interface/vmcs_host/vc_tvservice.h
@@ -119,6 +119,18 @@ VCHPRE_ void vc_tv_register_callback(TVSERVICE_CALLBACK_T callback, void *callba
  */
 VCHPRE_ void vc_tv_unregister_callback(TVSERVICE_CALLBACK_T callback);
 
+/**
+ * <DFN>vc_tv_unregister_callback</DNF> removes a function registered with
+ * <DFN>vc_tv_register_callback</DNF> from the list of callbacks.
+ * In contrast to vc_tv_unregister_callback this one matches not only the
+ * function pointer but also the data pointer before removal.
+ *
+ * @param callback function
+ *
+ * @return void
+ */
+VCHPRE_ void vc_tv_unregister_callback_full(TVSERVICE_CALLBACK_T callback, void *callback_data);
+
 /**
  * In the following API any functions applying to HDMI only will have hdmi_
  * in the name, ditto for SDTV only will have sdtv_ in the name,

diff --git a/opt/vc/include/interface/vmcs_host/vc_tvservice_defs.h b/opt/vc/include/interface/vmcs_host/vc_tvservice_defs.h
@@ -42,7 +42,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define TVSERVICE_CLIENT_NAME MAKE_FOURCC("TVSV")
 #define TVSERVICE_NOTIFY_NAME MAKE_FOURCC("TVNT")
 
-#define TVSERVICE_MAX_CALLBACKS  2
+#define TVSERVICE_MAX_CALLBACKS  5
 
 //TV service commands
 typedef enum {

diff --git a/opt/vc/lib/libEGL_static.a b/opt/vc/lib/libEGL_static.a
diff --git a/opt/vc/lib/libGLESv2_static.a b/opt/vc/lib/libGLESv2_static.a
diff --git a/opt/vc/lib/libbcm_host.so b/opt/vc/lib/libbcm_host.so
diff --git a/opt/vc/lib/libkhrn_client.a b/opt/vc/lib/libkhrn_client.a
diff --git a/opt/vc/lib/libkhrn_static.a b/opt/vc/lib/libkhrn_static.a
diff --git a/opt/vc/lib/libvcfiled_check.a b/opt/vc/lib/libvcfiled_check.a
diff --git a/opt/vc/lib/libvchostif.a b/opt/vc/lib/libvchostif.a
diff --git a/opt/vc/lib/libvmcs_rpc_client.a b/opt/vc/lib/libvmcs_rpc_client.a