raspi/userland
1
0
Fork 0
mirror of https://github.com/raspberrypi/userland.git synced 2025-12-06 04:49:12 +00:00
Code Issues Projects Releases Wiki Activity

vdec3: preparation work for MVC

Browse Source
This commit is contained in:
popcornmix
2015-02-26 16:51:26 +00:00
parent 73b57a7007
commit 0de0b205ea
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
helpers/vc_image/metadata_fourcc.h
View File

@@ -89,9 +89,7 @@ typedef enum {
METADATA_STILL_AREA_A = ( 'S'<<24)+('T'<<16)+('L'<<8)+('A'), // 'STLA' : FLAT_AREA_METADATA_T defined in /middleware/camplus/sw/perceptual/stillarea.h
METADATA_DDITHER_A = ( 'D'<<24)+('D'<<16)+('T'<<8)+('A'), // 'DDTA' : DDITHER_METADATA_T defined in /middleware/camplus/sw/perceptual/...
#ifdef CONFIG_VC_IMAGE_LINKED_MULTICHANN
METADATA_LINKED_MULTICHANN = ( 'I'<<24)+('L'<<16)+('M'<<8)+('C'), // 'ILMC' : VC_IMAGE_LINKED_MULTICHANN_T defined in /helpers/vc_image/vc_image.h
#endif
METADATA_HDR = ( 0 <<24)+( 'H'<<16)+('D'<<8)+('R'), // 'HDR' : HDR_METADATA_T defined in /middleware/camplus/sw/hdr/hdr_metadata.h
METADATA_FOCUS_STATS_PREPROC = ('F'<<24)+('S'<<16)+('P'<<8)+('M'), // 'FSPM' : FOCUS_STATS_PREPROC_METADATA defined in /middleware/camplus/sw/hdr/focus_stats_preproc/focus_stats_preproc.h

10
helpers/vc_image/vc_image.h
View File

@@ -105,10 +105,8 @@ extern "C" {
VC_IMAGE_PROP_IS_DECIMATED,
VC_IMAGE_PROP_IS_PACKED,
VC_IMAGE_PROP_YUV_COLOURSPACE,
#ifdef CONFIG_VC_IMAGE_LINKED_MULTICHANN
/* Linked-multichannel properties*/
VC_IMAGE_PROP_LINKED_MULTICHANN
#endif
} VC_IMAGE_PROPERTY_T;
/* A property key and value */
@@ -417,19 +415,14 @@ unsigned int cube_map : 1;
uint32_t video_timestamp;/* 90000 Hz RTP times domain - derived from audio timestamp */
uint8_t num_channels; /* number of channels (2 for stereo) */
uint8_t current_channel;/* the channel this header is currently pointing to */
#ifdef CONFIG_VC_IMAGE_LINKED_MULTICHANN
uint8_t linked_multichann_flag;/* Indicate the header has the linked-multichannel structure*/
uint8_t is_channel_linked; /* Track if the above structure is been used to link the header
into a linked-mulitchannel image */
uint8_t channel_index; /* index of the channel this header represents while
it is being linked. */
uint8_t _dummy[3]; /* pad struct to 64 bytes */
#else
uint8_t _dummy[6]; /* pad struct to 64 bytes */
#endif
};
#ifdef CONFIG_VC_IMAGE_LINKED_MULTICHANN
/**
* \brief storage for pointers to image headers of the previous and next channel
*
@@ -442,7 +435,6 @@ unsigned int cube_map : 1;
VC_IMAGE_T* next;
};
typedef struct VC_IMAGE_LINKED_MULTICHANN_T VC_IMAGE_LINKED_MULTICHANN_T;
#endif
/**
* \brief Image buffer object, with image data locked in memory and ready for access.
@@ -548,10 +540,8 @@ unsigned int cube_map : 1;
void vc_image_lock_extract( VC_IMAGE_BUF_T *dst, const VC_IMAGE_T *src, uint8_t chan_idx );
#ifdef CONFIG_VC_IMAGE_LINKED_MULTICHANN
void vc_image_lock_channel(VC_IMAGE_BUF_T *dst, const VC_IMAGE_T *chann);
void vc_image_lock_channel_perma(VC_IMAGE_BUF_T *dst, const VC_IMAGE_T *chann); //lightweight version of lock channel
#endif
void vc_image_unlock( VC_IMAGE_BUF_T *img );