diff options
| author | Minje Ahn <minje.ahn@samsung.com> | 2016-06-07 08:13:36 +0900 |
|---|---|---|
| committer | Minje Ahn <minje.ahn@samsung.com> | 2016-06-07 11:06:27 +0900 |
| commit | 2e0e0eba0faf579502324ec0aba8927395e882e4 (patch) | |
| tree | 1ab8f94c126f8991905eb58559b7db3de7508461 | |
| parent | 1fa35166d81c650ddeae8d85f5b072e0ee4df1da (diff) | |
| download | metadata-extractor-2e0e0eba0faf579502324ec0aba8927395e882e4.tar.gz metadata-extractor-2e0e0eba0faf579502324ec0aba8927395e882e4.tar.bz2 metadata-extractor-2e0e0eba0faf579502324ec0aba8927395e882e4.zip | |
Fix svace issuesubmit/tizen/20160609.040222accepted/tizen/wearable/20160609.091724accepted/tizen/tv/20160609.091634accepted/tizen/mobile/20160609.092008accepted/tizen/ivi/20160609.091750accepted/tizen/common/20160609.145229
Change-Id: Ide6d7a6605dbf508230345c7445705ed0975bb18
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
| -rwxr-xr-x | src/metadata_extractor.c | 7 | ||||
| -rwxr-xr-x | test/metadata_extractor_test.c | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/metadata_extractor.c b/src/metadata_extractor.c index d62481c..a0a225e 100755 --- a/src/metadata_extractor.c +++ b/src/metadata_extractor.c @@ -1091,12 +1091,12 @@ static int __metadata_extractor_get_is_360(metadata_extractor_s *metadata, int * char *err_attr_name = NULL; int _is_360 = 0; - if ((!metadata) ||(!metadata->attr_h)) { + if ((!metadata) ||(!metadata->tag_h)) { metadata_extractor_error("INVALID_PARAMETER(0x%08x)", METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER); return METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER; } - ret = mm_file_get_attrs(metadata->attr_h, &err_attr_name, MM_FILE_TAG_360, &_is_360, NULL); + ret = mm_file_get_attrs(metadata->tag_h, &err_attr_name, MM_FILE_TAG_360, &_is_360, NULL); if (ret != FILEINFO_ERROR_NONE) { metadata_extractor_error("METADATA_EXTRACTOR_ERROR_OPERATION_FAILED(0x%08x)", ret); SAFE_FREE(err_attr_name); @@ -1301,7 +1301,7 @@ 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)) + else if (((attribute > METADATA_HAS_AUDIO) && (attribute <= METADATA_ROTATE)) || (attribute == METADATA_360)) ret = __metadata_extractor_check_and_extract_meta(_metadata, METADATA_TYPE_TAG); else if((attribute == METADATA_AUDIO_CODEC) || (attribute == METADATA_VIDEO_CODEC)) ret = __metadata_extractor_check_and_extract_meta(_metadata, METADATA_TYPE_ATTR); @@ -1489,7 +1489,6 @@ int metadata_extractor_get_metadata(metadata_extractor_h metadata, metadata_extr case METADATA_360: { is_string = 0; ret = __metadata_extractor_get_is_360(_metadata, &i_value); - metadata_extractor_debug("tomoryu test call is 360"); break; } default: diff --git a/test/metadata_extractor_test.c b/test/metadata_extractor_test.c index 854d446..4810983 100755 --- a/test/metadata_extractor_test.c +++ b/test/metadata_extractor_test.c @@ -252,6 +252,7 @@ static bool __capi_metadata_extractor(metadata_extractor_h metadata) SAFE_FREE(rotate); SAFE_FREE(audio_codec); SAFE_FREE(video_codec); + SAFE_FREE(is_360); return true; |