diff options
| author | hongteng <hongteng@google.com> | 2011-04-21 23:01:07 -0700 |
|---|---|---|
| committer | hongteng <hongteng@google.com> | 2011-04-22 10:51:10 -0700 |
| commit | 3b25fdc4a33b53cfcf67315c2d42ad699b8cefe2 (patch) | |
| tree | 0333987ba73a33defc7dee67eb82fa67dbf14cff /libvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h | |
| parent | 694816d7291f17364502ac5d3319684a0b180860 (diff) | |
| download | frameworks_av-3b25fdc4a33b53cfcf67315c2d42ad699b8cefe2.zip frameworks_av-3b25fdc4a33b53cfcf67315c2d42ad699b8cefe2.tar.gz frameworks_av-3b25fdc4a33b53cfcf67315c2d42ad699b8cefe2.tar.bz2 | |
Fix for issue 3385135 "source code cleanup" engine part
- remove commented code
- remove code under #if 0
- remove macro FILE_LOWER_CASE as it is not used
- remove macro #if 1
- remove TIMESCALE_BUG macro, and all code under this macro as it is not used
- remove following unused functions:
* M4MCS_getExifInfo
* M4MCS_registerAudioEncoderExtended
* M4MCS_registerVideoDecoderExtended
* M4MCS_registerAudioDecoderExtended
* M4MCS_registerVideoEncoderExtended
Change-Id: I8e2916d956af6d381ae1962fedc61a8b48f60ce2
Diffstat (limited to 'libvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h')
| -rwxr-xr-x | libvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/libvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h b/libvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h index 68d2448..ca63cc0 100755 --- a/libvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h +++ b/libvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h @@ -127,28 +127,6 @@ typedef enum M4MCS_kStreamState_FINISHED = 2 /**< The stream has finished encoding */ } M4MCS_StreamState; -#ifdef TIMESCALE_BUG -/** - ****************************************************************************** - * enum M4MCS_VolParse - * @brief VOL parsing results needed for VOP parsing - ****************************************************************************** - */ -typedef struct -{ - M4OSA_UInt8 video_object_layer_shape; - M4OSA_UInt8 sprite_enable; - M4OSA_UInt8 reduced_resolution_vop_enable; - M4OSA_UInt8 scalability; - M4OSA_UInt8 enhancement_type; - M4OSA_UInt8 complexity_estimation_disable; - M4OSA_UInt8 interlaced; - M4OSA_UInt8 sprite_warping_points; - M4OSA_UInt8 sprite_brightness_change; - M4OSA_UInt8 quant_precision; - -} M4MCS_VolParse; -#endif /** ****************************************************************************** @@ -437,13 +415,6 @@ typedef struct M4OSA_UInt32 uiAudioBitrate; /**< Targeted audio bitrate in bps */ M4OSA_UInt32 uiVideoBitrate; /**< Targeted video bitrate in bps */ -#ifdef TIMESCALE_BUG - M4OSA_UInt32 uiVideoTimescale; /**< Targeted timescale without decode/encode process */ - M4OSA_UInt32 uiTimescaleLength; /**< Length of the VOP time increment in bits */ - M4OSA_UInt32 uiOrigVideoTimescale; /**< Original timescale */ - M4OSA_UInt32 uiOrigTimescaleLength;/**< Original length of the VOP time increment in bits*/ - M4MCS_VolParse volParsing; /**< VOL parsing results needed for VOP parsing */ -#endif M4OSA_UInt8 uiProgress; /**< Progress information saved at each step to be able to return it in case of pause */ |