Update master branch to next

CMakeLists.txt

@@ -3,7 +3,11 @@ cmake_minimum_required(VERSION 2.8)
 project(vmcs_host_apps)
 
 set(BUILD_MMAL TRUE)
-set(BUILD_MMAL_APPS FALSE)
+if (ALL_APPS)
+ set(BUILD_MMAL_APPS TRUE)
+else()
+ set(BUILD_MMAL_APPS FALSE)
+endif()
 set(vmcs_root ${PROJECT_SOURCE_DIR})
 get_filename_component(VIDEOCORE_ROOT . ABSOLUTE)
 
@@ -39,7 +43,7 @@ add_definitions(-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE)
 
 # do we actually need this?
 add_definitions(-D__VIDEOCORE4__)
-
+add_definitions(-DTV_SUPPORTED_MODE_NO_DEPRECATED)
 
 # add_definitions(-DKHRONOS_CLIENT_LOGGING)
 
@@ -59,8 +63,10 @@ if(BUILD_MMAL)
    include_directories(interface/mmal)
    add_subdirectory(interface/mmal)
 endif()
+if(BUILD_MMAL_APPS)
+   add_subdirectory(containers)
+endif()
 
-#add_subdirectory(containers)
 add_subdirectory(middleware/openmaxil)
 
 # 3d demo code
@@ -84,7 +90,9 @@ add_subdirectory(interface/usbdk)
 
 # VMCS Host Applications
 #add_subdirectory(host_applications/framework)
-#add_subdirectory(host_applications/vmcs)
+if(BUILD_MMAL_APPS)
+   add_subdirectory(host_applications/vmcs)
+endif()
 
 # add_subdirectory(interface/vchiq/test/win32)
 
@@ -95,6 +103,10 @@ add_subdirectory(interface/usbdk)
 # add linux apps
 add_subdirectory(host_applications/linux)
 
+# Debug sym for mmal-vc-diag and vcdbg
+#add_subdirectory(host_applications/linux/libs/debug_sym)
+
+
 set(vmcs_host_apps_VERSION_MAJOR 1)
 set(vmcs_host_apps_VERSION_MINOR 0)
 

helpers/v3d/v3d_ver.h

@@ -45,8 +45,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    #elif defined(__BCM2708B0__)
       /* 2708 b0 */
       #define V3D_REVISION 2
+   #elif defined(__BCM2708C0__) || defined(__BCM2708C1__)
+      /* 2708 c0/1 */
+      #define V3D_REVISION 3
    #else
-      /* fiji */
+      /* capri */
       #define V3D_REVISION 6
    #endif
 #endif

helpers/vc_image/metadata_fourcc.h

