diff options
Diffstat (limited to 'src/metadata_extractor.c')
| -rwxr-xr-x | src/metadata_extractor.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/metadata_extractor.c b/src/metadata_extractor.c index dd1c224..44c2d16 100755 --- a/src/metadata_extractor.c +++ b/src/metadata_extractor.c @@ -20,7 +20,6 @@ #include <mm_file.h> #include <metadata_extractor.h> #include <metadata_extractor_private.h> -#include <metadata_extractor_type_private.h> /*TODO (m.alieksieie): Remove after ACR*/ #define SAFE_FREE(src) { if (src) {free(src); src = NULL; } } #define META_MAX_LEN 256 @@ -75,6 +74,7 @@ static int __metadata_extractor_destroy_handle(metadata_extractor_s *metadata); static int __metadata_extractor_get_audio_codec(metadata_extractor_s *metadata, char **audio_codec); static int __metadata_extractor_get_video_codec(metadata_extractor_s *metadata, char **video_codec); static int __metadata_extractor_get_is_360(metadata_extractor_s *metadata, int *is_360); +#ifdef SUPPORT_GSPHERICAL_METADATA static int __metadata_extractor_get_is_stitched(metadata_extractor_s *metadata, int *is_stitched); static int __metadata_extractor_get_projection_type(metadata_extractor_s *metadata, char **projection_type); static int __metadata_extractor_get_stitching_software(metadata_extractor_s *metadata, char **stitching_software); @@ -93,6 +93,7 @@ static int __metadata_extractor_get_cropped_area_top(metadata_extractor_s *metad static int __metadata_extractor_get_ambisonic_type(metadata_extractor_s *metadata, int *ambisonic_type); static int __metadata_extractor_get_ambisonic_format(metadata_extractor_s *metadata, int *ambisonic_format); static int __metadata_extractor_get_ambisonic_order(metadata_extractor_s *metadata, int *ambisonic_order); +#endif static int __metadata_extractor_check_and_extract_meta(metadata_extractor_s *metadata, metadata_extractor_type_e metadata_type) { @@ -1126,6 +1127,7 @@ static int __metadata_extractor_get_is_360(metadata_extractor_s *metadata, int * return ret; } +#ifdef SUPPORT_GSPHERICAL_METADATA static int __metadata_extractor_get_is_stitched(metadata_extractor_s *metadata, int *is_stitched) { int ret = METADATA_EXTRACTOR_ERROR_NONE; @@ -1530,6 +1532,7 @@ static int __metadata_extractor_get_ambisonic_order(metadata_extractor_s *metada return ret; } +#endif static int __metadata_extractor_destroy_handle(metadata_extractor_s *metadata) { @@ -1723,10 +1726,16 @@ int metadata_extractor_get_metadata(metadata_extractor_h metadata, metadata_extr ret = __metadata_extractor_check_and_extract_meta(_metadata, METADATA_TYPE_ATTR); } else if ((attribute >= METADATA_DURATION) && (attribute < METADATA_HAS_AUDIO)) ret = __metadata_extractor_check_and_extract_meta(_metadata, METADATA_TYPE_ATTR); - else if (((attribute > METADATA_HAS_AUDIO) && (attribute <= METADATA_ROTATE)) - || ((attribute >= METADATA_360) && (attribute <= METADATA_360_CROPPED_AREA_TOP)) + else if ((attribute > METADATA_HAS_AUDIO) && (attribute <= METADATA_ROTATE)) + ret = __metadata_extractor_check_and_extract_meta(_metadata, METADATA_TYPE_TAG); +#ifdef SUPPORT_GSPHERICAL_METADATA + else if (((attribute >= METADATA_360) && (attribute <= METADATA_360_CROPPED_AREA_TOP)) || ((attribute >= METADATA_AMBISONIC_TYPE) && (attribute <= METADATA_AMBISONIC_ORDER))) ret = __metadata_extractor_check_and_extract_meta(_metadata, METADATA_TYPE_TAG); +#else + else if (attribute == METADATA_360) + ret = __metadata_extractor_check_and_extract_meta(_metadata, METADATA_TYPE_TAG); +#endif else if ((attribute == METADATA_AUDIO_CODEC) || (attribute == METADATA_VIDEO_CODEC)) ret = __metadata_extractor_check_and_extract_meta(_metadata, METADATA_TYPE_ATTR); else { @@ -1915,6 +1924,7 @@ int metadata_extractor_get_metadata(metadata_extractor_h metadata, metadata_extr ret = __metadata_extractor_get_is_360(_metadata, &i_value); break; } +#ifdef SUPPORT_GSPHERICAL_METADATA case METADATA_360_STITCHED: { is_string = 0; ret = __metadata_extractor_get_is_stitched(_metadata, &i_value); @@ -2005,6 +2015,7 @@ int metadata_extractor_get_metadata(metadata_extractor_h metadata, metadata_extr ret = __metadata_extractor_get_ambisonic_order(_metadata, &i_value); break; } +#endif default: break; } |