@@ -55,6 +55,7 @@ typedef enum {
    METADATA_AGC_DEBUG            = ('A'<<24)+('G'<<16)+('C'<<8)+('D'),   // 'AGCD'    struct ISP_TUNER_BRCM_AGC_DEBUG_T in /middleware/ISP/tuner/isp_tuner_agc.h
    METADATA_FOCUS_REGION         = ('F'<<24)+('R'<<16)+('G'<<8)+('N'),   // 'FRGN'    struct ISP_TUNER_BRCM_AF_STATISTICS_PARAMS_T in /middleware/ISP/tuner/isp_tuner_brcm_common.h
    METADATA_FOCUS_WOI            = ('F'<<24)+('W'<<16)+('O'<<8)+('I'),   // 'FWOI'    struct ISP_WOI_METADATA_T in /middleware/ISP/tuner/isp_tuner_ctrl.h
+   METADATA_FOCUS_CAF            = ('F'<<24)+('C'<<16)+('A'<<8)+('F'),   // 'FCAF'    struct ISP_CAF_METADATA_T in /middleware/ISP/tuner/isp_tuner_ctrl.h
    METADATA_AUTOFOCUS            = ( 0 <<24)+( 0 <<16)+('A'<<8)+('F'),   // '\x00\x00AF'  struct ISP_AF_METADATA_T in /middleware/ISP/tuner/isp_tuner_ctrl.h
    METADATA_EV                   = ('E'<<24)+('V'<<16)+('M'<<8)+('D'),   // 'EVMD'    struct ISP_TUNER_BRCM_EV_METADATA_T in /middleware/ISP/tuner/isp_tuner_brcm_common.h
    METADATA_ISP                  = ('I'<<24)+('S'<<16)+('P'<<8)+('M'),   // 'ISPM'    struct ISP_ISP_METADATA_T in /middleware/ISP/tuner/isp_tuner_ctrl.h
@@ -64,7 +65,8 @@ typedef enum {
    METADATA_SCENEDETECTION       = ( 0 <<24)+('A'<<16)+('S'<<8)+('D'),   // '\x00ASD'    struct ASD_METADATA_T defined in /middleware/camplus/sw/asd_metadata.h
    METADATA_TUNER_SYNC           = ('S'<<24)+('Y'<<16)+('N'<<8)+('C'),   // 'SYNC'    NULL data, just adds the item header.   
    METADATA_DARK_FRAME_CORRECT   = ('D'<<24)+('F'<<16)+('R'<<8)+('C'),   // 'DFRC'    5 byte literal string "dfrc"
-   METADATA_DARK_FRAME_SUB       = ('D'<<24)+('F'<<16)+('S'<<8)+('B'),   // 'DFSB'    3 byte literal string "on"   
+   METADATA_DARK_FRAME_SUB       = ('D'<<24)+('F'<<16)+('S'<<8)+('B'),   // 'DFSB'    3 byte literal string "on"
+   METADATA_TUNER_DROP_FRAME     = ('T'<<24)+('D'<<16)+('R'<<8)+('P'),
    METADATA_ABL                  = ( 0 <<24)+('A'<<16)+('B'<<8)+('L'),   // '\x00ABL'    struct ISP_TUNER_BRCM_BLACK_LEVEL_ABL_T defined in /middleware/ISP/tuner/isp_tuner_brcm_black_level.h
    METADATA_DRC                  = ( 0 <<24)+('D'<<16)+('R'<<8)+('C'),	 // 'DRC'	  struct DRC_METADATA_T defined in /middleware/camplus/sw/drc/drc.h
    METADATA_REGISTRATION         = ( 0 <<24)+('R'<<16)+('E'<<8)+('G'),    // 'REG'         struct REGISTRATION_OFFSETS_T defined in /middleware/camplus/sw/registration/registration.h
@@ -96,6 +98,10 @@ typedef enum {
    METADATA_ACUTE_AWB_LOG        = ('A'<<24)+('E'<<16)+('L'<<8)+('C'), // 'AELC' : ISP_ACUTE_AWB_LOG
    METADATA_DF               = ( 0 <<24)+(   0<<16)+('D'<<8)+('F'), // '\x00\x00DF' : DF_METADATA_T defined in /middleware/camplus/sw/df/df_metadata.h
    METADATA_MAGIC_MEASURE    = ('S'<<24)+('S'<<16)+('M'<<8) + ('M'), // 'SSMM' : A statistic from the ISP used to determine the JPEG quality setting for a certain customer.
+   METADATA_SNAPSHOT_JPEG_QUANTISER = ('S'<<24)+('S'<<16)+('J'<<8) + ('S'), // 'SSJQ' : The size of the snapshot frame when JPEG-encoded.
+
+   METADATA_SUPPLEMENTARY_INFO   = ('S'<<24)+('U'<<16)+('P'<<8) + ('P'), // 'SUPP' : Supplimentary info defined in /codecs/video/hw/enc/venc_supplementary_info.h
+
    METADATA_UNKNOWN        = ('U'<<24)+('N'<<16)+('K'<<8)+('N') // 'UNKN'
 
 } METADATA_CODE_T;

helpers/vc_image/vc_image.h

@@ -135,6 +135,7 @@ extern "C" {
       VC_IMAGE_YUVINFO_CSC_SMPTE_240M      = 5,   /* Society of Motion Picture and Television Engineers 240M (1999) */
       VC_IMAGE_YUVINFO_CSC_ITUR_BT470_2_M  = 6,  /* ITU-R BT.470-2 System M */
       VC_IMAGE_YUVINFO_CSC_ITUR_BT470_2_BG = 7,  /* ITU-R BT.470-2 System B,G */
+      VC_IMAGE_YUVINFO_CSC_JPEG_JFIF_Y16_255 = 8, /* JPEG JFIF, but with 16..255 luma */
       VC_IMAGE_YUVINFO_CSC_CUSTOM          = 15,  /* Custom colour matrix follows header */
       VC_IMAGE_YUVINFO_CSC_SMPTE_170M      = VC_IMAGE_YUVINFO_CSC_ITUR_BT601,
 
@@ -157,7 +158,7 @@ extern "C" {
       bits should be zero and enforce this in vc_image functions to catch people
       who aren't initialising the VC_IMAGE_T structure nicely; update when other
       bits are added */
-#define VC_IMAGE_INFO_VALIDBITS    0x9F07
+#define VC_IMAGE_INFO_VALIDBITS    0x9F0F
    /* Define the bits of info used to denote the colourspace */
 #define VC_IMAGE_INFO_COLOURSPACE  0x0F
 

host_applications/linux/apps/gencmd/gencmd.c

@@ -40,7 +40,7 @@ int main( int argc, char **argv )
 {
    int instNum = 0;
    VCHI_INSTANCE_T vchi_instance;
-   VCHI_CONNECTION_T *vchi_connection;
+   VCHI_CONNECTION_T *vchi_connection = NULL;
 
    if ( argc > 1 )
    {
@@ -73,32 +73,33 @@ int main( int argc, char **argv )
     {
       int i = 1;
       char buffer[ 1024 ];
+      size_t buffer_offset = 0;
       clock_t before=0, after=0;
       double time_diff;
       uint32_t show_time = 0;
       int ret;
 
       //reset the string
-      strcpy( buffer, "" );
+      buffer[0] = '\0';
 
       //first, strip out a potential leading -t
       if( strcmp( argv[1], "-t" ) == 0 )
       {
          show_time = 1;
          i++;
-      }     
+      }
 
       for (; i <= argc-1; i++)
       {
-         strcat( buffer, argv[i] );
-         strcat( buffer, " " );
+         buffer_offset = vcos_safe_strcpy( buffer, argv[i], sizeof(buffer), buffer_offset );
+         buffer_offset = vcos_safe_strcpy( buffer, " ", sizeof(buffer), buffer_offset );
       }
 
       if( show_time )
          before = clock();
 
       //send the gencmd for the argument
-      if (( ret = vc_gencmd_send( buffer )) != 0 )
+      if (( ret = vc_gencmd_send( "%s", buffer )) != 0 )
       {
           printf( "vc_gencmd_send returned %d\n", ret );
       }

host_applications/linux/apps/hello_pi/hello_tiger/CMakeLists.txt

@@ -1,10 +1,9 @@
 set(EXEC hello_tiger.bin)
-set(SRCS tiger.c main.c)
+set(SRCS main.c tiger.c)
+add_definitions(-D__RASPBERRYPI__)
 
 add_executable(${EXEC} ${SRCS})
 target_link_libraries(${EXEC} ${HELLO_PI_LIBS})
 
-add_definitions(-D__RASPBERRYPI__)
-
 install(TARGETS ${EXEC}
         RUNTIME DESTINATION bin)